diff --git a/.gitignore b/.gitignore index e0b8239031d4..3293e566de6b 100644 --- a/.gitignore +++ b/.gitignore @@ -44,4 +44,7 @@ scripts/RelWithDebInfo qgis-test.ctest i18n/*.qm .project +.pydevproject .idea +/python/plugins/sextante/resources_rc.py +/python/plugins/sextante/about/ui_aboutdialogbase.py diff --git a/CMakeLists.txt b/CMakeLists.txt index 5db116caeb22..3385e931dc98 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -55,6 +55,8 @@ ENDIF (WITH_POSTGRESQL) SET (WITH_INTERNAL_QWTPOLAR TRUE CACHE BOOL "Use internal build of QwtPolar") +SET (WITH_INTERNAL_QEXTSERIALPORT TRUE CACHE BOOL "Use internal build of Qextserialport") + SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built") IF (WITH_SPATIALITE) SET (WITH_INTERNAL_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built internally") @@ -76,6 +78,8 @@ IF (WITH_BINDINGS) # as otherwise user has to use PYTHONPATH environemnt 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, console and installer are always staged)") + SET (WITH_PY_COMPILE FALSE CACHE BOOL "Determines whether Python modules in staged or installed locations are byte-compiled") # concatenate QScintilla2 API files SET (WITH_QSCIAPI TRUE CACHE BOOL "Determines whether the QScintilla2 API files will be updated and concatenated") ENDIF (WITH_BINDINGS) @@ -155,12 +159,18 @@ FIND_PACKAGE(GEOS) FIND_PACKAGE(GDAL) FIND_PACKAGE(Expat) FIND_PACKAGE(Spatialindex REQUIRED) - FIND_PACKAGE(Qwt REQUIRED) + IF (NOT WITH_INTERNAL_QWTPOLAR) FIND_PACKAGE(QwtPolar REQUIRED) ENDIF(NOT WITH_INTERNAL_QWTPOLAR) +IF (WITH_INTERNAL_QEXTSERIALPORT) + SET(QEXTSERIALPORT_INCLUDE_DIR ${CMAKE_SOURCE_DIR}/src/core/gps/qextserialport) +ELSE (WITH_INTERNAL_QEXTSERIALPORT) + FIND_PACKAGE(Qextserialport REQUIRED) +ENDIF(WITH_INTERNAL_QEXTSERIALPORT) + IF (NOT WITH_INTERNAL_SPATIALITE) FIND_PACKAGE(Sqlite3) IF (NOT SQLITE3_FOUND) @@ -387,12 +397,9 @@ ELSE (WIN32) SET (DEFAULT_PLUGIN_SUBDIR ../PlugIns/qgis) SET (QGIS_PLUGIN_SUBDIR_REV ../../MacOS) SET (DEFAULT_INCLUDE_SUBDIR include/qgis) - # path for framework references - IF (ENABLE_TESTS) - SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib) - ELSE (ENABLE_TESTS) - SET (CMAKE_INSTALL_NAME_DIR @executable_path/${QGIS_FW_SUBDIR}) - ENDIF (ENABLE_TESTS) + # path for framework references when running from build directory + # changed later to reference in-app resources upon install + SET (CMAKE_INSTALL_NAME_DIR ${CMAKE_BINARY_DIR}/output/lib) IF (WITH_GLOBE) SET (OSG_PLUGINS_PATH "" CACHE PATH "Path to OSG plugins for bundling") ENDIF (WITH_GLOBE) @@ -479,16 +486,6 @@ SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/${QGIS_LIB_SUBDIR}) # if run from the build directory QGIS will detect it and alter the paths FILE(WRITE ${QGIS_OUTPUT_DIRECTORY}/${QGIS_BIN_SUBDIR}/path.txt "${CMAKE_SOURCE_DIR}\n${QGIS_OUTPUT_DIRECTORY}") -# symlink extra provider plugin frameworks for Mac unit tests -IF (APPLE AND ENABLE_TESTS) - EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink - "${CMAKE_BINARY_DIR}/Plugins/qgis/qgisgrass.framework" - "${CMAKE_BINARY_DIR}/output/lib/qgisgrass.framework") - EXECUTE_PROCESS(COMMAND ${CMAKE_COMMAND} -E create_symlink - "${CMAKE_BINARY_DIR}/Plugins/qgis/qgissqlanyconnection.framework" - "${CMAKE_BINARY_DIR}/output/lib/qgissqlanyconnection.framework") -ENDIF (APPLE AND ENABLE_TESTS) - # manual page - makes sense only on unix systems IF (UNIX AND NOT APPLE) SET (DEFAULT_MANUAL_SUBDIR man) @@ -559,9 +556,26 @@ IF (GIT_MARKER) COMMAND ${GITCOMMAND} log -n1 --pretty=%h OUTPUT_VARIABLE REVISION ) STRING(STRIP "${REVISION}" REVISION) + # Get GIT remote and branch + EXECUTE_PROCESS( + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND ${GITCOMMAND} name-rev --name-only HEAD OUTPUT_VARIABLE GIT_LOCAL_BRANCH + ) + STRING(STRIP "${GIT_LOCAL_BRANCH}" GIT_LOCAL_BRANCH) + EXECUTE_PROCESS( + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND ${GITCOMMAND} config branch.${GIT_LOCAL_BRANCH}.remote OUTPUT_VARIABLE GIT_REMOTE + ) + STRING(STRIP "${GIT_REMOTE}" GIT_REMOTE) + EXECUTE_PROCESS( + WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} + COMMAND ${GITCOMMAND} config remote.${GIT_REMOTE}.url OUTPUT_VARIABLE GIT_REMOTE_URL + ) + STRING(STRIP "${GIT_REMOTE_URL}" GIT_REMOTE_URL) ADD_CUSTOM_COMMAND( OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h COMMAND echo \\\#define QGSVERSION \\\"${REVISION}\\\" >${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h + COMMAND echo \\\#define QGS_GIT_REMOTE_URL \\\"${GIT_REMOTE_URL}\\\" >>${CMAKE_CURRENT_BINARY_DIR}/qgsversion.h MAIN_DEPENDENCY ${GIT_MARKER} WORKING_DIRECTORY ${CMAKE_SOURCE_DIR} ) @@ -606,6 +620,17 @@ ENDIF (ENABLE_TESTS) IF (APPLE) # must be last for install, so install_name_tool can do its work ADD_SUBDIRECTORY(mac) + + # allow QGIS to be run directly from build directory and to run unit tests + EXECUTE_PROCESS(COMMAND /bin/mkdir -p "${QGIS_OUTPUT_DIRECTORY}/lib") + EXECUTE_PROCESS( + COMMAND /bin/ln -fs ../../Plugins/qgis/qgisgrass.framework lib/ + WORKING_DIRECTORY "${QGIS_OUTPUT_DIRECTORY}" + ) + EXECUTE_PROCESS( + COMMAND /bin/ln -fs ../../Plugins/qgis/qgissqlanyconnection.framework lib/ + WORKING_DIRECTORY "${QGIS_OUTPUT_DIRECTORY}" + ) ENDIF (APPLE) # manual page - makes sense only on unix systems @@ -615,6 +640,10 @@ ENDIF (UNIX AND NOT APPLE) INSTALL(FILES cmake/FindQGIS.cmake DESTINATION ${QGIS_DATA_DIR}) +############################################################# +# Post-install commands +ADD_SUBDIRECTORY(postinstall) + ############################################################# # Uninstall stuff see: http://www.vtk.org/Wiki/CMake_FAQ CONFIGURE_FILE( diff --git a/README b/README index d9ea9b2949a3..05a3d3bd2f3e 100644 --- a/README +++ b/README @@ -6,7 +6,7 @@ SourceForge in June of the same year. We've worked hard to make GIS software (which is traditionally expensive commercial software) a viable prospect for anyone with basic access to a Personal Computer. QGIS currently runs on most Unix platforms, Windows, and OS X. QGIS is -developed using the Qt toolkit (http://qt.nokia.com) and C++. This +developed using the Qt toolkit (http://qt.digia.com) and C++. This means that QGIS feels snappy to use and has a pleasing, easy to use graphical user interface. diff --git a/build.xml b/build.xml deleted file mode 100644 index 94a0a0d04e35..000000000000 --- a/build.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - SEXTANTE - - - - - - - - \ No newline at end of file diff --git a/cmake/FindQextserialport.cmake b/cmake/FindQextserialport.cmake new file mode 100644 index 000000000000..27276552bfcb --- /dev/null +++ b/cmake/FindQextserialport.cmake @@ -0,0 +1,43 @@ +# Find Qextserialport +# ~~~~~~~~ +# Copyright (c) 2011, Jürgen E. Fischer +# +# Redistribution and use is allowed according to the terms of the BSD license. +# For details see the accompanying COPYING-CMAKE-SCRIPTS file. +# +# Once run this will define: +# +# QEXTSERIALPORT_FOUND = system has Qextserialport lib +# QEXTSERIALPORT_LIBRARY = full path to the Qextserialport library +# QEXTSERIALPORT_INCLUDE_DIR = where to find headers +# + + +FIND_PATH(QEXTSERIALPORT_INCLUDE_DIR NAMES qextserialport.h PATHS + /usr/include + /usr/local/include + "$ENV{LIB_DIR}/include" + "$ENV{INCLUDE}" + PATH_SUFFIXES QtExtSerialPort + ) + +FIND_LIBRARY(QEXTSERIALPORT_LIBRARY NAMES qextserialport-1.2 PATHS + /usr/lib + /usr/local/lib + "$ENV{LIB_DIR}/lib" + "$ENV{LIB}/lib" + ) + +IF (QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARY) + SET(QEXTSERIALPORT_FOUND TRUE) +ENDIF (QEXTSERIALPORT_INCLUDE_DIR AND QEXTSERIALPORT_LIBRARY) + +IF (QEXTSERIALPORT_FOUND) + IF (NOT QEXTSERIALPORT_FIND_QUIETLY) + MESSAGE(STATUS "Found Qextserialport: ${QEXTSERIALPORT_LIBRARY}") + ENDIF (NOT QEXTSERIALPORT_FIND_QUIETLY) +ELSE (QEXTSERIALPORT_FOUND) + IF (QEXTSERIALPORT_FIND_REQUIRED) + MESSAGE(FATAL_ERROR "Could not find Qextserialport") + ENDIF (QEXTSERIALPORT_FIND_REQUIRED) +ENDIF (QEXTSERIALPORT_FOUND) diff --git a/cmake/FindQsci.py b/cmake/FindQsci.py index 3bcaef9de771..ffe6944d22bf 100644 --- a/cmake/FindQsci.py +++ b/cmake/FindQsci.py @@ -1,4 +1,30 @@ # -*- coding: utf-8 -*- +# +# Copyright (c) 2012, Larry Shaffer +# All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions are met: +# * Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# * Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in the +# documentation and/or other materials provided with the distribution. +# * Neither the name of the Larry Shaffer nor the +# names of its contributors may be used to endorse or promote products +# derived from this software without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY Larry Shaffer ''AS IS'' AND ANY +# EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED +# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE +# DISCLAIMED. IN NO EVENT SHALL Larry Shaffer BE LIABLE FOR ANY +# DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES +# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; +# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND +# ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT +# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS +# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. +# """Find QScintilla2 PyQt4 module version. .. note:: Redistribution and use is allowed according to the terms of the BSD diff --git a/cmake/FindSPATIALITE.cmake b/cmake/FindSPATIALITE.cmake index 7fe7a0644183..74f1a65095ca 100644 --- a/cmake/FindSPATIALITE.cmake +++ b/cmake/FindSPATIALITE.cmake @@ -11,6 +11,9 @@ # SPATIALITE_INCLUDE_DIR # SPATIALITE_LIBRARY +# This macro checks if the symbol exists +include(CheckLibraryExists) + # FIND_PATH and FIND_LIBRARY normally search standard locations # before the specified paths. To search non-standard paths first, @@ -60,6 +63,9 @@ IF (SPATIALITE_FOUND) MESSAGE(STATUS "Found SpatiaLite: ${SPATIALITE_LIBRARY}") ENDIF (NOT SPATIALITE_FIND_QUIETLY) + # Check for symbol gaiaDropTable + check_library_exists("${SPATIALITE_LIBRARY}" gaiaDropTable "" SPATIALITE_VERSION_GE_4_0_0) + ELSE (SPATIALITE_FOUND) IF (SPATIALITE_FIND_REQUIRED) diff --git a/cmake/MacBundleMacros.cmake b/cmake/MacBundleMacros.cmake index a4e007e29df7..f44eea6d70a7 100644 --- a/cmake/MacBundleMacros.cmake +++ b/cmake/MacBundleMacros.cmake @@ -75,6 +75,7 @@ FUNCTION (COPY_FRAMEWORK FWPREFIX FWNAME FWDEST) EXECUTE_PROCESS (COMMAND cp -Rfp "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources" "${FWDEST}/${FWNAME}.framework/Versions/${FWVER}") EXECUTE_PROCESS (COMMAND ln -sfh Versions/Current/Resources "${FWDEST}/${FWNAME}.framework/Resources") ENDIF (IS_DIRECTORY "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/Resources") + EXECUTE_PROCESS (COMMAND install_name_tool -id "${ATEXECUTABLE}/${QGIS_FW_SUBDIR}/${FWNAME}" "${FWDEST}/${FWNAME}.framework/${FWNAME}") # debug variants SET (FWD "${FWNAME}_debug") IF ("${FWDEBUG}" STREQUAL "Debug" AND EXISTS "${FWPREFIX}/${FWNAME}.framework/Versions/${FWVER}/${FWD}") diff --git a/cmake_templates/qgsconfig.h.in b/cmake_templates/qgsconfig.h.in index 6e2a2702e20a..185724bc6aad 100644 --- a/cmake_templates/qgsconfig.h.in +++ b/cmake_templates/qgsconfig.h.in @@ -29,6 +29,8 @@ #define CMAKE_SOURCE_DIR "${CMAKE_SOURCE_DIR}" #define QSCINTILLA_VERSION_STR "${QSCINTILLA_VERSION_STR}" +//used by Mac to find system Qt plugins when bundle is run from build directory +#define QTPLUGINSDIR "${QT_PLUGINS_DIR}" #cmakedefine HAVE_POSTGRESQL diff --git a/debian/changelog b/debian/changelog index cf0e874ca14b..1fca22a9867a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -8,11 +8,11 @@ qgis (1.9.0) UNRELEASED; urgency=low * support DEB_BUILD_OPTIONS' parallel=n * add python-unittest2 build dependency for maverick and squeeze * disable PyQgsRectangle test on lucid (depends on unittest2) - * add python-qscintilla2 dependency to python-qgis + * add python-psycopg2 and python-qscintilla2 dependency to python-qgis * add support for ubuntu quantal * remove js files and add libjs-jquery/libjs-underscore dependency - -- Jürgen E. Fischer Tue, 18 Sep 2012 22:18:25 +0200 + -- Jürgen E. Fischer Fri, 09 Nov 2012 10:53:48 +0100 qgis (1.8.0) UNRELEASED; urgency=low diff --git a/debian/control.lucid b/debian/control.lucid index 636a4bc59585..88430abb9dd3 100644 --- a/debian/control.lucid +++ b/debian/control.lucid @@ -125,7 +125,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, python-psycopg2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS diff --git a/debian/control.maverick b/debian/control.maverick index 18c89b6e9113..67085aa88235 100644 --- a/debian/control.maverick +++ b/debian/control.maverick @@ -127,7 +127,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS diff --git a/debian/control.natty b/debian/control.natty index c1a4be29bb3f..69f51678ad60 100644 --- a/debian/control.natty +++ b/debian/control.natty @@ -126,7 +126,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS diff --git a/debian/control.oneiric b/debian/control.oneiric index fd0a64121ad0..868153d570ab 100644 --- a/debian/control.oneiric +++ b/debian/control.oneiric @@ -126,7 +126,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS diff --git a/debian/control.precise b/debian/control.precise index b05fc98d6a5c..4b08e632edc6 100644 --- a/debian/control.precise +++ b/debian/control.precise @@ -129,7 +129,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS diff --git a/debian/control.quantal b/debian/control.quantal index b05fc98d6a5c..4b08e632edc6 100644 --- a/debian/control.quantal +++ b/debian/control.quantal @@ -129,7 +129,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS diff --git a/debian/control.sid b/debian/control.sid index 9b6bba24ec9f..e5e9972ca741 100644 --- a/debian/control.sid +++ b/debian/control.sid @@ -130,7 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-pyspatialite, python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Description: Python bindings to Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes and display databases of geographic information. diff --git a/debian/control.squeeze b/debian/control.squeeze index 35ec440234af..581e1864ad23 100644 --- a/debian/control.squeeze +++ b/debian/control.squeeze @@ -126,7 +126,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} XB-Python-Version: ${python:Versions} Description: Python bindings to Quantum GIS diff --git a/debian/control.wheezy b/debian/control.wheezy index 5ddb76ed2dee..dce493633649 100644 --- a/debian/control.wheezy +++ b/debian/control.wheezy @@ -130,7 +130,7 @@ Description: GRASS plugin for Quantum GIS - architecture-independent data Package: python-qgis Section: python Architecture: any -Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} +Depends: python-qt4 (>=4.1.0), python-sip (>= 4.5.0), python-qgis-common (= ${source:Version}), python-psycopg2, python-qscintilla2, ${shlibs:Depends}, ${misc:Depends}, ${python:Depends} Provides: ${python:Provides} Description: Python bindings to Quantum GIS Quantum GIS is a Geographic Information System (GIS) which manages, analyzes diff --git a/doc/AUTHORS b/doc/AUTHORS index 1160147fc396..5c44a2124b2d 100644 --- a/doc/AUTHORS +++ b/doc/AUTHORS @@ -49,3 +49,4 @@ René-Luc D'Hont Etienne Tourigny Larry Shaffer Victor Olaya +Dave DeHaan diff --git a/doc/TRANSLATORS b/doc/TRANSLATORS index 31a097811199..12c5eb5362ce 100755 --- a/doc/TRANSLATORS +++ b/doc/TRANSLATORS @@ -1,50 +1,52 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + +
LanguageFinished %Translators
German
100.0
Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
Spanish
99.1
Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann, Diana Galindo
Galician (Spain)
98.8
Xan Vieiro
Dutch
91.2
Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk
Italian
89.7
Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna, Michele Beneventi, Marco Braida, Luca Casagrande, Luca Delucchi, Anne Gishla
Japanese
89.6
BABA Yoshihiko, Yoichi Kayama
Estonian (Estonia)
89.6
Veiko Viil
French
89.5
Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert
Portuguese (Brazil)
89.4
Arthur Nanni
Polish (Poland)
89.4
Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader
Russian
89.3
Artem Popov
Czech (Czech Republic)
88.8
Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant
Hungarian
87.7
Zoltan Siki
Korean (Korea, Republic of)
87.1
BJ Jang
Slovenian (Slovenia)
83.1
Jože Detečnik, Dejan Gregor
Chinese (China)
78.2
Calvin Ngei, Zhang Jun
Latvian
73.1
Maris Nartiss, Pēteris Brūns
Serbian ()
71.2
Goran Ivanković
Serbian ()
71.2
Goran Ivanković
Indonesian
61.8
Januar V. Simarmata, I Made Anombawa
Croatian (Croatia)
60.9
Zoran Jankovic
Portuguese (Portugal)
58.2
Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira, Pedro Palheiro, Nelson Silva
Thai
55.1
Man Chao
Swedish
53.9
Lars Luthman, Magnus Homann, Victor Axbom
Turkish
48.9
Osman Yilmaz
Ukrainian
48.7
Сергей Якунин
Chinese (Taiwan, Province of China)
44.1
Nung-yao Lin
Vietnamese
42.1
Bùi Hữu Mạnh
Greek, Modern (1453-) (Greece)
40.2
Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves
Icelandic
37.3
Thordur Ivarsson
Mongolian
35.6
Bayarmaa Enkhtur
Finnish
25.3
Marko Jarvenpaa
Danish (Denmark)
25.0
Preben Lisby
Georgian (Georgia)
23.9
Shota Murtskhvaladze, George Machitidze
Bulgarian
21.6
Захари Савов, Jordan Tzvetkov
Slovak
20.4
Lubos Balazovic
Albanian (Albania)
18.1
Lao
14.8
Anousak Souphavanh
Romanian
8.6
Lonut Losifescu-Enescu
Persian
4.7
Mola Pahnadayan
Arabic
2.0
Assem Kamal, Latif Jalil
Afrikaans
2.0
Hendrik Bosman
Lithuanian
0.8
Kestas M
German
99.8
Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho
Galician (Spain)
98.2
Xan Vieiro
Spanish
96.2
Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann, Diana Galindo
Italian
90.8
Paolo Cavallini, Flavio Rigolon, Maurizio Napolitano, Roberto Angeletti, Alessandro Fanna, Michele Beneventi, Marco Braida, Luca Casagrande, Luca Delucchi, Anne Gishla
Swedish
89.7
Lars Luthman, Magnus Homann, Victor Axbom
Dutch
88.5
Richard Duivenvoorde, Raymond Nijssen, Carlo van Rijswijk
Japanese
87.0
BABA Yoshihiko, Yoichi Kayama
Estonian (Estonia)
86.9
Veiko Viil
French
86.8
Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert
Portuguese (Brazil)
86.8
Arthur Nanni
Polish (Poland)
86.7
Robert Szczepanek, Milena Nowotarska, Borys Jurgiel, Mateusz Loskot, Tomasz Paul, Andrzej Swiader
Russian
86.7
Artem Popov
Czech (Czech Republic)
86.1
Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant
Hungarian
85.1
Zoltan Siki
Korean (Korea, Republic of)
84.5
BJ Jang
Slovenian (Slovenia)
80.7
Jože Detečnik, Dejan Gregor
Chinese (China)
75.9
Calvin Ngei, Zhang Jun
Latvian
70.9
Maris Nartiss, Pēteris Brūns
Serbian ()
69.1
Goran Ivanković
Serbian ()
69.1
Goran Ivanković
Portuguese (Portugal)
62.5
Giovanni Manghi, Joana Simoes, Duarte Carreira, Alexandre Neto, Pedro Pereira, Pedro Palheiro, Nelson Silva
Indonesian
60.0
Januar V. Simarmata, I Made Anombawa
Croatian (Croatia)
59.1
Zoran Jankovic
Thai
53.5
Man Chao
Ukrainian
49.4
Сергей Якунин
Turkish
47.4
Osman Yilmaz
Chinese (Taiwan, Province of China)
42.8
Nung-yao Lin
Vietnamese
40.9
Bùi Hữu Mạnh
Greek, Modern (1453-) (Greece)
39.0
Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves
Icelandic
36.2
Thordur Ivarsson
Mongolian
34.6
Bayarmaa Enkhtur
Finnish
24.6
Marko Jarvenpaa
Danish (Denmark)
24.3
Preben Lisby
Georgian (Georgia)
23.2
Shota Murtskhvaladze, George Machitidze
Bulgarian
20.9
Захари Савов, Jordan Tzvetkov
Slovak
19.8
Lubos Balazovic
Albanian (Albania)
17.5
Lao
14.3
Anousak Souphavanh
Romanian
8.3
Lonut Losifescu-Enescu
Persian
4.5
Mola Pahnadayan
Arabic
2.0
Assem Kamal, Latif Jalil
Afrikaans
1.9
Hendrik Bosman
Lithuanian
0.7
Kestas M
Hebrew
0.1
Catalan (Spain)
0.1
Xavi
Catalan (Spain)
0.1
Xavier Roijals
Basque (Spain)
0.0
Irantzu Alvarez
Norwegian
0.0
Swahili
0.0
Yohana Mapala
Tamil
0.0
Xhosa
0.0
diff --git a/doc/msvc.t2t b/doc/msvc.t2t index 913e59180839..08d4f1c5b731 100644 --- a/doc/msvc.t2t +++ b/doc/msvc.t2t @@ -2,7 +2,7 @@ ==Building with Microsoft Visual Studio== This section describes how to build QGIS using Visual Studio on Windows. This -is currently also who the binary QGIS packages are made (earlier versions used +is currently also how the binary QGIS packages are made (earlier versions used MinGW). This section describes the setup required to allow Visual Studio to be used to @@ -56,6 +56,7 @@ For the QGIS build you need to install following packages from OSGeo4W (select - libspatialindex-devel - python-qscintilla + This will also select packages the above packages depend on. Additionally QGIS also needs the include file ``unistd.h``, which normally @@ -105,8 +106,8 @@ git clone git://github.com/qgis/Quantum-GIS.git Create a 'build' directory somewhere. This will be where all the build output will be generated. -Now run ``cmake-gui`` and in the //Where is the source code:// box, browse to -the top level QGIS directory. +Now run ``cmake-gui`` (still from ``cmd``) and in the //Where is the source code:// +box, browse to the top level QGIS directory. In the //Where to build the binaries:// box, browse to the 'build' directory you created. diff --git a/i18n/qgis_de.ts b/i18n/qgis_de.ts index 72704dfefc55..88078ca4c8c4 100644 --- a/i18n/qgis_de.ts +++ b/i18n/qgis_de.ts @@ -2,56 +2,28 @@ - AboutDialog + CharacterWidget - - <img src="qrc:/sextante/images/sextante_logo.png" /> - <h2>SEXTANTE for QGIS</h2> - <p>SEXTANTE, a geoprocessing platform for QGIS</p> - <p>A development by Victor Olaya (volayaf@gmail.com).</p> - <p>Portions of this software contributed by: - <ul> - <li>Alexander Bruy</li> - <li>Carson Farmer (fTools algorithms)</li> - <li>Julien Malik (Orfeo Toolbox connectors)</li> - <li>Evgeniy Nikulin (Original Field Pyculator code)</li> - <li>Michael Nimm (mmqgis algorithms)</li> - <li>Camilo Polymeris (Threading). Developed as part of Google - Summer of Code 2012</li> - </ul> - </p> - <p>You are currently using SEXTANTE v%1</p> - <p>This software is distributed under the terms of the GNU GPL License v2. - <p>For more information, please visit our website at - <a href="http://sextantegis.com">http://sextantegis.com</a></p> - - - <img src="qrc:/sextante/images/sextante_logo.png" /> - <h2>SEXTANTE für QGIS</h2> - <p>SEXTANTE, eine Plattform zur Geoverarbeitung für QGIS</p> - <p>Eine Entwicklung von Victor Olaya (volayaf@gmail.com).</p> - <p>Teile der Software wurden beigetragen von: - <ul> - <li>Alexander Bruy</li> - <li>Carson Farmer (fTools-Algorithmen)</li> - <li>Julien Malik (Orfeo Toolbox-Verbinder)</li> - <li>Evgeniy Nikulin (Original-Pyculator-Code)</li> - <li>Michael Nimm (mmqgis-Algorithmen)</li> - <li>Camilo Polymeris (Threading). Als Teil des Google Summer of Code 2012 entwickelt.</li> - </ul> - </p> - <p>SEXTANTE v%1 wird gerade verwendet.</p> - <p>Die Software wird unter den Bedingungen der GNU GPL Lizenz v2 zur Verfügung gestellt. - <p>Weitere Informationen sind auf der Website - <a href="http://sextantegis.com">http://sextantegis.com</a> zu finden.</p> + + <p>Character: <span style="font-size: 24pt; font-family: %1">%2</span><p>Value: 0x%3 + <p>Zeichen: <span style="font-size: 24pt; font-family: %1">%2</span><p>Wert: 0x%3 - CharacterWidget + ConfigDialog - - <p>Character: <span style="font-size: 24pt; font-family: %1%2</span><p>Value: 0x%3"> - <p>Zeichen: <span style="font-size: 24pt; font-family: %1%2</span><p>Wert: 0x%3"> + Search... + Suchen... + + + Wrong value + Falscher Wert + + + Wrong parameter value: +%1 + Falscher Parameterwert: +%1 @@ -112,6 +84,7 @@ Dialog + @@ -128,6 +101,7 @@ + Browse Durchsuchen @@ -174,6 +148,7 @@ + Output point shapefile Ausgabepunktshapedatei @@ -183,6 +158,7 @@ Geodatenverarbeitung + @@ -365,7 +341,7 @@ - + Use only selected features Nur gewählte Objekte nutzen @@ -1007,7 +983,7 @@ Folgende Feldnamen sind länger als 10 Zeichen: Grid extent - Rastergrenze + Gittergrenze von Layer @@ -1017,12 +993,12 @@ Folgende Feldnamen sind länger als 10 Zeichen: Update extents from canvas - Layergrenzen aus aktueller Ansicht aktualisieren + Layergrenzen aus aktueller Ansicht Align extents and resolution to selected raster layer - Ausmaße und Auflösung am gewählten Rasterlayer ausrichten + Ausmaße und Auflösung am gewählten Layer ausrichten @@ -1047,12 +1023,12 @@ Folgende Feldnamen sind länger als 10 Zeichen: Output grid as polygons - Raster als Polygone ausgeben + Gitter als Polygone ausgeben Output grid as lines - Raster als Linien ausgeben + Gitter als Linien ausgeben Line intersections @@ -1133,6 +1109,38 @@ Dies kann zu unerwarteten Ergebnissen führen. Created output shapefiles in folder: %1 Ausgabeshapedateien erzeugt im Ordner: +%1 + + + Selected features: %1 + Gewählte Objekte: %1 + + + Eliminate + Entfernen + + + No selection in input layer + Keine Auswahl auf Eingabelayer + + + Error creating output file + Fehler beim Erzeugen des Ausgabelayers + + + Commit error + Commit-Fehler + + + Created output shapefile: +%1 + Ausgabeshapedatei erzeugt: +%1 + + + Could not eliminate features with these ids: +%1 + Konnte Objekte mit folgenden Dateien nicht eliminieren: %1 @@ -1162,22 +1170,27 @@ Dies kann zu unerwarteten Ergebnissen führen. Eindeutige Werte auflisten - + Target field Zielfeld - + Unique values list Eindeutige Werte - + Unique value count Anzahl eindeutiger Werte - + + Save errors location + Fehlerpositionen speichern + + + Press Ctrl+C to copy results to the clipboard Strg+C drücken, um die Ergebnisse in die Zwischenablage zu kopieren @@ -1190,6 +1203,14 @@ die Zwischenablage zu kopieren Random selection within subsets Zufällige Auswahl in Untermengen + + Could not replace geometry of feature with id %1 + Konnte die Geometrie des Objektes %1 nicht ersetzen + + + Could not delete feature with id %1 + Konnte Objekt %1 nicht löschen + Please specify input vector layer Bitte Eingabevektorlayer angeben @@ -1244,11 +1265,38 @@ Soll sie dem Projekt als neuer Layer hinzugefügt werden? Vereinfachungstoleranz + + Eliminate sliver polygons + Splitterpolygone entfernen + + + + area + Fläche + + + + Selected features: + Gewählte Objekte: + + + + common boundary + Gemeinsame Umgrenzung + + + + Merge selection with the neighbouring polygon with the largest + Auswahl mit dem benachbarten Polygon mit dem größten verschmelzen + + + Save to new file In neuer Datei speichern + Add result to canvas Ergebnis der Karte hinzufügen @@ -1284,19 +1332,6 @@ Soll sie dem Projekt als neuer Layer hinzugefügt werden? Liste leeren - - DlgAbout - - - About SEXTANTE - Über SEXTANTE - - - - about:blank - about:blank - - DlgAddGeometryColumn @@ -1370,6 +1405,29 @@ Soll sie dem Projekt als neuer Layer hinzugefügt werden? -1 + + DlgConfig + + + SEXTANTE options + SEXTANTE-Optionen + + + + Enter setting name to filter list + Einstellungsname eingeben, um Liste zu filtern + + + + Setting + Einstellung + + + + Value + Wert + + DlgCreateConstraint @@ -1576,6 +1634,37 @@ Soll sie dem Projekt als neuer Layer hinzugefügt werden? Länge + + DlgHelpEdition + + + Help editor + Hilfeeditor + + + + about:blank + about:blank + + + + Select element to edit + Element zur Bearbeitung wählen + + + + Element description + Elementbeschreibung + + + + DlgHistory + + + History and log + Protokoll + + DlgImportVector @@ -1654,6 +1743,52 @@ Soll sie dem Projekt als neuer Layer hinzugefügt werden? Räumlichen Index erzeugen + + DlgModeler + + + SEXTANTE modeler + SEXTANTE-Modellierung + + + + Inputs + Eingaben + + + + Algorithms + Algorithmen + + + + Enter algorithm name to filter list + Algorithmenname eingeben, um Liste zu filtern + + + + Enter model name here + Modellname hier eingeben + + + + Enter group name here + Gruppenname eingeben + + + + DlgResults + + + Results + Ergebnisse + + + + about:blank + about:blank + + DlgSqlWindow @@ -2264,14 +2399,14 @@ Wollen Sie ihn trotzdem abbrechen? Nach Abschluss zur &Karte hinzufügen - + Edit Bearbeiten - + Reset Zurücksetzen @@ -4031,28 +4166,39 @@ GEOS-Verarbeitungsfehler: Eine oder mehrere Objekte haben ungültige Geometrie.< GlobePlugin - + Launch Globe Globus starten - + Globe Settings Globus-Einstellungen - + + Unload Globe + Globus entladen + + + Overlay data on a 3D globe Daten auf einem 3D-Globus überlagern - + Settings for 3D globe Einstellungen für den 3D-Globus - + Unload globe + Globus entladen + + + + + &Globe &Globus @@ -4249,6 +4395,37 @@ GEOS-Verarbeitungsfehler: Eine oder mehrere Objekte haben ungültige Geometrie.< Ausgabeformat + + Help + + + Dialog + Dialog + + + + about:blank + about:blank + + + + HelpEditionDialog + + Outputs + Ausgaben + + + + HistoryDialog + + Clear + Löschen + + + Clear history and log + Protokoll löschen + + LayerPropertiesWidget @@ -4315,192 +4492,192 @@ GEOS-Verarbeitungsfehler: Eine oder mehrere Objekte haben ungültige Geometrie.< Neu - + &Settings &Einstellungen - + &Plugins Er&weiterungen - + &Raster &Raster - + &Help &Hilfe - + File Datei - + Manage Layers Layer koordinieren - + Digitizing Digitalisierung - + Advanced Digitizing Erweiterte Digitalisierung - + Map Navigation Kartennavigation - + Attributes Attribute - + Plugins Erweiterungen - + Help Hilfe - + Raster Raster - + Label Beschriftung - + &New Project &Neues Projekt - + Ctrl+N Strg+N - + &Open Project... Pr&ojekt öffnen... - + Ctrl+O Strg+O - + &Save Project Projekt &speichern - + Ctrl+S Strg+S - + Save Project &As... Projekt speichern &als... - + Ctrl+Shift+S Strg+Umschalt+S - + Save as Image... Bild speichern als... - + &New Print Composer &Neue Druckzusammenstellung - + Ctrl+P Strg+P - + Exit Beenden - + Ctrl+Q Strg+Q - + &Undo &Rückgängig - + Ctrl+Z Strg+Z - + &Redo &Wiederholen - + Ctrl+Shift+Z Strg+Umschalt+Z - + Cut Features Ausgewählte Objekte ausschneiden - + Ctrl+X Strg+X - + Copy Features Objekte kopieren - + Ctrl+C Strg+C - + Paste Features Objekte einfügen - + Ctrl+V Strg+V - + Ctrl+. Strg+. @@ -4515,472 +4692,472 @@ GEOS-Verarbeitungsfehler: Eine oder mehrere Objekte haben ungültige Geometrie.< Neues Projekt aus Vorlage - + Vector Vektor - + Database Datenbank - + Web Web - + Composer Manager... Druckzusammenstellungen verwalten... - + Add Feature Objekt hinzufügen - + Move Feature(s) Objekt(e) verschieben - + Reshape Features Objekte überarbeiten - + Split Features Objekte trennen - + Delete Selected Ausgewähltes löschen - + Add Ring Ring hinzufügen - + Add Part Teil hinzufügen - + Simplify Feature Objekt vereinfachen - + Delete Ring Ring löschen - + Delete Part Teil löschen - + Node Tool Knotenwerkzeug - + Rotate Point Symbols Punktsymbole drehen - + Snapping Options... Fangoptionen... - + Pan Map Karte verschieben - + Zoom In Hineinzoomen - + Ctrl++ Strg++ - + Zoom Out Hinauszoomen - + Ctrl+- Strg+- - + Identify Features Objekte abfragen - + Ctrl+Shift+I Strg+Umschalt+I - + Measure Line Linie messen - - + + Ctrl+Shift+M Strg+Umschalt+M - + Measure Area Fläche messen - + Ctrl+Shift+J Strg+Umschalt+J - + Measure Angle Winkel messen - + Zoom Full Volle Ausdehnung - + Ctrl+Shift+F Strg+Umschalt+F - + Zoom to Layer Auf den Layer zoomen - + Zoom to Selection Zur Auswahl zoomen - + Ctrl+J Strg+J - + Zoom Last Zoom zurück - + Zoom Next Zoom vor - + Zoom Actual Size Auf tatsächliche Größe zoomen - + Zoom to Native Pixel Resolution Auf normale Pixelauflösung zoomen - + Map Tips Kartenhinweise - + Show information about a feature when the mouse is hovered over it Informationen zu einem Objekt anzeigen, wenn die Maus darüber fährt - + New Bookmark... Neues Lesezeichen... - + Ctrl+B Strg+B - + Show Bookmarks Lesezeichen anzeigen - + Ctrl+Shift+B Strg+Umschalt+B - + Refresh Aktualisieren - + Ctrl+R Strg+R - + Text Annotation Beschriftungstext - + Move Annotation Beschriftung verschieben - + Labeling Beschriftung - + Layer Labeling Options Layerbeschriftungseinstellungen - + New Shapefile Layer... Neuer Shapedatei-Layer... - + Ctrl+Shift+N Strg+Umschalt+N - + New SpatiaLite Layer ... Neuer SpatiaLite-Layer... - + Ctrl+Shift+A Neuen SpatiaLite-Layer anlegen - + Raster calculator ... Rasterrechner ... - + Add Vector Layer... Vektorlayer hinzufügen... - + Ctrl+Shift+V Strg+Umschalt+V - + Add Raster Layer... Rasterlayer hinzufügen... - + Ctrl+Shift+R Strg+Umschalt+R - + Ctrl+Shift+D Strg+Umschalt+D - + Add SpatiaLite Layer... SpatiaLite-Layer hinzufügen... - + Ctrl+Shift+L Strg+Umschalt+L - + Add MSSQL Spatial Layer... Räumlichen MSSQL-Layer hinzufügen... - + Add WMS Layer... WMS-Layer hinzufügen... - + Ctrl+Shift+W Strg+Umschalt+W - + Open Attribute Table Attributtabelle öffnen - + Toggles the editing state of the current layer Bearbeitungsstatus des aktuellen Layers umschalten - + Save edits to current layer, but continue editing Speichert Änderungen und bleibt im Bearbeitungsmodus - + Remove Layer(s) Layer löschen - + Ctrl+D Strg+D - + Set CRS of Layer(s) KBS von Layer(n) setzen - + Ctrl+Shift+C Strg+Umschalt+C - + Rotate Label Ctl (Cmd) increments by 15 deg. Beschriftung drehen Strg (Cmd) erhöht um 15 Grad. - + Style Manager... Stilmanager... - + Stretch Histogram to Full Dataset Histogramm auf den ganzen Datensatz strecken - + Embed Layers and Groups... Eingebettete Layer und Gruppen... - + &Copyright Label &Urheberrechtshinweis - + Creates a copyright label that is displayed on the map canvas. Erzeugt einen Urheberrechtshinweis auf dem Kartenbild. - + &North Arrow &Nordpfeil - + "Creates a north arrow that is displayed on the map canvas" "Erzeugt einen Nordpfeil und stellt ihn in der Karte dar" - + &Scale Bar &Maßstab - - + + Creates a scale bar that is displayed on the map canvas Erzeugt eine Maßstabsleiste, die im Kartenbild angezeigt wird - + Add WFS Layer... WFS-Layer hinzufügen... - + Add WFS Layer WFS-Layer hinzufügen - + Feature Action Objektaktion - - + + Pan Map to Selection Karte zur Auswahl verschieben - + Copy style Stil kopieren - + Paste style Stil einfügen - + Add WCS Layer... WCS-Layer hinzufügen... - + &Grid &Gitter - + Grid Gitter - + Pin/Unpin Labels Beschriftung anpinnen/lösen - + Pin/Unpin Labels Click or marquee on label to pin Shift unpins, Ctl (Cmd) toggles state @@ -4991,18 +5168,18 @@ Umschalt löst, Strg (Cmd) schalten um Funktioniert auf allen änderbaren Layern - - + + Highlight Pinned Labels Angepinnte Beschriftungen hervorheben - + Show/Hide Labels Beschriftungen anzeigen/ausblenden - + Show/Hide Labels Click or marquee on feature to show label Shift+click or marquee on label to hide it @@ -5012,325 +5189,424 @@ Objekt anklicken oder markieren, um die Beschriftung anzuzeigen Funktioniert auf allen ändernbaren Layern - - + + Html Annotation HTML-Beschriftung - - + + + Duplicate Layer(s) + Layer kopieren + + + + SVG annotation + SVG-Anmerkung + + + + + Save Edits for All Layers + Änderungen aller Layer speichern + + + + Save edits for all layers, but continue editing + Änderungen aller Layer speichern, aber mit Bearbeitung fortfahren + + + + New Blank Project Neues leeres Projekt - + Local Cumulative Cut Stretch Lokale kommulative Schnittstreckung - + Local cumulative cut stretch using current extent, default limits and estimated values. Lokale kommulative Schnittstreckung mit aktueller Ausdehnung, Vorgabegrenzen und geschätzten Werten. - + Full Dataset Cumulative Cut Stretch Kommulative Schnittstreckung über Gesamtdatensatz - + Cumulative cut stretch using full dataset extent, default limits and estimated values. Kommulative Schnittstreckung über gesamten Datensatzausdehnung, Vorgabegrenzen und geschätzten Werten. - + Properties... Eigenschaften... - + Query... Abfrage... - + Add to Overview Zur Übersicht hinzufügen - + Ctrl+Shift+O Strg+Umschalt+O - + Add All to Overview Alle zur Übersicht hinzufügen - + Merge Selected Features Gewählte Objekte verschmelzen - + Merge Attributes of Selected Features Attribute gewählter Objekte vereinen - + Select Single Feature Einzelnes Objekt wählen - + Select Features by Rectangle Objekte durch Rechteck wählen - + Select Features by Polygon Objekte durch Polygon wählen - + Select Features by Freehand Objekte freihändig wählen - + Select Features by Radius Objekte durch Radius wählen - + Deselect Features from All Layers Auswahlen aller Layer aufheben - + Form Annotation Beschriftungsformular - + Add PostGIS Layers... PostGIS-Layer hinzufügen... - + Toggle Editing Bearbeitungsstatus umschalten - + Save Edits Änderungen speichern - + Save As... Speichern als... - + Save Selection as Vector File... Auswahl als Vektordatei speichern... - + Set Project CRS from Layer Layer-KBS dem Projekt zuweisen - + Remove All from Overview Alle aus Übersicht entfernen - + Show All Layers Alle Layer anzeigen - + Ctrl+Shift+U Strg+Umschalt+U - + Hide All Layers Alle Layer ausblenden - + Ctrl+Shift+H Strg+Umschalt+H - + Manage Plugins... Erweiterungen verwalten... - + Toggle Full Screen Mode Auf Vollbildmodus schalten - + Ctrl+F Strg+F - + Project Properties... Projekteinstellungen... - + Ctrl+Shift+P Strg+Umschalt+P - + Options... Optionen... - + Custom CRS... Benutzerkoordinatenbezugssystem... - + Configure shortcuts... Tastenkürzel festlegen... - + Local Histogram Stretch Lokale Histogrammstreckung - + Stretch histogram of active raster to view extents Strecke das Histogram des aktiven Rasters um Ausdehnung zu zeigen - + Help Contents Hilfe-Übersicht - + F1 F1 - + API documentation API-Dokumentation - + QGIS Home Page QGIS-Homepage - + Ctrl+H Strg+H - + Check QGIS Version QGIS-Version überprüfen - + Check if your QGIS version is up to date (requires internet access) Aktualität Ihrer QGIS-Version überprüfen (erfordert Internetzugang) - + About Über - + QGIS Sponsors QGIS-Sponsoren - - + + Move Label Beschriftung verschieben - + Rotate Label Beschriftung drehen - + Change Label - + Run Feature Action Objektaktion ausführen - - + + Touch zoom and pan Zoomen und Verschieben durch Berührung - + Offset Curve Linie versetzen - + Python Console Python-Konsole - + Full histogram stretch Volle Histogrammstreckung - + Customization... Anpassungen... - + mActionCatchForCustomization mActionCatchForCustomization - + This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization Dies ist nur hier um widersprüchliche Kürzel zu vermeiden, das Kürzel wird in QgsCustomization abgefangen - + Ctrl+M Strg+M - + Embed layers and groups from other project files Eingebettete Layer und Gruppe aus anderen Projektdateien + + ModelerDialog + + Edit model help + Modellhilfe bearbeiten + + + Run + Starten + + + Execute current model + Aktuelle Modell ausführen + + + Open + Öffnen + + + Open existing model + Vorhandenes Modell öffnen + + + Save + Speichern + + + Save current model + Aktuelles Modell speichern + + + Search... + Suchen... + + + Warning + Warnung + + + Please enter group and model names before saving + Bitte Gruppen- und Modellnamen vor dem Speichern angeben + + + Save Model + Modell speichern + + + SEXTANTE models (*.model) + SEXTANTE-Modelle (*.model) + + + Model saved + Modell gespeichert + + + Model was correctly saved. + Modell wurde korrekt gespeichert. + + + Open Model + Modell öffnen + + + Could not open model + Konnte Modell nicht öffnen + + + The selected model could not be loaded. +Wrong line: %1 + Gewähltes Modell konnte nicht geladen werden. +Falsche Zeile: %1 + + + Parameters + Parameter + + OracleConnectGuiBase @@ -6376,6 +6652,10 @@ Bitte koorigieren Sie dies, da die OSM-Erweiterung nicht weiß welche Layer das Clear console Konsole leeren + + Settings + Einstellungen + Import Class Klasse importieren @@ -6424,25 +6704,25 @@ Bitte koorigieren Sie dies, da die OSM-Erweiterung nicht weiß welche Layer das QGis::UnitType - + meters Meter - + feet Fuß - - - + + + degrees Grad - + <unknown> <unbekannt> @@ -6559,167 +6839,188 @@ Bitte koorigieren Sie dies, da die OSM-Erweiterung nicht weiß welche Layer das Stunden - + Cannot convert '%1' to double Kann '%1' nicht in Fließkommazahl umwandeln - + Cannot convert '%1' to int Kann '%1' nicht in Ganzzahl umwandeln - + Cannot convert '%1' to DateTime Kann '%1' nicht in DateTime umwandeln - + Cannot convert '%1' to Date Kann '%1' nicht in Datum umwandeln - + Cannot convert '%1' to Time Kann '%1' nicht in Zeit umwandeln - + Cannot convert '%1' to Interval Kann '%1' nicht in Interval umwandeln - + Cannot convert '%1' to boolean Kann '%1' nicht in Wahrheitswert umwandeln - + Invalid regular expression '%1': %2 Ungültiger regulärer Ausdruck '%1': %2 - + Index is out of range Index außerhalb des Bereichs - - - - - - - - - - - - - + + + + + + + + + + + + + Math Mathematik - - - - - - - + + + + + + + Conversions Umwandlungen - + Conditionals Bedingungen - - - - - - - - - + + + + + + + + + Date and Time Datum und Zeit - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + String Zeichenketten - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Geometry Geometrie - - - - + + + + Record Datensatz - + Special Speziell - - + + No root node! Parsing failed? Kein Wurzelknoten! Parsen gescheitert? - + (no root) (Keine Wurzel) - + Unary minus only for numeric values. Negatives Vorzeichen nur für nummerische Werte. - + Can't preform /, *, or % on DateTime and Interval Kann /, * or % nicht auf Daten oder Intervallen ausführen - + [unsupported type;%1; value:%2] [nicht unterstützter Typ;%1; Wert:%2] - + Column '%1' not found Spalte '%1' nicht gefunden @@ -6789,7 +7090,7 @@ Would you like to specify path (GISBASE) to your GRASS installation? - + @@ -7239,11 +7540,10 @@ Would you like to specify path (GISBASE) to your GRASS installation? - - - - - + + + + @@ -7255,12 +7555,11 @@ Would you like to specify path (GISBASE) to your GRASS installation? - - - - - - + + + + + Warning Warnung @@ -7393,73 +7692,73 @@ Would you like to specify path (GISBASE) to your GRASS installation? Version 0.001 - + Python is not enabled in QGIS. Python ist in QGIS nicht aktiviert. - - - - - - - + + + + + + + - + Plugins Erweiterungen - + Loaded %1 (package: %2) %1 geladen (Paket: %2) - + Library name is %1 Bibiliotheksname is %1 - - + + Failed to load %1 (Reason: %2) Konnte %1 nicht laden (Grund: %2) - + Attempting to resolve the classFactory function Versuche die Funktion classFactory aufzulösen - + Loaded %1 (Path: %2) %1 geladen (Pfad: %2) - + Error Loading Plugin Fehler beim Laden der Erweiterung - + There was an error loading a plugin.The following diagnostic information may help the QGIS developers resolve the issue: %1. Beim Laden einer Erweiterung trat ein Fehler auf. Die folgenden Informationen könnten den QGIS-Entwicklern bei der Lösung des Problem helfen: %1. - + Unable to find the class factory for %1. Konnte die Klassenfabrik für %1 nicht finden. - + Plugin %1 did not return a valid type and cannot be loaded Erweiterung %1 gab keinen gültigen Typ zurück und kann nicht geladen werden @@ -7469,7 +7768,7 @@ Would you like to specify path (GISBASE) to your GRASS installation? Wo ist '%1' (ursprünglicher Ort: %2)? - + Error when reading metadata of plugin %1 Fehler beim Lesen der Metadaten der Erweiterung %1 @@ -7594,7 +7893,7 @@ Would you like to specify path (GISBASE) to your GRASS installation? Kann Raster nicht abfragen - + Python error Python-Fehler @@ -7864,218 +8163,227 @@ Fehler(%2): %3 Unbekannter Geometrietyp - + OGR driver for '%1' not found (OGR error: %2) OGR-Treiber für '%1' nicht gefunden (OGR-Fehler: %2) - + trimming attribute name '%1' to ten significant characters produces duplicate column name. Kürzung des Attributnamens '%1' auf 10 signifikante Stellen führt zu doppelten Spaltennamen. - + creation of data source failed (OGR error:%1) Erzeugung der Datenquelle gescheitert (OGR-Fehler: %1) - + creation of layer failed (OGR error:%1) Layererzeugung schlug fehl (OGR-Fehler: %1) - + unsupported type for field %1 Feldtyp für %1 nicht unterstützt - + creation of field %1 failed (OGR error: %2) Erzeugung des Felds %1 gescheitert (OGR-Fehler: %2) - + created field %1 not found (OGR error: %2) Erzeugtes Feld %1 nicht gefunden (OGR-Fehler: %2) - + Invalid variant type for field %1[%2]: received %3 with type %4 Ungültiger Typ für Feld %1[%2]: %3 mit Typ %4 empfangen - - + + Feature geometry not imported (OGR error: %1) Objektgeometrie nicht importiert (OGR-Fehler: %1) - + Feature creation error (OGR error: %1) Objekterzeugungsfehler (OGR-Fehler: %1) - - + + Failed to transform a point while drawing a feature of type '%1'. Writing stopped. (Exception: %2) Transformation eines Punkts schlug beim Zeichnen eines Objekts vom Typ '%1' fehl. Schreiben beendet (Ausnahme %2) - - + + Feature write errors: Objektschreibfehler: - - + + Stopping after %1 errors Abbruch nach %1 Fehlern - + Only %1 of %2 features written. Nur %1 von %2 Objekten geschrieben. - + Arc/Info ASCII Coverage Arc/Info ASCII Coverage - + Atlas BNA Atlas BNA - + Comma Separated Value Komma-separierte Werte [CSV] - + ESRI Shapefile ESRI-Shapedatei - + FMEObjects Gateway FMEObjects Gateway - + GeoJSON GeoJSON - + GeoRSS GeoJSON - + Geography Markup Language [GML] Geography Markup Language [GML] - + Generic Mapping Tools [GMT] Generic Mapping Tools [GMT] - + GPS eXchange Format [GPX] GPS-Austauschformat [GPX] - + INTERLIS 1 INTERLIS 1 - + INTERLIS 2 INTERLIS 2 - + Keyhole Markup Language [KML] Keyhole Markup Language [KML] - + + Mapinfo TAB + Mapinfo-TAB + + + + Mapinfo MIF + Mapinfo-MIF + + Mapinfo File Mapinfo-Datei - + Microstation DGN Microstation DGN - + S-57 Base file S-57 Base-Datei - + Spatial Data Transfer Standard [SDTS] Spatial Data Transfer Standard [SDTS] - + SQLite SQLite - + + SpatiaLite + SpatiaLite + + + AutoCAD DXF AutoCAD DXF - + Geoconcept Geoconcept - + ESRI FileGDB ESRI-FileGDB - - Groups not yet supported - Gruppen noch nicht unterstützt - - - - - + + + Cannot draw raster Kann Raster nicht zeichnen @@ -8090,17 +8398,17 @@ Nur %1 von %2 Objekten geschrieben. <html>QGIS bringt's!</html> - + CRS undefined - defaulting to project CRS KBS undefiniert - Projekt-KBS wird voreingestellt - + CRS undefined - defaulting to default CRS: %1 KBS undefiniert - voreingestelltes KBS gewählt: %1 - + Reading raster Lade Raster @@ -8170,7 +8478,7 @@ Nur %1 von %2 Objekten geschrieben. Eine Erweiterung die räumliche Abfragen von Vektorlayern ermöglicht - + QGIS starting in non-interactive mode not supported. You are seeing this message most likely because you have no DISPLAY environment variable set. @@ -8316,11 +8624,11 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA OGR[%1] Fehler %2: %3 - - - + - + + + @@ -8469,28 +8777,27 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA Konnte Datei %1.qpj nicht erzeugen - - + Cannot get GDAL raster band: %1 Konnte GDAL-Rasterkanal nicht bestimmen: %1 - + Cannot open GDAL MEM dataset %1: %2 Konnte GDAL-MEM-Datensatz %1 nicht öffnen: %2 - + Cannot GDALCreateGenImgProjTransformer: GDALCreateGenImgProjTransformer-Fehler: - + Cannot inittialize GDALWarpOperation : GDALWarpOperation-Initialisierungsfehler: - + Cannot ChunkAndWarpImage: %1 ChungAndWarpImage-Fehler: %1 @@ -8521,12 +8828,12 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA Eine Erweiterung, um Anzahl, Summen und Mittel von Rastern zu jedem Polygon eines Vektorlayers zu berechnen - + Globe Globus - + Overlay data on a 3D globe Daten auf einem 3D-Globus überlagern @@ -8546,44 +8853,44 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA Laden des Layers gescheitert - + Creation error for features from #%1 to #%2. Provider errors was: %3 Objekterzeugungsfehler von #%1 bis #%2. Fehler des Datenlieferanten war: %3 - + Vector import Vektorimport - + Only %1 of %2 features written. Nur %1 von %2 Objekten geschrieben. - - + + - + Connection to database failed Verbindung zur Datenbank schlug fehl - + Creation of data source %1 failed: %2 Erzeugung der Datenquelle %1 gescheitert: %2 - + Loading of the layer %1 failed Laden des Layers %1 gescheitert - - + + Unable to delete layer %1: %2 Konnte Ebene %1 nicht löschen: @@ -8596,13 +8903,13 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA - + Unsupported type for field %1 Nicht unterstützter Typ für Feld %1 - + Creation of fields failed Erzeugung der Felder gescheitert @@ -8622,26 +8929,32 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA Erzeugung der Felder gescheitert - + Unable to initialize SpatialMetadata: Konnte räumliche Metadaten nicht initialisieren: - + Could not create a new database Konnte neue Datenbank nicht anlegen - + Unable to activate FOREIGN_KEY constraints [%1] Konnte Fremdschlüssel-Constraint nicht aktivieren [%1] - + + Unable to delete table %1 + + Konnte Tabelle %1 nicht löschen + + + Unable to delete table %1: Konnte Tabelle %1 nicht löschen: @@ -8688,17 +9001,17 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA - - - - - - - - - - - + + + + + + + + + + + Exception: %1 Ausnahme: %1 @@ -8714,23 +9027,23 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA - - - - - - - - - - - - + + + + + + + + + + + + GEOS GEOS - + GEOS prior to 3.2 doesn't support GEOSInterpolate GEOS vor 3.2 unterstützt GEOSInterpolate nicht @@ -8773,39 +9086,45 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA Lese Rasterteil %1 von %2 - + Building pyramids failed - write access denied Erzeugung der Pyramide gescheitert - Schreibzugriff verweigert - + Write access denied. Adjust the file permissions and try again. Schreibzugriff verweigert. Passen Sie die Dateizugriffsrechte an und versuchen Sie es erneut. - - - - + + + + Building pyramids failed. Erstellung der Pyramiden fehlgeschlagen. - + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. Die Datei war nicht beschreibbar. Einige Formate unterstützen Übersichtspyramiden nicht. Gucken Sie im Zweifel in die GDAL-Dokumentation. - - + + Building pyramid overviews is not supported on this type of raster. Für diese Art von Raster können keine Pyramiden erstellt werden. - + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. Erstellung von interne Pyramiden-Übersichten weder für JPEG-komprimierte Rasterlayer noch durch Ihre aktuelle libtiff-Bibliothek unterstützt. + + + + All Ramps + Alle Farbverläufe + QextSerialPort @@ -8893,412 +9212,448 @@ Diese Meldung erscheint höchstwahrscheinlich, weil die Umgebungsvariable DISPLA QgisApp - - - + + Invalid Data Source Ungültige Datenquelle - - + + No Layer Selected Keinen Layer ausgewählt - + There is a new version of QGIS available Eine neue Version von QGIS ist verfügbar - + You are running a development version of QGIS Sie verwenden eine Entwicklungsversion von QGIS - + You are running the current version of QGIS Sie verwenden die aktuelle Version von QGIS - + Would you like more information? Wollen Sie mehr Information? - - - - + + + + QGIS Version Information QGIS-Versionsinformationen - + Unable to get current version information from server Kann Informationen zu aktuellen Version nicht vom Server holen - + Connection refused - server may be down Verbindung abgelehnt - Server vielleicht heruntergefahren - + QGIS server was not found QGIS-Server nicht gefunden - + + + + Invalid Layer Ungültiger Layer - + %1 is an invalid layer and cannot be loaded. %1 ist ein ungültiger Layer und kann nicht geladen werden. - + Problem deleting features Problem beim Löschen der Objekte - + A problem occured during deletion of features Beim Löschen der Objekte ist ein Problem aufgetreten - + No Vector Layer Selected Es wurde kein Vektorlayer gewählt - + Deleting features only works on vector layers Löschen von Objekten ist nur von Vektorlayern möglich - + To delete features, you must select a vector layer in the legend Zum Löschen von Objekte zu muss ein Vektorlayer in der Legende gewählt werden - + Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties. Legende, die alle im Kartenfenster angezeigten Layer enthält. Bitte auf die Kontrollkästchen klicken, um einen Layer an- oder auszuschalten. Mit einem Doppelklick in der Legende kann die Erscheinung und sonstige Eigenschaften eines Layers festgelegt werden. - + Map overview canvas. This canvas can be used to display a locator map that shows the current extent of the map canvas. The current extent is shown as a red rectangle. Any layer on the map can be added to the overview canvas. Übersichtsfenster. Dieses Fenster kann benutzt werden um die momentane Ausdehnung des Kartenfensters darzustellen. Der momentane Ausschnitt ist als rotes Rechteck dargestellt. Jeder Layer in der Karte kann zum Übersichtsfenster hinzugefügt werden. - + Displays the current map scale Zeigt den momentanen Kartenmaßstab an - + Render Zeichnen - + When checked, the map layers are rendered in response to map navigation commands and other events. When not checked, no rendering is done. This allows you to add a large number of layers and symbolize them before rendering. Wenn angewählt, werden die Kartenlayer abhängig von der Bedienung der Navigationsinstrumente, gezeichnet. Anderenfalls werden die Layer nicht gezeichnet. Dies erlaubt es, eine große Layeranzahl hinzuzufügen und das Aussehen der Layer vor dem Zeichnen zu setzen. - + Choose a QGIS project file Eine QGIS-Projektdatei wählen - + Toggle map rendering Zeichnen der Karte einschalten - + Open a GDAL Supported Raster Data Source Öffnen einer GDAL-Rasterdatenquelle - + Choose a QGIS project file to open QGIS-Projektdatei zum Öffnen wählen - + Reading settings Lese Einstellungen - + Setting up the GUI Richte die Oberfläche ein - + Checking database Überprüfe die Datenbank - + Restoring loaded plugins Stelle die geladenen Erweiterungen wieder her - + Initializing file filters Initialisiere Dateifilter - + Restoring window state Stelle Fensterstatus wieder her - - + + QGIS Ready! QGIS ist startklar! - + Ready Fertig - + QGIS version QGIS-Version - + QGIS code revision QGIS-Codeversion - + Compiled against Qt Kompiliert gegen Qt - + Running against Qt Laufendes Qt - + GEOS Version GEOS-Version - + PostgreSQL Client Version PostgreSQL-Client-Version - - + + No support. Keine Unterstützung. - + SpatiaLite Version SpatiaLite-Version - + QWT Version QWT-Version - + This copy of QGIS writes debugging output. Diese QGIS-Kopie schreibt Debugausgaben. - + Unable to open project Kann das Projekt nicht öffnen - + + + Duplicate layer: + Layer kopieren: + + + + %1 (duplication resulted in invalid layer) + %1 (Kopieren führt zu ungültigem Layer) + + + + %1 (%2type unsupported) + %1 (Typ %2 nicht unterstützt) + + + Unknown network socket error: %1 Unbekannter Netzwerkfehler: %1 - - - + + Layer is not valid Layer ist ungültig - - + The layer is not a valid layer and can not be added to the map Der Layer ist ungültig und kann daher nicht zum Kartenfenster hinzugefügt werden - + + Project has layer(s) in edit mode with unsaved edits, which will NOT be saved! + Projekt hat Layer im Bearbeitungsmodus mit nicht gespeicherten Bearbeitungen, die NICHT gespeichert werden! + + + Save? Speichern? - + + Do you want to save the current project?%1 + Wollen Sie das aktuelle Projekt speichern?%1 + + + Current CRS: %1 (OTFR enabled) Aktuelles KBS: %1 (OTF-Reprojektion aktiv) - + Current CRS: %1 (OTFR disabled) Aktuelles KBS: %1 (OTF-Reprojektion aus) - + Extents: Ausdehnung: - + + + Error adding valid layer to map canvas + Fehler beim Hinzufügen eines gültigen Layers zur Karte + + + + + + Raster layer + Raster-Layer + + + Unsupported Data Source Nicht unterstütztes Datenformat - - - - - - - + + + + + + + + + Error Fehler - + Checking provider plugins Provider-Erweiterungen werden geprüft - + Starting Python Python wird gestartet - + Provider does not support deletion Provider unterstützt keine Löschoperationen - + Data provider does not support deleting features Der Provider hat nicht die Möglichkeit, Objekte zu löschen - - - + + + Layer not editable Der Layer kann nicht bearbeitet werden - + The current layer is not editable. Choose 'Start editing' in the digitizing toolbar. Der aktuelle Layer kann nicht bearbeitet werden. Bitte 'Bearbeitungsstatus umschalten' aus der Digitalisierwerkzeugleiste wählen. - + Scale Maßstab - + Current map scale (formatted as x:y) Aktueller Kartenmaßstab (x:y formatiert) - + Map coordinates at mouse cursor position Kartenkoordinaten beim Mauszeiger - - Do you want to save the current project? - Soll das aktuelle Projekt gespeichert werden? - - - + Current map scale Aktueller Kartenmaßstab - + Project file is older Projektdatei ist älter - + <tt>Settings:Options:General</tt> Menu path to setting options <tt>Einstellungen:Optionen:Allgemein</tt> - + Warn me when opening a project file saved with an older version of QGIS Beim Öffnen einer Projektdatei, die mit einer älteren QGIS-Version erstellt wurde, warnen - + Overview Übersicht - + Progress bar that displays the status of rendering layers and other time-intensive operations Fortschrittsanzeige für das Zeichnen von Layern und andere zeitintensive Operationen - + Stop map rendering Zeichnen der Karte abbrechen - + Map canvas. This is where raster and vector layers are displayed when added to the map Kartenansicht. Hier werden Raster- und Vektorlayer angezeigt, wenn sie der Karte hinzugefügt werden - + Toggle extents and mouse position display Ausdehnungs- und Mauspositionsanzeige umschalten - + This icon shows whether on the fly coordinate reference system transformation is enabled or not. Click the icon to bring up the project properties dialog to alter this behaviour. Diese Icon zeigt an, ob On-The-Fly-Transformation des Koordinatenbezugssystem aktiv ist. Anklicken, um dies in den Projektionseigenschaften zu ändern. - + CRS status - Click to open coordinate reference system dialog KBS-Status - Klicken um den Dialog zum Koordinatenbezugssystem zu öffnen - + Maptips require an active layer Kartentipps erfordern einen aktuellen Layer - + Multiple Instances of QgisApp Mehrere QgisApp-Instanzen - + Multiple instances of Quantum GIS application object detected. Please contact the developers. @@ -9306,191 +9661,206 @@ Please contact the developers. Bitte nehmen Sie Kontakt zu den Entwicklern auf. - + Quantum GIS Quantum GIS - + Minimize Minimieren - + Ctrl+M Minimize Window Strg+M - + Minimizes the active window to the dock Minimiert das aktive Fenster ins Dock - + Zoom Zoom - + Toggles between a predefined size and the window size set by the user Schaltet zwischen voreingestellter und vom Benutzer bestimmten Fenstergröße um - + Bring All to Front Alle in den Vordergrund bringen - + Bring forward all open windows Alle geöffneten Fenster vorholen - + Failed to open Python console: Konnte Python-Konsole nicht öffnen: - + Panels Bedienfelder - + Toolbars Werkzeugkästen - + &Database Da&tenbank - - + + Coordinate: Koordinate: - + Current map coordinate Aktuelle Kartenkoordinate - + Control rendering order Bestimmt Zeichenreihenfolge - + Layer order Layerreihenfolge - - - + + + Private qgis.db Benutzer qgis.db - + Could not open qgis.db Konnte qgis.db nicht öffnen - + Migration of private qgis.db failed. %1 Migration der Benutzer qgis.db schlug fehl. %1 - + Compiled against GDAL/OGR Kompiliert mit GDAL/OGR - + Running against GDAL/OGR Läuft mit GDAL/OGR - + %1 doesn't have any layers %1 hat keine Layer - + Select raster layers to add... Einzufügende Rasterlayer wählen... - + Cannot get MSSQL select dialog from provider. Konnte den MSSQL-Auswahldialog nicht vom Datenlieferanten holen. - - - + + + QGis files QGis-Dateien - + Labeling Beschriftung - + Cannot copy style: %1 Kann Stil nicht kopieren: %1 - + Cannot parse style: %1:%2:%3 Kann Stil nicht interpretieren: %1:%2:%3 - + Cannot read style: %1 Kann Stil nicht lesen: %1 - + + copy + Kopie + + + + Plugin layer + Erweiterungslayer + + + + Memory layer + Speicherlayer + + + Couldn't load Python support library: %1 Konnte Python-Unterstützungsbibliothek nicht laden: %1 - + Couldn't resolve python support library's instance() symbol. Konnte Symbol instance() nicht in Python-Unterstützungsbibliothek finden. - + Python support ENABLED :-) Python-Unterstützung aktiviert :-) - + QGIS - Changes since last release QGIS-Änderung seit der letzten Ausgabe - - + + To perform a full histogram stretch, you need to have a raster layer selected. Um eine volle Histogrammstreckung durchzuführen, muß ein Rasterlayer gewählt sein. - + This project file was saved by an older version of QGIS Die Projektdatei wurde mit einer älteren QGIS-Version gespeichert - + Always ignore these errors? @@ -9499,7 +9869,7 @@ Always ignore these errors? Diese Fehler immer ignorieren? - + %n SSL errors occured number of errors @@ -9508,352 +9878,357 @@ Diese Fehler immer ignorieren? - + Raster Raster - + Security warning: Sicherheitswarnung: - - macros have been disabled. - Makros wurden abgeschaltet. - - - - Enable - Einschalten - - - + Log Messages Protokoll - + QGIS starting... QGIS startet... - + Window Fenster - + Vect&or &Vektor - + &Web &Web - + Shows the map coordinates at the current cursor position. The display is continuously updated as the mouse is moved. It also allows editing to set the canvas center to a given position. The format is lat,lon or east,north Zeigt die Kartenkoordinate an der aktuellen Mausposition. Die Anzeige wird laufend aktualisiert während die Maus bewegt wird. Sie kann auch bearbeitet werden, um die Kartenanzeige auf eine gegebene Koordinate zu zentrieren. Das Format ist Breite,Höhe oder Ost,Nord - + Current map coordinate (lat,lon or east,north) Aktuelle Kartenkoordinaten (Breite,Höhe oder Ost,Nord) - + Map layer list that displays all layers in drawing order. Layerliste, die alle Layer in Zeichenreihenfolge anzeigt. - + [ERROR] Can not make qgis.db private copy [FEHLER] Kann private Kopie von qgis.db nicht anlegen - + Update of view in private qgis.db failed. %1 Aktualisierung der Sicht in privater qgis.db gescheitert. %1 - - + + < Blank > < Leer > - + PROJ.4 Version PROJ.4-Version - + + QScintilla2 Version + QScintilla2-Version + + + Select zip layers to add... ZIP-Layer zum Hinzufügen wählen... - + Vector Vektor - + Select vector layers to add... Einzufügende Vektorlayer wählen... - + PostgreSQL PostgreSQL - + Cannot get PostgreSQL select dialog from provider. Kann PostgreSQL-Auswahldialog des Datenlieferanten nicht bestimmen. - + %1 is an invalid layer - not loaded %1 ist ein ungültiger Layer - nicht geladen - + SpatiaLite SpatiaLite - + Cannot get SpatiaLite select dialog from provider. Kann SpatiaLite-Auswahldialog nicht vom Datenlieferanten holen. - + MSSQL MSSQL - + WMS WMS - + Cannot get WMS select dialog from provider. Konnte den WMS-Auswahldialog nicht vom Datenlieferanten holen. - + WCS WCS - + Cannot get WCS select dialog from provider. Konnte den WCS-Auswahldialog nicht vom Datenlieferanten holen. - + WFS WFS - + Cannot get WFS select dialog from provider. Konnte WFS-Auswahldialog nicht vom Datenlieferanten holen. - + Calculating... Berechne... - - + + Abort... Abbrechen... - + + project macros have been disabled. + Projektmakros wurden abgeschaltet. + + + + Enable macros + Makros aktivieren + + + Choose a file name to save the QGIS project file as Name für zu speichernden QGIS-Projektdatei wählen - + Unable to load %1 %1 kann nicht geladen werden - + Choose a file name to save the map image as Name für Datei zum Speichern des Kartenabbilds wählen - + Please select a vector layer first. Bitte wählen zur zuvor einen Layer. - + Layer labeling settings Layerbeschriftungseinstellungen - + Saving done Speichern abgeschlossen - + Export to vector file has been completed Export in Vektordatei ist abgeschlossen - + Save error Fehler beim Speichern - + Export to vector file failed. Error: %1 Export in Vektordatei schlug fehl. Fehler: %1 - + Features deleted Objekt gelöscht - + Merging features... Objekte werden verschmolzen... - + Abort Abbrechen - - + + Composer %1 Druckzusammenstellung %1 - - + + No active layer Kein aktiver Layer - - + + No active layer found. Please select a layer in the layer list Keinen aktiven Layer gefunden. Bitte einen Layer aus der Liste wählen - - + + Active layer is not vector Aktiver ist kein Vektorlayer - - + + The merge features tool only works on vector layers. Please select a vector layer from the layer list Das Verschmelzen von Objekte funktioniert nur mit Vektorlayern. Bitte einen Vektorlayer aus der Liste wählen - - + + Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing Objekte können nur auf Layern im Bearbeitungsmodus verschmolzen werden. Bitte mit Layer->Bearbeitungsmodus umschalten, um das Verschmelzungswerkzeug zu benutzen - - - + + + The merge tool requires at least two selected features Das Verschmelzungswerkzeug erfordert mindestens zwei gewählte Objekte - - - + + + Not enough features selected Nicht genug Objekte gewählt - + Merged feature attributes Objektattribute vereinen - - + + Merge failed Zusammenführung fehlgeschlagen - - + + An error occured during the merge operation Beim Zusammenführen trat ein Fehler auf - - + + The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled Die Vereinigungsoperation würde zu einem Geometrietyp führen, der nicht zum aktuellen Layer paßt, und wurde daher abgebrochen - + Union operation canceled Vereinigungsvorgang abgebrochen - + Merged features Objekte verschmelzen - + Features cut Objekte ausgeschnitten - + Features pasted Objekte eingefügt - + Start editing failed Bearbeitungsbeginn schlug fehl - + Provider cannot be opened for editing Lieferant kann nicht zum Bearbeiten geöffnet werden - + Stop editing Bearbeitung beenden - + Do you want to save the changes to layer %1? Sollen die Änderungen am Layer %1 gespeichert werden? - - + + Could not commit changes to layer %1 Errors: %2 @@ -9864,91 +10239,91 @@ Fehler: %2 - + Problems during roll back Probleme beim Zurücknehmen der Änderungen - + GPS Information GPS-Information - + Map coordinates for the current view extents Kartenkoordinaten für den aktuell sichtbaren Ausschnitt - + Warning Warnung - + This layer doesn't have a properties dialog. Dieser Layer hat keine Eigenschaftendialog. - + Authentication required Authentifikation erforderlich - + Proxy authentication required Proxy-Authentifikation erforderlich - + SSL errors occured accessing URL %1: SSL-Fehler beim Zugriff auf URL %1: - + Quantum GIS - %1 ('%2') Quantum GIS - %1 ('%2') - + %1 is not a valid or recognized data source %1 ist keine gültige Datenquelle oder wird nicht erkannt - - + + Saved project to: %1 Projekt in %1 gespeichert - - + + Unable to save project %1 Konnte Projekt %1 nicht speichern - + Saved map image to %1 Kartenabbild als %1 gespeichert - + Unable to communicate with QGIS Version server %1 Konnte nicht mit dem QGIS-Versionserver kommunizieren %1 - + No Raster Layer Selected Kein Rasterlayer gewählt - + The layer %1 is not a valid layer and can not be added to the map Der Layer %1 ist ungültig und kann der Karte nicht hinzugefügt werden - + %n feature(s) selected on layer %1. number of selected features @@ -9957,32 +10332,27 @@ Fehler: %2 - - %1 is not a valid or recognized raster data source - %1 ist keine gültige Rasterdatenquelle oder wird nicht erkannt - - - + %1 is not a supported raster data source %1 ist keine unterstützte Rasterdatenquelle - + <p>This project file was saved by an older version of QGIS. When saving this project file, QGIS will update it to the latest version, possibly rendering it useless for older versions of QGIS.<p>Even though QGIS developers try to maintain backwards compatibility, some of the information from the old project file might be lost. To improve the quality of QGIS, we appreciate if you file a bug report at %3. Be sure to include the old project file, and state the version of QGIS you used to discover the error.<p>To remove this warning when opening an older project file, uncheck the box '%5' in the %4 menu.<p>Version of the project file: %1<br>Current version of QGIS: %2 <p>Diese Projektdatei wurde mit einer älteren QGIS-Version gespeichert. Beim Speichern dieser Projektdatei wird QGIS es auf die aktuelle Version aktualisieren und sie damit unter Umständen für ältere QGIS-Versionen unbrauchbar machen. <p>Obwohl die QGIS-Entwickler versuchen Rückwärtskompatibilität zu erhalten, könnten dabei einige Informationen der alten Projektdatei verloren gehen. Um die Qualität von QGIS zu verbessern, würden wir es begrüßen, wenn Sie einen Fehler unter %3 melden würden. Bitte legen Sie die alte Projektdatei bei und nennen Sie die QGIS-Version mit der Sie diesen Fehler entdeckt haben. <p>Um diese Warnung in Zukunft zu unterdrücken, entfernen Sie bitte das Häkchen in '%5' im Menü %4.<p>Version der Projektdatei: %1<br>Aktuelle QGIS-Version: %2 - + Layers Layer - + Delete features Objekte löschen - + Delete %n feature(s)? number of features to delete @@ -9999,7 +10369,7 @@ Fehler: %2 QgisAppInterface - + Attributes changed Attributänderung @@ -10012,12 +10382,12 @@ Fehler: %2 Über Quantum GIS - + about:blank about:blank - + Donors Spender @@ -10047,7 +10417,12 @@ Fehler: %2 Entwickler - + + Essen (Germany), Developer meeting 2012 + Essen (Deutschland), Entwicklertreffen 2012 + + + Contributors Mitwirkende @@ -10103,7 +10478,7 @@ p, li { white-space: pre-wrap; } Qt-Bilderweiterungssuchpfade <br> - + Translators Übersetzer @@ -10188,13 +10563,54 @@ p, li { white-space: pre-wrap; } Verknüpfung im Speicher cachen + + QgsAddTabOrGroup + + + Add tab or group for %1 + Reiter oder Gruppe für %1 hinzufügen + + + + QgsAddTabOrGroupBase + + + Dialog + Dialog + + + + Create category + Kategorie erstellen + + + + as + als + + + + a tab + Reiter + + + + a group in container + als Gruppenbehälter + + QgsAnnotationWidget - + Select frame color Rahmenfarbe wählen + + + Select background color + Hintergrundfarbe wählen + QgsAnnotationWidgetBase @@ -10214,12 +10630,17 @@ p, li { white-space: pre-wrap; } Kartenmarkierung - + Frame width Rahmenstärke - + + Background color + Hintergrundfarbe + + + Frame color Rahmenfarbe @@ -10227,19 +10648,19 @@ p, li { white-space: pre-wrap; } QgsApplication - - - + + + Exception Ausnahme - + unknown exception Unbekannte Ausnahme - + Application state: QGIS_PREFIX_PATH env var: %1 Prefix: %2 @@ -10264,7 +10685,7 @@ Benutzer-DB-Pfad: %9 - + match indentation of application state @@ -10357,58 +10778,58 @@ Benutzer-DB-Pfad: %9 QgsAttributeActionDialog - + Select an action File dialog window title Eine Aktion wählen - + Insert expression Ausdruck einfügen - + Missing Information Fehlende Information - + To create an attribute action, you must provide both a name and the action to perform. Um eine Attributaktion zu erstellen, muss sowohl ein Name als auch eine auszuführende Aktion angegeben werden. - + Echo attribute's value Attributwert anzeigen - + Run an application Eine Applikation ausführen - + Get feature id Objektkennung bestimmen - + Selected field's value (Identify features tool) Gewählter Feldwert (Werkzeug "Objekte abfragen") - + Clicked coordinates (Run feature actions tool) Angeklickte Koordinate (Werkzeug "Objektaktion ausführen") - + Open file Datei öffnen - + Search on web based on attribute's value Websuche nach dem Attributwert durchführen @@ -10634,17 +11055,17 @@ Benutzer-DB-Pfad: %9 QgsAttributeDialog - + Error Fehler - + Error: %1 Fehler: %1 - + Attributes - %1 Attribute - %1 @@ -10652,22 +11073,22 @@ Benutzer-DB-Pfad: %9 QgsAttributeEditor - + Select a file Datei wählen - + Select a date Datum wählen - + (no selection) (keine Auswahl) - + ... ... @@ -10769,7 +11190,7 @@ Benutzer-DB-Pfad: %9 QgsAttributeTableAction - + Attributes changed Attribute geändert @@ -10785,12 +11206,12 @@ Benutzer-DB-Pfad: %9 QgsAttributeTableDialog - + Error during search Fehler beim Suchen - + Attribute table - %1 (%n Feature(s)) feature count @@ -10799,22 +11220,22 @@ Benutzer-DB-Pfad: %9 - + Abort Abbrechen - + Loading feature attributes... Lade Objektattribute... - + Attribute table Attributtabelle - + Attribute table - %1 :: %n / %2 feature(s) selected feature count @@ -10823,17 +11244,17 @@ Benutzer-DB-Pfad: %9 - + Parsing error Parsingfehler - + Evaluation error Auswertungsfehler - + Attribute table - %1 (%n matching features) matching features @@ -10842,54 +11263,54 @@ Benutzer-DB-Pfad: %9 - + Attribute table - %1 (No matching features) Attributtabelle - %1 (kein passendes Objekt) - + Attribute added Attribut hinzugefügt - - + + Attribute Error Attributfehler - + The attribute could not be added to the layer Das Attribute konnte dem Layer nicht hinzugefügt werden - + Deleted attribute Attribut gelöscht - + The attribute(s) could not be deleted Die Attribute konnten nicht gelöscht werden - + Geometryless feature added Geometrieloses Objekt hinzugefügt - + Run action Aktion starten - - + + Open form Formular öffnen - + %1 features loaded. %1 Objekte geladen. @@ -11088,7 +11509,7 @@ Benutzer-DB-Pfad: %9 QgsAttributeTableModel - + feature id Objektkennung @@ -11607,74 +12028,146 @@ Datenbank: %2 - QgsBrowserDockWidget + QgsBrowserDirectoryPropertiesBase - - Browser - Browser + + Dialog + Dialog - - - Refresh - Aktualisieren + + Path + Pfad + + + QgsBrowserDockWidget - - Add Selection - Auswahl hinzufügen + + Browser + Browser - - + Add Selected Layers Gewählte Layer hinzufügen - - Collapse All - Alle einklappen - - - + Add as a favourite Als Favorit hinzufügen - + Remove favourite Favoriten entfernen - + Add Layer Layer hinzufügen - + + Properties Eigenschaften - + + Filter Pattern Syntax + Filtermuster-Syntax + + + + Wildcard(s) + Platzhalter + + + + Regular Expression + Regulärer Ausdruck + + + + Fast scan this dir. + Verzeichnis schnell durchsuchen. + + + Add a directory Verzeichnis hinzufügen - + Add directory to favourites Verzeichnis zu Favoriten hinzufügen - + Error Fehler - + Layer Properties Layereigenschaften + + + Directory Properties + Verzeichniseigenschaften + + + + QgsBrowserDockWidgetBase + + + Browser + Browser + + + + + Refresh + Aktualisieren + + + + Add Selected Layers + Gewählte Layer hinzufügen + + + + Add + Hinzufügen + + + + Filter Files + Dateifilter + + + + + ... + ... + + + + Collapse All + Alle einklappen + + + + Options + Optionen + + + + Filter files + Dateien filtern + QgsBrowserLayerPropertiesBase @@ -11795,6 +12288,24 @@ Datenbank: %2 Kein Pinsel + + QgsCategorizedSymbolRendererV2Model + + + Symbol + Symbol + + + + Value + Wert + + + + Label + Beschriftung + + QgsCategorizedSymbolRendererV2Widget @@ -11809,8 +12320,6 @@ Datenbank: %2 - - Symbol Symbol @@ -11820,81 +12329,97 @@ Datenbank: %2 Farbverlauf - + Classify Klassifizieren - + Add Hinzufügen - + Delete Löschen - + Delete all Alle löschen - + Join Verbinden - + Advanced Erweitert - - - Value - Wert + + Symbol levels... + Symbolebenen... - - - Label - Beschriftung + + High number of classes! + Hohe Klassenanzahl! - - Symbol levels... - Symbolebenen... + + Classification would yield %1 entries which might not be expected. Continue? + Klassifizierung würde zu %1 Einträgen führen, was unerwartet sein könnte. Fortsetzen? - - + + Error Fehler - + There are no available color ramps. You can add them in Style Manager. Es sind keine Farbverläufe verfügbar. Im Stilmanager können welche ergänzt werden. - + The selected color ramp is not available. Der gewählte Farbverlauf ist nicht verfügbar. - + Confirm Delete Löschbestätigung - + The classification field was changed from '%1' to '%2'. Should the existing classes be deleted before classification? Das Klassifizierungsfeld wurde von '%1' auf '%2' geändert. Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? + + QgsCharacterSelectorBase + + + Character Selector + Zeichenauswahl + + + + Font: + Schriftart: + + + + Current font family and style + Aktueller Schriftartenfamilie und -stil + + QgsColorRampComboBox @@ -11940,28 +12465,28 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsComposer - + Big image Großes Bild - + SVG warning SVG-Warnung - - + + Don't show this message again Diese Nachricht nicht mehr anzeigen - + <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the <p>Die SVG-Exportfunktion in QGIS hat einige Probleme durch Fehler und Einschränkungen im - + SVG Format SVG-Format @@ -12016,155 +12541,155 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Atlas-Erzeugung - + PDF Format PDF-Format - - - + + + Empty filename pattern Dateinamenmuster leer - - - + + + The filename pattern is empty. A default one will be used. Das Dateinamenmuster ist leer. Eine Voreinstellung wird benutzt. - + Directory where to save PDF files Verzeichnis in dem PDF-Dateien gespeichert werden sollen - - - + + + Unable to write into the directory Konnte nicht in das Verzeichnis schreiben - - - + + + The given output directory is not writeable. Cancelling. Im Ausgabeverzeichnis konnte nicht geschriebene werden. Breche ab. - - - - + + + + Rendering maps... Zeichne Karten... - - - - + + + + Abort Abbrechen - - - - + + + + Atlas processing error Atlas-Verarbeitungsfehler - + To create image %1x%2 requires about %3 MB of memory. Proceed? Die Erzeugung des %1x%2 Bilds benötigt etwa %3 MB Hauptspeicher. Fortfahren? - + Choose a file name to save the map image as Namen der Datei des zu speichernden Kartenabbild wählen - - + + Choose a file name to save the map as Einen Dateinamen zum Speichern des Kartenabbilds wählen - + Save template Vorlage speichern - + Composer templates Druckvorlagen - + Composer Zusammmenstellung - + Project contains WMS layers Projekt enthält WMS-Layer - + Some WMS servers (e.g. UMN mapserver) have a limit for the WIDTH and HEIGHT parameter. Printing layers from such servers may exceed this limit. If this is the case, the WMS layer will not be printed Einige WMS-Server (z.B. UMN-Mapserver) haben Begrenzungen für die WIDTH- und HEIGHT-Parameter. Falls diese Begrenzungen beim Ausdruck überschritten werden, werden diese WMS-Layer nicht gedruckt - + Qt4 svg code. In particular, there are problems with layers not being clipped to the map bounding box.</p> Qt4-SVG-Code. Genauergesagt ist die Ausgabebegrenzung der Layer auf die Kartengrenzen ein Problem</p> - + Directory where to save image files Verzeichnis in dem Bilder gespeichert werden sollen - + Image format: Bildformat: - + If you require a vector-based output file from Qgis it is suggested that you try printing to PostScript if the SVG output is not satisfactory.</p> Wenn die SVG-Ausgabe nicht zufriedenstellend ist, wird für vektorbasierende QGIS-Ausgabe der Druck in PostScript empfohlen.</p> - + Directory where to save SVG files Verzeichnis in dem SVG-Dateien gespeichert werden sollen - + Save error Fehler beim Speichern - + Error, could not save file Fehler, in Datei konnte nicht gespeichert werden - + Load template Vorlage laden - + Read error Lesefehler - + Error, could not read file Fehler, Datei konnte nicht gelesen werden @@ -12928,7 +13453,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsComposerLegend - + Legend Legende @@ -12957,103 +13482,120 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsComposerLegendWidget - + General Options Allgemeine Einstellungen - + Item wrapping changed Elementumbruch geändert - + Legend title changed Legendentitel geändert - + + Legend column count + Legendenspaltenanzahl + + + + Legend split layers + Layerlegende aufgeteilt + + + + Legend equal column width + Gleiche Spaltenbreite eingeschaltet + + + Legend symbol width Legendensymbolbreite - + Legend symbol height Legendensymbolhöhe - + Legend group space Legendgruppenzwischenraum - + Legend layer space Legendlayerzwischenraum - + Legend symbol space Legendensymbolzwischenraum - + Legend icon label space Legendeniconbeschriftungszwischenraum - + Title font changed Titelschriftart geändert - + Legend group font changed Legendgruppenschriftart geändert - + Legend layer font changed Legendenlayerschriftart geändert - + Legend item font changed Legendenelementschriftart geändert - + + Legend box space Legendenrahmenzwischenraum - + Legend map changed Legendenkarte geändert - + Legend item edited Legendenelement bearbeitet - - + + + Legend updated Legende aktualisiert - + Legend group added Legendengruppe hinzugefügt - + Map %1 Karte %1 - + None Keine @@ -13071,108 +13613,139 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Allgemein - + &Title &Titel - + Title Font... Titelschrift... - + Group Font... Gruppenschrift... - + Layer Font... Layerschrift... - + Item Font... Elementschrift... - + Symbol width Symbolbreite - - - - - - - + + + + + + + + mm mm - + Symbol height Symbolhöhe - + Layer space Layerraum - + Symbol space Symbolraum - + Icon label space Iconbeschriftungsraum - + Box space Rahmenabstand - + Map Karte - + Group Space Gruppenzwischenraum - + Wrap text on Textumbruch ein - + + Column count + Spaltenanzahl + + + + Allow to split layer items into multiple columns. + Aufteilung der Layerelemente in mehrere Spalten erlauben. + + + + Split layers + Layer aufteilen + + + + Equal column widths + Gleiche Spaltenbreite + + + + Column space + Spaltenabstand + + + Auto Update Automatisch aktualisieren - + All Alle - + Add group Gruppe hinzufügen - + + Show feature count for each class of vector layer. + Objektanzahl für jede Vektorlayerklasse anzeigen. + + + Update Aktualisieren - + Legend items Legendenelemente @@ -13236,13 +13809,13 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsComposerMap - + Map will be printed here Karte wird hier gedruckt - - + + Map %1 Karte %1 @@ -13256,72 +13829,72 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - - + + Cache Cache - - + + Rectangle Rechteck - + Solid Ausgefüllt - - + + Cross Kreuz - + No frame Kein Rahmen - - + + Zebra Zebra - - - + + + Inside frame Im Rahmen - - + + Outside frame Außerhalb des Rahmens - - - + + + Horizontal Horizontal - - + + Vertical Vertikal - + Change item width Elementbreite geändert @@ -13341,132 +13914,131 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Grad, Minute, Sekunde - + Change item height Elementhöhe geändert - + Map scale changed Kartenmaßstab geändert - + Map rotation changed Kartendrehung geändert - - + + Map extent changed Kartenausmaß geändert - + Canvas items toggled Kartenelement umgeschaltet - - - + + + None Keine - + Grid checkbox toggled Gitterstatus geändert - - + + Grid interval changed Gitterintervall geändert - - + + Grid offset changed Gitterabstand geändert - - + Grid pen changed Gitterstift geändert - + Grid type changed Gittertyp geändert - + Grid cross width changed Gitterkreuzbreite geändert - + Annotation font changed Beschriftungsschriftart geändert - + Annotation distance changed Beschriftungsabstand geändert - + Annotation format changed Beschriftungsformat geändert - + Changed grid frame style Gitterrahmenstil geändert - + Changed grid frame width Gitterrahmenbreite geändert - - - + + + Disabled deaktiviert - + Annotation position changed Beschriftungsposition geändert - + Map %1 Karte %1 - + Annotation toggled Beschriftung umgeschaltet - + Changed annotation direction Beschriftungsrichtung geändert - + Changed annotation precision Beschriftungsgenauigkeit geändert - - + + Render Zeichnen @@ -13554,27 +14126,17 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Gitter&typ - + Interval X X-Intervall - + Offset X X-Versatz - - Line width - Linienbreite - - - - Line color - Linienfarbe - - - + Interval Y Y-Intervall @@ -13614,77 +14176,87 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Ändern... - + Frame style Rahmenstil - + Frame width Rahmenstärke - + + Line style + Linienstil + + + + change... + ändern... + + + Draw annotation Beschriftung zeichnen - + Annotation position left side Beschriftungsposition linke Seite - + Annotation position right side Beschriftungsposition rechte Seite - + Annotation position top side Beschriftungsposition obere Seite - + Annotation position bottom side Beschriftungsposition untere Seite - + Annotation direction left side Beschriftungsrichtung linke Seite - + Annotation direction right side Beschriftungsrichtung rechte Seite - + Annotation direction top side Beschriftungsrichtung obere Seite - + Annotation direction bottom side Beschriftungsrichtung untere Seite - + Annotation format Beschriftungsformat - + Font... Schriftart... - + Distance to map frame Abstand zum Kartenrahmen - + Coordinate precision Koordinatengenauigkeit @@ -13826,12 +14398,12 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsComposerScaleBar - + km km - + m m @@ -15083,12 +15655,12 @@ Fehler: %5 QgsCptCityBrowserModel - + Name Name - + Info Information @@ -15096,27 +15668,27 @@ Fehler: %5 QgsCptCityColorRampItem - + colors Farben - + continuous Fortlaufend - + continuous (multi) Fortlaufend (mehrere) - + discrete Diskret - + variants Varianten @@ -15124,17 +15696,17 @@ Fehler: %5 QgsCptCityColorRampV2Dialog - + %1 directory details Verzeichnisdetails %1 - + %1 gradient details Detail der Gradiente %1 - + Error - cpt-city gradient files not found. You have two means of installing them: @@ -15158,23 +15730,28 @@ Diese Datei ist zu finden unter [%2] und aktuelle Datei istt [%3] - + Selections by theme nach Themen - + All by author Alle nach Autor - + You can download a more complete set of cpt-city gradients by installing the "Color Ramp Manager" plugin (you must enable Experimental plugins in the plugin manager). Sie können einen umfangreicheren Satz von Cpt-City-Gradienten durch Herunterladen der "Color-Ramp-Manager"-Erweiterung (Experimentelle Erweiterungen müssen im Erweiterungsmanager aktiviert sein). + + + All Ramps (%1) + Alle Farbverläufe (%1) + QgsCptCityColorRampV2DialogBase @@ -15193,6 +15770,11 @@ und aktuelle Datei istt [%3] Path Pfad + + + Save as standard gradient + Als Standardgradiente speichern + Palette @@ -15464,34 +16046,34 @@ und aktuelle Datei istt [%3] QgsCustomizationDialog - + Object name Objektname - + Label Beschriftung - + Description Beschreibung - - + + Choose a customization INI file INI-Datei für Anpassung wählen - - + + Customization files (*.ini) Anpassungsdatei (*.ini) - + Widgets Bedienelement @@ -15504,52 +16086,57 @@ und aktuelle Datei istt [%3] Anpassung - + + Enable customization + Anpassungen einschalten + + + toolBar toolBar - + Catch Fangen - + Switch to catching widgets in main application Umschalten um Bedienelemente der Hauptapplikation zu fangen - + Save Speichern - + Save to file In Datei speichern - + Load Laden - + Load from file Aus Datei laden - + Expand All Alle ausklappen - + Collapse All Alle einklappen - + Select All Alle wählen @@ -16261,22 +16848,22 @@ p, li { white-space: pre-wrap; } Bitte vor dem Hinzufügen des Layers zur Karte einen Layernamen eingeben - + Choose a delimited text file to open Textdatei zum Öffnen wählen - + Text files Textdateien - + Well Known Text files Well-Known-Text-Dateien - + All files Alle Dateien @@ -16597,37 +17184,37 @@ p, li { white-space: pre-wrap; } Der Diagrammtyp '%1' ist unbekannt. Ein vordefinierter Typ wurde gewählt. - + Transparency: %1% Transparenz: %1% - + Background color Hintergrundfarbe - + Pen color Stiftfarbe - + No attributes added. Keine Attribute hinzugefügt. - + You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams. Die haben keine Attribute zu diesem Diagrammlayer hinzugefügt. Bitte anzuzeigende Attribute festlegen oder Diagramme abschalten. - + No attribute value specified Kein Attributwert angegeben - + You did not specify a maximum value for the diagram size. Please specify the attribute and a reference value as a base for scaling in the Tab Diagram / Size. Es wurde keine Maximalgröße für das Diagramm angegeben. Bitte das Attribut und einen Referenzwert als Skalierungsbasis auf dem Reiter Diagramm / Größe festlegen. @@ -16875,59 +17462,59 @@ p, li { white-space: pre-wrap; } QgsDirectoryParamWidget - - + + Name Name - - + + Size Größe - - + + Date Datum - - + + Permissions Zugriffsrechte - - + + Owner Besitzer - - + + Group Gruppe - - + + Type Typ - + folder Ordner - + file Datei - + link Verknüpfung @@ -16974,76 +17561,133 @@ p, li { white-space: pre-wrap; } QgsEngineConfigDialog - + Dialog Beschriftungseinstellungen - + Search method Suchmethode - + Chain (fast) Kette (schnell) - + Popmusic Tabu Popmusik Tabu - + Popmusic Chain Popmusik Kette - + Popmusic Tabu Chain Popmusik Tabu-Kette - + FALP (fastest) FALP (schnellste) - + Number of candidates Kandidatenanzahl - + Point Punkt - + Line Linie - + Polygon Polygon - + Show all labels and features for all layers Alle Objekte und Beschriftungen aller Layer anzeigen - + Show candidates (for debugging) Kandidaten anzeigen (zur Fehlersuche) - + + Save settings with project + Einstellungen im Projekt speichern + + + (i.e. including colliding objects) (d.h. inkl. kollidierender Objekten) + + QgsErrorDialog + + + Error + Fehler + + + + QgsErrorDialogBase + + + Dialog + Dialog + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Summary</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Zusammenfassung</p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Detailed report.</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Genauer Bereich.</p></body></html> + + + + Always show details + Details immer anzeigen + + + + Details >> + Details >> + + QgsExpressionBuilderDialogBase @@ -17114,52 +17758,52 @@ p, li { white-space: pre-wrap; } Felder und Werte - + Parser Error Parsingfehler - + Eval Error Auswertungsfehler - + Expression is invalid <a href=more>(more info)</a> Ausdruck ist ungültig <a href=more>(mehr Information)</a> - + More info on expression error Mehr Informations zum Ausdrucksfehler - + Load top 10 unique values Die ersten zehn eindeutigen Werte laden - + Load all unique values Alle eindeutigen Werte laden - + <h3>Oops! QGIS can't find help for this function.</h3>The help file for %1 was not found.<br> <h3>Hoppla! QGIS kann die Hilfe für die Funktion nicht finden</h3>Die Hilfedatei für %1 wurde nicht gefunden.<br> - + (Showing English version as there was no help available in your language (%1). If you would like to create it, contact the QGIS translation team).<br> (Weil keine Version in Ihrer Sprache (%1) vorhanden war, wird die englische Version angezeigt. Wenden Sie sich bitte an das QGIS-Übersetzungsteam, wenn Sie eine ergänzen möchen).<br> - + It was neither available in your language (%1) nor English. Sie war weder in Ihrer (%1) noch in englischer Sprache verfügbar. - + <br>If you would like to create it, contact the QGIS development team. <br>Wenden Sie sich an das QGIS-Entwicklerteam, falls Sie eine ergänzen möchten. @@ -17274,45 +17918,45 @@ p, li { white-space: pre-wrap; } QgsFieldCalculator - - + + Not available for layer Nicht für Layer verfügbar - + Evaluation error Auswertungsfehler - + Provider error Provider Fehler - + Could not add the new field to the provider. Konnte neues Feld nicht hinzufügen. - + Error Fehler - + An error occured while evaluating the calculation string: %1 Ein Fehler trat bei der Auswertung des Rechenausdrucks auf: %1 - + Please enter a field name Bitte geben Sie den Feldname an - + The expression is invalid see (more info) for details @@ -17367,6 +18011,271 @@ Der Ausdruck ist ungültig (siehe (mehr Information) für Näheres)Genauigkeit + + QgsFieldsProperties + + + Label + Beschriftung + + + + Id + Id + + + + Name + Name + + + + Type + Typ + + + + Length + Länge + + + + Precision + Genauigkeit + + + + Comment + Kommentar + + + + Edit widget + Bearbeitungselement + + + + Alias + Alias + + + + + Name conflict + Namenskonflikt + + + + + The attribute could not be inserted. The name already exists in the table. + Das Attribut konnte nicht eingefügt werden, da der Name bereits vorhanden ist. + + + + Added attribute + Attribut hinzugefügt + + + + + Deleted attribute + Attribut gelöscht + + + + Line edit + Eingabezeile + + + + Unique values + Eindeutige Werte + + + + Unique values editable + Eindeutige Werte (bearbeitbar) + + + + Classification + Klassifikation + + + + Value map + Wertabbildung + + + + Edit range + Eingabezeile mit Bereich + + + + Slider range + Schieberbereich + + + + Dial range + Drehreglerbereich + + + + File name + Dateiname + + + + Enumeration + Aufzählung + + + + Immutable + Unveränderbar + + + + Hidden + Versteckt + + + + Checkbox + Kontrollkästchen + + + + Text edit + Texteditor + + + + Calendar + Kalender + + + + Value relation + Wertbeziehung + + + + UUID generator + UUID-Generator + + + + Select edit form + Bearbeitungsformular wählen + + + + UI file + UI-Dateien + + + + QgsFieldsPropertiesBase + + + Field calculator + Feldrechner + + + + + Click to toggle table editing + Anklicken um den Tabellenbearbeitungsmodus umzuschalten + + + + Toggle editing mode + Bearbeitungsmodus umschalten + + + + New column + Neue Spalte + + + + Ctrl+N + Strg+N + + + + Delete column + Spalte löschen + + + + Ctrl+X + Strg+X + + + + ... + ... + + + + Init function + Initialisierungsfunktion + + + + Edit UI + UI zur Bearbeitung + + + + + + + + + + + - + - + + + + > + > + + + + ^ + ^ + + + + v + + + + + Autogenerate + Automatisch erzeugen + + + + Drag and drop designer + Mit Drag&Drop zusammenstellen + + + + Provide ui-file + UI-Datei verwenden + + + + Attribute editor layout: + Attributeditorzusammenstellung: + + QgsFormAnnotationDialog @@ -17384,8 +18293,8 @@ Der Ausdruck ist ungültig (siehe (mehr Information) für Näheres)QgsFormAnnotationDialogBase - Dialog - Dialog + Form annotation + Formularbemerkung @@ -18618,6 +19527,11 @@ Bitte wählen Sie eine gültige Datei. None Keine + + + Cannot get GDAL raster band: %1 + Konnte GDAL-Rasterkanal nicht bestimmen: %1 + Average @@ -19447,7 +20361,7 @@ p, li { white-space: pre-wrap; } - + All files Alle Dateien @@ -19472,12 +20386,12 @@ p, li { white-space: pre-wrap; } Wollen Sie die Datenquelle trotzdem hinzufügen? - + Model files Modell-Dateien - + Open 3D model file 3D-Modelldatei öffnen @@ -19683,6 +20597,24 @@ p, li { white-space: pre-wrap; } Klassenanzahl + + QgsGraduatedSymbolRendererV2Model + + + Symbol + Symbol + + + + Value + Wert + + + + Label + Beschriftung + + QgsGraduatedSymbolRendererV2Widget @@ -19697,7 +20629,6 @@ p, li { white-space: pre-wrap; } - Symbol Symbol @@ -19742,61 +20673,54 @@ p, li { white-space: pre-wrap; } Schöne Unterbrechungen - + Classify Klassifizieren - + Add class Klasse hinzufügen - - Delete class - Klasse löschen - - - - Advanced - Erweitert + + Delete + Löschen - - - Range - Bereich + + Delete all + Alle löschen - - - Label - Beschriftung + + Advanced + Erweitert - + Symbol levels... Symbolebenen... - - - + + + Error Fehler - + There are no available color ramps. You can add them in Style Manager. Es sind keine Farbverläufe verfügbar. Sie können sie im Stilmanager ergänzen. - + The selected color ramp is not available. Der gewählte Farbverlauf ist nicht verfügbar. - + Renderer creation has failed. Darstellungserzeugung gescheitert. @@ -20933,13 +21857,13 @@ in Zeile %2, Spalte %3 QgsGrassModule - - + + Run Los - + Stop Stopp @@ -20948,39 +21872,39 @@ in Zeile %2, Spalte %3 - - - - - - - + + + + + + + Warning Warnung - - + + Cannot get input region Konnte Eingabe-'region' nicht finden - + Use Input Region Eingabe-'region' benutzen - + <B>Successfully finished</B> <B>Erfolgreich beendet</B> - + <B>Finished with error</B> <B>Mit Fehler beendet</B> - + <B>Module crashed or killed</B> <B>Modul abgestürzt oder abgebrochen</B> @@ -21015,44 +21939,44 @@ in Zeile %2, Spalte %3 Handbuchseite zu %1 nicht gefunden - + Not available, description not found (%1) Nicht verfügbar, Beschreibung nicht gefunden (%1) - + Not available, cannot open description (%1) Nicht verfügbar, Beschreibung konnte nicht geöffnet werden (%1) - + Not available, incorrect description (%1) Nicht verfügbar, fehlerhafte Beschreibung (%1) - + Input %1 outside current region! Eingabe %1 außerhalb der aktuellen Region! - + Cannot find module %1 Modul %1 nicht gefunden - + Cannot start module: %1 Kann Modul %1 nicht starten - + Cannot read module file (%1) Kann Moduldatei %1 nicht lesen - + %1 at line %2 column %3 @@ -21061,7 +21985,7 @@ at line %2 column %3 in Zeile %2, Spalte %3 - + Output %1 exists! Overwrite? Ausgabe %1 existiert! Überschreiben? @@ -21112,17 +22036,17 @@ in Zeile %2, Spalte %3 QgsGrassModuleField - + Attribute field Attributfeld - + Warning Warnung - + 'layer' attribute in field tag with key= %1 is missing. 'layer'-Attribut im Feldtag mit key= %1 fehlt. @@ -21130,17 +22054,17 @@ in Zeile %2, Spalte %3 QgsGrassModuleFile - + File Datei - + %1:&nbsp;missing value %1:&nbsp;Fehlender Wert - + %1:&nbsp;directory does not exist %1&nbsp;Verzeichnis existiert nicht @@ -21148,44 +22072,44 @@ in Zeile %2, Spalte %3 QgsGrassModuleGdalInput - - - + + + Warning Warnung - + PostGIS driver in OGR does not support schemas!<br>Only the table name will be used.<br>It can result in wrong input if more tables of the same name<br>are present in the database. Der PostGIS-Treiber in OGR unterstützt keine Schemata!<br>Nur der Tabellenname wird benutzt.<br>Die kann zu falschen Eingaben führen, wenn mehrere Tabellen gleichen Namens<br>in der Datenbank vorkommen. - + Cannot find layeroption %1 Kann Layeroption %1 nicht finden - + OGR/PostGIS/GDAL Input OGR/PostGIS/GDAL-Quelle - + Cannot find whereoption %1 Kann Where-Option %1 nicht finden - + Password Passwort - + Select a layer Einen Layer wählen - + %1:&nbsp;no input %1&nbsp;keine Eingabe @@ -21193,50 +22117,50 @@ in Zeile %2, Spalte %3 QgsGrassModuleInput - - - - + + + + Warning Warnung - + Use region of this map Karten-'region' benutzen - + Cannot find typeoption %1 Kann Typoption %1 nicht finden - + Cannot find values for typeoption %1 Kann Wert für Typoption %1 nicht finden - + Cannot find layeroption %1 Kann Layeroption %1 nicht finden - + GRASS element %1 not supported GRASS-Element %1 nicht unterstützt - + Select a layer Einen Layer wählen - + %1:&nbsp;no input %1:&nbsp;keine Eingabe - + Input Eingabe @@ -21244,23 +22168,23 @@ in Zeile %2, Spalte %3 QgsGrassModuleOption - - + + Warning Warnung - + Cannot parse version_min %1 Konnte version_min %1 nicht interpretieren - + Cannot parse version_max %1 Konnte version_max %1 nicht interpretieren - + %1:&nbsp;missing value %1&nbsp;Fehlender Wert @@ -21268,7 +22192,7 @@ in Zeile %2, Spalte %3 QgsGrassModuleSelection - + Selected categories Gewählte Kategorien @@ -21276,37 +22200,37 @@ in Zeile %2, Spalte %3 QgsGrassModuleStandardOptions - + Item with key %1 not found Element mit Schlüssel %1 fehlt - + << Hide advanced options << Fortgeschrittene Optionen ausblenden - + Show advanced options >> Fortgeschrittene Optionen einblenden >> - - - - - - - - + + + + + + + + Warning Warnung - - + + Cannot get current region Kann die aktuelle 'region' nicht ermitteln @@ -21316,32 +22240,32 @@ in Zeile %2, Spalte %3 Modul %1 nicht gefunden - + Cannot find key %1 Kann Schlüssel %1 nicht finden - + Item with id %1 not found Element mit Id %1 nicht gefunden - + Cannot check region of map %1 Konnte Region der Karte %1 nicht überprüfen - + Cannot set region of map %1 Kann Region der Karte %1 nicht setzen - + Cannot read module description (%1): Kann Modulbeschreibung (%1) nicht lesen: - + %1 at line %2 column %3 @@ -22033,6 +22957,19 @@ p, li { white-space: pre-wrap; } GRASS-Vektorkarte %1 hat keine Topologie. Topologie erzeugen? + + QgsGrassRasterProvider + + + cellhd file %1 does not exist + cellhd-Datei %1 existiert nicht + + + + Groups not yet supported + Gruppen noch nicht unterstützt + + QgsGrassRegion @@ -22664,107 +23601,112 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsIdentifyResults - - + + (Derived) (abgeleitet) - + Identify Results Abfrageergebnisse - + Feature Objekt - + Value Wert - + (Actions) (Aktionen) - - - + + + Edit feature form Objektformular bearbeiten - - - + + + View feature form Objektformular anzeigen - + + Print + Drucken + + + Clear results Ergebnisse löschen - + Clear highlights Hervorhebungen löschen - + Highlight all Alle hervorheben - + Highlight layer Layer hervorheben - + Layer properties... Layereigenschaften... - + Attribute changes Attributänderungen - + Could not open url Konnte URL nicht öffnen - + Could not open URL '%1' Konnte die URL '%1' nicht öffnen - + Zoom to feature Zum Objekt zoomen - + Copy attribute value Attributwert kopieren - + Copy feature attributes Objektattribute kopieren - + Expand all Alle ausklappen - + Collapse all Alle einklappen @@ -22776,6 +23718,34 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.Identify Results Identifikationsergebnis + + + Expand tree. + Baum ausklappen. + + + + + + + ... + ... + + + + Collapse tree. + Baum einklappen. + + + + New results will be expanded by default. + Neue Ergebnisse erscheinen automatisch ausgeklappt. + + + + Print selected HTML response. + Gewählte HTML-Antwort drucken + QgsImageWarper @@ -22789,13 +23759,13 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.QgsInterpolationDialog - + Triangular interpolation (TIN) Unregelmäßiges Dreiecksnetz (TIN) - + Inverse Distance Weighting (IDW) Inverse Distanzgewichtung (IDW) @@ -22821,23 +23791,23 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. - + Break lines Bruchkanten - + Structure lines Strukturlinien - + Points Punkte - + Save interpolated raster as... Interpoliertes Raster speichern unter... @@ -22960,6 +23930,11 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.Output file Ausgabedatei + + + Add result to project + Ergebnis zum Projekt hinzufügen + QgsInterpolationPlugin @@ -23333,18 +24308,18 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsLabelPropertyDialog - - + + Label font Schriftart - + Font color Schriftfarbe - + Buffer color Pufferfarbe @@ -23369,72 +24344,82 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. - + Size Größe - + Display Anzeigen - + Show label Beschriftung anzeigen - + Max Max - + Min Min - + Scale-based Maßstabsbezogen - + + Ignores priority and permits collisions/overlaps + Prioritäten ignorieren und Kollisionen/Überschneidungen erlauben + + + + Always show (exceptions above) + Immer anzeigen (Ausnahmen oben) + + + Buffer Puffer - + Position Position - + Label distance Beschriftungsabstand - + X Coordinate X-Koordinate - + Y Coordinate Y-Koordinate - + Horizontal alignment Horizontale Ausrichtung - + Vertical alignment Vertikale Ausrichtung - + Rotation Drehung @@ -23442,52 +24427,52 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsLabelingGui - + (not found!) (nicht gefunden!) - + Sample @ %1 pts (using map units) Beispiel @ %1 Punkten (in Karteneinheiten) - + Sample @ %1 pts (using map units, BUFFER IN MILLIMETERS) Beispiel @ %1 Punkten (in Karteneinheiten, Puffer in mm) - + Sample Beispiel - + Sample (BUFFER NOT SHOWN, in map units) Beispiel (in Karteneinheiten, Puffer nicht angezeigt) - + Expression based label Ausdrucksbeschriftung - + Mixed Case Gemischte Groß-/Kleinschreibung - + All Uppercase Nur Großbuchstaben - + All Lowercase Nur Kleinbuchstaben - + Title Case Titelform @@ -23520,109 +24505,111 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.Beispielhintergrundfarbe - + Multiple lines Mehrzeilig - + Wrap on character Bei Zeichen umbrechen - + Line height spacing for multi-line text Zeilenhöhe bei mehrzeiligem Text - + Alignment Ausrichtung - + Paragraph style alignment of multi-line text Absatzstilausrichtung mehrzeiligen Texts - + Available typeface styles Verfügbare Schriftartstile - + Underlined Text Unterstrichener Text - + Strikeout text Durchgestrichener Text - - + + Space in pixels or map units, relative to size unit choice Abstand in Pixel oder Karteneinheiten relativ zur Größeneinheitenwahl - + Type case Schriftart Groß-/Kleinschreibung - + Capitalization style of text Großschreibungstil des Texts - + + Minimum Minimum - + + Maximum Maximum - + Formatted numbers Zahlenformatierung - + Decimal places Dezimalstellen - + Show plus sign Plus-Vorzeichen anzeigen - - + + mm mm - - - + + + map units Karteneinheiten - - - + + + Transparency Transparenz - - + + % % @@ -23637,147 +24624,143 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.Beispieltext zurücksetzen - + line Zeile - - + + Left Links - + Center Zentriert - - + + Right Rechts - + Multi-line align Mehrzeilig ausrichten - - + + Line height Linienhöhe - - + + Letter spacing Zeichensperrung - - + + Word spacing Wortsperrung - + Style Stil - + points Punkte - + U U - + S S - + Pen Join style Stiftübergangsstil - + Color area inside of pen stroke Farbbereich im Stiftstrich - + Advanced Erweitert - + Options Optionen - + Label every part of multi-part features Alle Teile mehrteiliger Objekte beschriften - + Merge connected lines to avoid duplicate labels Anschließende Linien verbinden, um doppelte Beschriftungen zu vermeiden - - Add direction symbol - Richtungssymbol hinzufügen - - - + Features don't act as obstacles for labels Objekte sind kein Hindernis für Beschriftungen - + + Placement Platzierung - - - + + + Label distance Beschriftungsabstand - - - + + + Rotation Drehung - - + + degrees Grad - + Capitalization Großschreibung - + Add label columns to attribute table Beschriftungespalten zur Attributetabelle hinzufügen - + About data defined values Über datendefinierte Werte @@ -23787,17 +24770,17 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.Layer beschriften mit - + Text style Textstil - + Font Schriftart - + TextLabel Textbeschriftung @@ -23805,33 +24788,35 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. - - - + + + + + ... ... - - - + + + Color Farbe - + Buffer Puffer - - - + + + Size Größe - + mm mm @@ -23847,309 +24832,415 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten.Lorom Ipsum - - + + In map units In Karteneinheiten - + Priority Priorität - + Low Niedrig - + High Hoch - + Scale-based visibility Maßstabsabhängige Darstellung - + Suppress labeling of features smaller than Objekte nicht beschriften, wenn kürzer als - - + + In mm In mm - + + Pixel size-based visibility + Pixelgrößenabhängige Sichtbarkeit + + + + Labels will not show if larger than this on screen + Größere Beschriftungen werden nicht angezeigt + + + + + px + px + + + + Labels will not show if smaller than this on screen + Kleinere Beschriftungen werden nicht angezeigt + + + + + + + + < + < + + + + Label in Map Units + Beschriftung in Karteneinheiten + + + + + Label + Beschriftung + + + + Line direction symbols + Linienrichtungssymbol + + + + Symbol(s) + Symbol(e) + + + + > + > + + + + left/right + links/rechts + + + + above + über + + + + below + unter + + + + Reverse direction + Rückwärts + + + Line orientation dependent position Linienrichtungsabhängige Position - + Data defined settings Datendefinierte Einstellungen - + Buffer transparency Puffertransparenz - + Uncheck to write labeling engine derived rotation on pin and NULL on unpin Abhaken, um den berechneten Winkel der Beschriftungsfunktion beim Anpinnen und NULL beim Lösen zu speichern - + Preserve existing rotation values during label pin/unpin operations Vorhandene Drehwinkel über Anpinnen/Lösen erhalten - + Display properties Anzeigeeigenschaften - + Minimum scale Minimalmaßstab - + Show label Beschriftung anzeigen - + Maximum scale Minimalmaßstab - + Font properties Schriftarteigenschaften - + Bold Fett - + Italic Kursiv - + Underline Unterstrichen - + Font family Schriftfamilie - + Position Position - + Automated placement settings Einstellung der automatischen Plazierung - - Show all labels for this layer (i.e. including colliding labels) - Alle Beschriftungen anzeigen (d.h. inkl. kollidierender) - - - + Around point Um Punkt - + Offset from point Abstand vom Punkt - + Parallel Parallel - + Curved Gebogen - + Horizontal Horizontal - + Offset from centroid Abstand vom Zentrum - + Around centroid Um Zentrum - + Horizontal (slow) Horizontal (langsam) - + Free (slow) Frei (langsam) - + Using perimeter Nach Umfang - + Centroid of Zentroid von - + visible polygon sichtbarem Polygon - + whole polygon ganzem Polygon - + Above line Über Linie - + On line Auf Linie - + Below line Unter Linie - + + outside + außen + + + + inside + innen + + + + Maximum angle between curved characters + Größter Winkel zwischen Zeichen auf Kurven + + + X X - + Y Y - + Above Right Oben rechts - + Above Left Oben links - + Over Über - + Above Oben - + Below Left Unten links - + Below Unten - + Below Right Unten rechts - + + Show all labels for this layer (including colliding labels) + Alle Beschriftungen auf diesem Layer anzeigen (einschließlich kollidierender) + + + Show upside-down labels Kopfstehende Beschriftungen anzeigen - + never nie - + when rotation defined bei definiertem Winkel - + always immer - + + Limit number of features to be labeled to + Obergrenze der zu beschriftenden Objekte + + + + Number of features sent to labeling engine, though not all may be labeled + Anzahl der Objekte, die die Beschriftung durchlaufen, aber evtl. nicht beschriftet werden + + + X Coordinate X-Koordinate - + Y Coordinate Y-Koordinate - + Horizontal alignment Horizontale Ausrichtung - + Vertical alignment Vertikale Ausrichtung - + + Always show + Immer anzeigen + + + Strikeout Durchgestrichen - + Buffer properties Puffereigenschaften - + Buffer size Puffergröße - + Buffer color Pufferfarbe @@ -24165,79 +25256,79 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsLegend - - + + group Gruppe - + &Make to Toplevel Item In oberste Ebene &bringen - + Zoom to Group Zur Gruppe zoomen - + &Remove &Entfernen - + &Set Group CRS KBS für Gruppe &setzen - + &Group Selected &Gewählte gruppieren - + Copy Style Stil kopieren - + Paste Style Stil einfügen - + &Add New Group &Neue Gruppe hinzufügen - + &Expand All Alles ausklapp&en - + &Collapse All &Alles zusammenfalten - + &Update Drawing Order &Zeichenreihenfolge aktualisieren - + Legend context Legendenkontext - + Re&name Umbe&nennen - - + + sub-group Untergruppe @@ -24245,80 +25336,83 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsLegendLayer - + &Remove &Entfernen - + &Query... &Abfrage... - + &Zoom to Layer Extent Auf die Layerausdehnung &zoomen - + &Zoom to Best Scale (100%) &Auf besten Maßstab zoomen (100%) - + &Stretch Using Current Extent Auf aktuelle Ausdehnung &strecken - + &Show in Overview &In der Übersicht anzeigen - + + &Duplicate + &Kopieren + + + &Set Layer CRS KBS für Layer &setzen - + Set &Project CRS from Layer Layer-KBS dem &Projekt zuweisen - + &Open Attribute Table &Attributtabelle öffnen - - + + Save As... Speichern als... - + Save Selection As... Auswahl speichern als... - + Show Feature Count Objektanzahl anzeigen - + &Properties &Eigenschaften - - + Updating feature count for layer %1 Objektanzahl des Layers %1 aktualsieren - - + Abort Abbrechen @@ -24485,14 +25579,14 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsMapCanvas - + Could not draw %1 because: %2 Konnte %1 nicht zeichnen, weil: %2 - + Could not draw %1 because: %2 COMMENTED OUT @@ -24539,99 +25633,99 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsMapLayer - - - + + + %1 at line %2 column %3 %1 in Zeile %2, Spalte %3 - + Error: qgis element could not be found in %1 Fehler: qgis element konnte nicht in %1 gefunden werden - + User database could not be opened. Benutzerdatenbank konnte nicht geöffnet werden. - + The style table could not be created. Die Stiltabelle konnte nicht angelegt werden. - + The style %1 was saved to database Der Stil %1 wurde in der Datenbank gespeichert - + The style %1 was updated in the database. Der Stil %1 wurde in der Datenbank aktualisiert. - + The style %1 could not be updated in the database. Der Stil %1 konnte nicht in der Datenbank aktualisiert werden. - + The style %1 could not be inserted into database. Der Stil %1 konnte nicht in der Datenbank gespeichert werden. - + ERROR: Failed to created SLD style file as %1. Check file permissions and retry. FEHLER: Konnte SLD-Stildatei %1 nicht erstellen. Prüfen Sie bitte die Berechtigungen und wiederholen Sie den Versuch. - + Unable to open file %1 Konnte Datei %1 nicht öffnen - + style not found in database Stil nicht in der Datenbank gefunden - - + + Specify CRS for layer %1 KBS für Layer %1 angeben - - + + Loading style file %1 failed because: %2 Stildatei %1 konnte nicht geladen werden, weil: %2 - - - + + + Could not save symbology because: %1 Konnte Darstellung nicht speichern, weil: %1 - - + + The directory containing your dataset needs to be writable! Der Ordner mit den Daten muss beschreibbar sein! - - + + Created default style file as %1 Vorgabestildatei als %1 gespeichert - + ERROR: Failed to created default style file as %1. Check file permissions and retry. FEHLER: Konnte die Datei %1 für den voreingestellten Stil nicht erzeugen. Bitte überprüfen Sie die Zugriffsrechte vor einem erneuten Versuch. @@ -25011,90 +26105,85 @@ Die könnte auf ein Netzwerkproblem oder ein Problem des WMS-Server hindeuten. QgsMapToolIdentify - - + + (clicked coordinate) (Angeklickte Koordinate) - + No active layer Kein aktiver Layer - + To identify features, you must choose an active layer by clicking on its name in the legend Um Objekte zu identifizieren müssen Sie einen Layer in der Legende auswählen - + Identifying on %1... %1 wird abgefragt... - + Identifying done. Abfrage beendet. - + No features at this position found. Kein Objekt an dieser Position gefunden. - + Length Länge - + firstX attributes get sorted; translation for lastX should be lexically larger than this one erstesX - + firstY erstesY - + lastX attributes get sorted; translation for firstX should be lexically smaller than this one letztesX - + lastY letztesY - + Area Fläche - + + Perimeter + Umfang + + + feature id Objektkennung - + new feature Neues Objekt - - WMS layer - WMS-Layer - - - - Feature info - Objektinformation - - - + Raster Raster @@ -25634,57 +26723,57 @@ http://meine.kiste.com/cgi-bin/mapserv.exe QgsMeasureDialog - + &New &Neu - + The calculations are based on: Die Berechnungen basieren auf: - + Project CRS transformation is turned off. KBS-Transformation im Projekt deaktiviert. - + Canvas units setting is taken from project properties setting (%1). Karteneinheiten werden aus Projekteigenschaften übernommen (%1) - + Ellipsoidal calculation is not possible, as project CRS is undefined. Ellipsoide Berechnung wegen undefiniertem Projekt-KBS nicht möglich. - + Project CRS transformation is turned on and ellipsoidal calculation is selected. Projekt-KBS-Transformation aktiv und ellipsoide Berechnung gewählt. - + The coordinates are transformed to the chosen ellipsoid (%1), and the result is in meters Die Koordinaten werden auf den gewählten Ellipsoiden (%1) transformiert und die Ergebniseinheit ist Meter - + Project CRS transformation is turned on but ellipsoidal calculation is not selected. Projekt-KBS-Transformation aktiv, aber ellipsoide Berechnung ist nicht gewählt. - + The canvas units setting is taken from the project CRS (%1). Die Karteneinheiten werden dem Projekt-KBS entnommen (%1). - + Finally, the value is converted from %2 to %3. Schließlich wird der Wert von %1 zu %3 umgewandelt. - + Segments [%1] Segmente [%1] @@ -25810,9 +26899,24 @@ http://meine.kiste.com/cgi-bin/mapserv.exe QgsMessageBar + Remaining messages + Verbleibende Nachrichten + + + + Close all + Alle schließen + + + Close Schließen + + + more + mehr + QgsMessageLogViewer @@ -28046,317 +29150,301 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein QgsOptions - - - + + + Semi transparent circle Teiltransparenter Kreis - - - + + + Cross Kreuz - + Detected active locale on your system: %1 Festgestellte Spracheinstellung des Systems: %1 - + Current layer Aktueller Layer - + Top down, stop at first Von oben nach unten, beim ersten halten - + Top down Von oben nach unten - + Show all features Alle Objekte anzeigen - + Show selected features Alle gewählten Objekte anzeigen - + Show features in current canvas Alle Objekte des aktuellen Kartenausschnitts anzeigen - + Always Immer - + If needed Wenn nötig - + Never Nie - + Load all Alle laden - + Check file contents Dateiinhalt prüfen - + Check extension Erweiterung prüfen - + No Nein - + Basic scan Grundsuche - + Full scan Vollsuche - + No Stretch Kein Strecken - + Stretch To MinMax Strecken auf MinMax - + Stretch And Clip To MinMax Strecken und Zuschneiden auf MinMax - + Clip To MinMax Zuschneiden auf MinMax - + To vertex Zum Stützpunkt - + None / Planimetric Keine / Planar - - + + Cumulative pixel count cut Kommulativer Pixelanzahl-Schnitt - + Minimum / maximum Minimum / Maximum - + Mean +/- standard deviation Mittlere +/- Standardabweichung - + To segment Zum Segment - + To vertex and segment Zum Stützpunkt und Segment - - - + + + None Keine - + Off Aus - + QGIS QGIS - + GEOS GEOS - + Round Rund - + Mitre Eckig - + Bevel Abgerundet - - - + + + Save default project Als Vorgabeprojekt speichern - + You must set a default project Sie müssen ein Vorgabeprojekt setzen - + Current project saved as default Aktuelles Projekt als Vorgabe gespeichert - + Error saving current project as default Konnte aktuelles Projekt nicht als Vorgabe speichern - + Choose a directory to store project template files Wählen Sie ein Verzeichnis für die Speicherung von Projektvorlagedateien - + Selection color Auswahlfarbe - + Create Options - %1 Driver Erzeugungsoptionen - %1 Treiber - + Create Options - pyramids Erzeugungsoptionen - Pyramiden - - Parameters : - Parameter : - - - - - + + + Choose a directory Verzeichnis wählen - + Enter scale Maßstab angeben - + Scale denominator Maßstabsnenner - + Load scales Maßstäbe laden - - + + XML files (*.xml *.XML) XML-Dateien (*.xml *.XML) - + Save scales Maßstäbe speichern - - - Parameters: - Parameter: - - - - Can only use ellipsoidal calculations when CRS transformation is enabled - Ellipsoide Berechnungen nur bei eingeschalteter KBS-Transformation möglich - - - - + + map units Karteneinheiten - - + + pixels Pixel - + Central point (fastest) Zentrum (am schnellsten) - + Chain (fast) Kette (schnell) - + Popmusic tabu chain (slow) Popmusik-Tabu-Kette (langsam) - + Popmusic tabu (slow) Popmusik-Tabu (langsam) - + Popmusic chain (very slow) Popmusik-Kette (sehr langsam) @@ -28420,37 +29508,37 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Nichts - + Locale Sprache - + Locale to use instead Stattdessen folgende Spracheinstellungen benutzen - + Additional Info Ergänzende Informationen - + Detected active locale on your system: Festgestellte aktive Spracheinstellung: - + Rubberband Gummiband - + Line width in pixels Linienbreite in Pixel - + Snapping Objektfang @@ -28770,17 +29858,7 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Anzahl von Objekten nach deren Zeichnung die Anzeige aktualisiert werden soll - - Semi-minor - Nebenachse - - - - Semi-major - Hauptachse - - - + Default expiration period for WMS-C/WMTS tiles (hours) Verfallszeitraumvorgabe für WMS-C-/WMTS-Kacheln (Stunden) @@ -28810,32 +29888,32 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Suchpfad(e) für SVG-Symbole (Scalable Vector Graphic) - + Decimal places Dezimalstellen - + Keep base unit Basiseinheit beibehalten - + Overlays Überlagern - + Reuse last entered attribute values Letzte Attributwerteingaben wiederverwenden - + Network Netzwerk - + Timeout for network requests (ms) Zeitüberschreitung bei Netzwerkanfragen (ms) @@ -28845,7 +29923,7 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Kompatibilität - + Digitizing Digitalisierung @@ -28940,22 +30018,22 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Standardabweichungsfaktor - + Preferred angle units Bevorzugtes Winkelmaß - + Degrees Grad - + Radians Bogenmaß - + Gon Gon @@ -28975,83 +30053,83 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Vordefinierte Maßstäbe - + Placement algorithm Platzierungsalgorithmus - + Other settings Weitere Einstellungen - + Validate geometries Geometrien prüfen - + Join style for curve offset Verbindungsstil für Linienversatz - + Quadrantsegments for curve offset Quadrantensegmente für Linienversatz - + Miter limit for curve offset Eckengrenze für Linienversatz - + Default Coordinate Reference System for new projects Koordinatensystemvorgabe für neue Projekte - - + + Select... Wählen... - + Always start new projects with this CRS Neue Projekte immer in diesem KBS beginnen - + Automatically enable 'on the fly' reprojection if CRS of a new added layer differ from CRS of layer(s) already present. CRS of present layer(s) will be used. 'On-The-Fly'-Reprojektion automatisch einschalten, wenn das KBS eines neu hinzugefügten Layers vom dem der bereits vorhandenen Layer abweicht. KBS der vorhandenen Layer wird benutzt. - + Automatically enable 'on the fly' reprojection if layers have different CRS 'On-The-Fly'-Reprojektion automatisch aktivieren, wenn die Layer unterschiedliche KBS haben - + Coordinate Reference System for new layers Koordinatenbezugssystem für neue Layer - + When a new layer is created, or when a layer is loaded that has no Coordinate Reference System (CRS) Wenn ein neuer Layer erzeugt wird oder ein Layer geladen wird der kein Koordinatenbezugssystem hat - + Exclude URLs (starting with) URL ausschließen, die beginnen mit - + Cache settings Cache-Einstellungen - + Directory Verzeichnis @@ -29061,23 +30139,23 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein - + ... ... - + Size Größe - + Clear Löschen - + WMS search address WMS-Suchadresse @@ -29087,27 +30165,22 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Objektformular öffnen, wenn ein einzelnes Objekt abgefragt wird - + Rubberband color Gummibandfarbe - - Ellipsoid for distance calculations - Ellipsoid für Abstandsberechnungen - - - + Preferred measurements units Bevorzugte Maßeinheiten - + Meters Meter - + Feet Fuß @@ -29132,154 +30205,154 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Modus - + Line width Linienbreite - + Default snap mode Voreingestellter Fangmodus - + Vertex markers Stützpunktmarken - + Line color Linienfarbe - + Show markers only for selected features Markierungen nur für gewählte Objekte anzeigen - + Marker style Markierungsstil - + Marker size Markierungsgröße - + Override system locale System-Locale überschreiben - + <b>Note:</b> Enabling / changing overide on local requires an application restart <b>Note:</b> Einschalten/Änderung der Locale-Überschreibung erfordert einen Anwendungsneustart - + Use proxy for web access Proxy für Webzugriff benutzen - + Host Host - + Port Port - + User Benutzer - - + + Leave this blank if no proxy username / password are required Lassen Sie Benutzer/Passwort leer, wenn sie nicht benötigt werden - + Password Passwort - + CRS KBS - + Default snapping tolerance Voreingestellte Fangtoleranz - + Search radius for vertex edits Suchradius für Stützpunktbearbeitung - + Suppress attributes pop-up windows after each created feature Eingabe der Attributwerte bei der Erstellung neuer Objekte unterdrücken - + Enable 'on the &fly' reprojection by default 'On-The-&Fly'-Reprojektion voreinstellen - + Prompt for &CRS &KBS abfragen - + Use &project CRS KBS des &Projekts benutzen - + Use default CRS displa&yed below &Folgendes KBS benutzen - + Proxy type Proxytyp - + Add Hinzufügen - + Remove Entfernen - + Position Position - - + + map units Karteneinheiten - - + + pixels Pixel @@ -29865,6 +30938,7 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein + Postgres/PostGIS Provider PostgreSQL/PostGIS-Datenlieferant @@ -29874,7 +30948,12 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Konnte den PostgreSQL/PostGIS-Datenlieferanten nicht öffnen - + + No accessible tables or views found. Check the message log for possible errors. + Keine zugreifbaren Tabellen oder Sichten gefunden. Bitte Protokoll auf mögliche Fehler prüfen. + + + Connect Verbinden @@ -29900,52 +30979,57 @@ Immer Netzwerk: immer aus dem Netzwerk laden und nicht prüfen, ob im Cache ein Tabelle - - Type - Typ - - - - Geometry column - Geometriespalte - - - + SRID SRID - - Primary key column - Primärschlüsselspalte - - - + Select at id Abfrage nach ID - + Sql SQL - + Detecting... Prüfe... - + Enter... Eingeben... - + Select... Wählen... - + + Column + Spalte + + + + Data Type + Datentyp + + + + Spatial Type + Räuml. Typ + + + + Primary Key + Primärschlüssel + + + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). Funktion 'Schneller Objektzugriff nach ID' abschalten, damit die Attributtabelle im Speicher gehalten wird (z.B. bei teuren Ansichten). @@ -30803,7 +31887,7 @@ p, li { white-space: pre-wrap; } QgsPluginManager - + No Plugins Keine Erweiterungen @@ -30819,7 +31903,7 @@ p, li { white-space: pre-wrap; } - + Plugins Erweiterungen @@ -30830,22 +31914,22 @@ p, li { white-space: pre-wrap; } - + Installed in %1 menu/toolbar In Menü/Werkzeugkasten %1 installiert - + No QGIS plugins found in %1 Keine QGIS-Erweiterung in %1 gefunden - + Error Fehler - + Failed to open plugin installer! Erweiterungsinstallation konnte nicht geöffnet werden! @@ -30853,32 +31937,32 @@ p, li { white-space: pre-wrap; } QgsPluginManagerBase - + QGIS Plugin Manager QGIS-Erweiterungsmanager - + To enable / disable a plugin, click its checkbox or description Kontrollkästchen oder Beschreibung anklicken, um eine Erweiterungen zu (de-)aktivieren - + &Filter &Filter - + Plugin Directory: Erweiterungsverzeichnis: - + Directory Verzeichnis - + Plugin Installer Erweiterungsinstallation @@ -31008,24 +32092,24 @@ p, li { white-space: pre-wrap; } - - - - - - - - - - - - - - - + + + + + + + + + - - + + + + + + + + PostGIS PostGIS @@ -31061,12 +32145,12 @@ Fehler:%3 - + Database connection was successful, but the accessible tables could not be determined. Die Datenbankverbindung war erfolgreich, jedoch konnten die zugänglichen Tabellen nicht bestimmt werden. - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 @@ -31075,93 +32159,113 @@ Fehler:%3 - + Database connection was successful, but no accessible tables were found. Please verify that you have SELECT privilege on a table carrying PostGIS geometry. Die Datenbankverbindung war erfolgreich, jedoch wurden keine zugänglichen Tabellen gefunden. Bitte stellen Sie sicher, dass Sie das SELECT-Recht für eine Tabelle mit PostGIS-Geometrie haben. - + Unable to get list of spatially enabled tables from the database Konnte Liste der räumlichen Tabellen der Datenbank nicht bestimmen - + Retrieval of postgis version failed Bestimmen der PostGIS-Version schlug fehl - + Could not parse postgis version string '%1' Unverständliche PostGIS-Version '%1' - + Connection error: %1 returned %2 [%3] Verbindungsfehler: %1 ergab %2 [%3] - + Erroneous query: %1 returned %2 [%3] Fehlerhafte Abfrage: %1 ergab %2 [%3] - + Point Punkt - + Line Linie - + Polygon Polygon - + No Geometry Ohne Geometrie - - + + None + Keine + + + + Geometry + Geometrie + + + + Geography + Geographie + + + + TopoGeometry + Topo-Geometrie + + + + Query could not be canceled [%1] Abfrage konnte nicht abgebrochen werden [%1] - + PQgetCancel failed PQgetCancel gescheitert - + Multipoint Multipunkt - + Multiline Multilinie - + Multipolygon Multipolygon - + Unknown Geometry Unbekannte Geometrie - + Query: %1 returned %2 [%3] Abfrage: %1 ergab %2 [%3] - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 @@ -31170,21 +32274,21 @@ Die Fehlermeldung der Datenbank war: %1 - + Query failed: %1 Error: no result buffer Abfrage gescheitert: %1 Fehler: kein Ergebnispuffer - + Not logged query failed: %1 Error: no result buffer Nicht protokollierte Abfrage gescheitert: %1 Fehler: Kein Ergebnispuffer - + %1 cursor states lost. SQL: %2 Result: %3 (%4) @@ -31193,27 +32297,27 @@ SQL: %2 Ergebnis: %3 (%4) - + resetting bad connection. Schlechte Verbindung wird zurückgesetzt. - + retry after reset succeeded. Erneuter Versuch nach Rücksetzung erfolgreich. - + retry after reset failed again. Erneuter Versuch nach Rücksetzung schlug wieder fehl. - + connection still bad after reset. Verbindung nach Rücksetzung immer noch schlecht. - + bad connection, not retrying. Schlechte Verbindung, keine neuen Versuche. @@ -31221,7 +32325,7 @@ Ergebnis: %3 (%4) QgsPostgresProvider - + Unable to access the %1 relation. The error message from the database was: %2. @@ -31232,7 +32336,7 @@ Der Error den die Datenbank lieferte war: SQL: %3 - + Unable to determine table access privileges for the %1 relation. The error message from the database was: %2. @@ -31254,21 +32358,21 @@ SQL: %3 - - - - - - + + + + + - - - - + + + + - - - + + + + @@ -31278,7 +32382,8 @@ SQL: %3 - + + PostGIS PostGIS @@ -31308,8 +32413,8 @@ SQL: %3 Text, feste Länge (char) - - + + Fetching from cursor %1 failed Database error: %2 Laden aus Cursor %1 gescheitert @@ -31326,66 +32431,70 @@ Datenbankfehler: %2 Unerwarteter Relationstyp '%1'. - + result of extents query invalid: %1 Ergebnis der Ausmaßabfrage ungültig: %1 - + Editing and adding disabled for 2D+ layer (%1; %2) Ändern und Hinzufügen auf 2D+-Layern abgeschaltet (%1; %2) - + Couldn't get the feature geometry in binary form Objektgeometrie konnte nicht in binärer Form abgerufen werden - + Read attempt on an invalid postgresql data source Leseversuch auf eine ungültige PostgreSQL-Datenquelle - + nextFeature() without select() nextFeature() ohne select() - + feature %1 not found Objekt %1 nicht gefunden - + found %1 features instead of just one. %1 Objekte statt nur einem gefunden. - + FAILURE: Field %1 not found. FEHLER: Feld %1 nicht gefunden. - - + + unexpected formatted field type '%1' for field %2 Unerwarteter formatierter Feldtyp '%1' für Feld %2 - - + Field %1 ignored, because of unsupported type %2 Feld %1 ignoriert, weil von nicht unterstütztem Typ %2 + Field %1 ignored, because of unsupported type type %2 + Feld %1 mit nicht unterstützten Datentyp-Art %2 ignoriert + + + Duplicate field %1 found Doppelter Feldname %1 gefunden - + PostgreSQL is still in recovery after a database crash (or you are connected to a (read-only) slave). Write accesses will be denied. @@ -31435,42 +32544,47 @@ SQL: %2 Kein Schlüsselfeld für Abfrage gegeben. - + + Could not find topology of layer %1.%2.%3 + Konnte Topologie des Layers %1.%2.%3 nicht finden + + + PostGIS error while adding features: %1 PostGIS-Fehler beim Attributhinzufügen: %1 - + PostGIS error while deleting features: %1 PostGIS-Fehler beim Objektlöschen: %1 - + PostGIS error while adding attributes: %1 PostGIS-Fehler beim Attributhinzufügen: %1 - + PostGIS error while deleting attributes: %1 PostGIS-Fehler beim Attributlöschen: %1 - + PostGIS error while changing attributes: %1 PostGIS-Fehler beim Attributändern: %1 - + PostGIS error while changing geometry values: %1 PostGIS-Fehler beim Geometrieändern: %1 - + Geometry type and srid for empty column %1 of %2 undefined. Geometrietyp und SRID für leere Spalte %1 in %2 undefiniert. - + Feature type or srid for %1 of %2 could not be determined or was not requested. Objekttyp oder SRID für %1 aus %2 konnte nicht festgestellt werden und wurde nicht festgelegt. @@ -31601,124 +32715,140 @@ Choose ignore to continue loading without the missing layers. Choose cancel to r QgsProjectProperties - + Layer Layer - + Type Typ - + Identifiable Abfragbar - + Vector Vektor - + WMS WMS - + Raster Raster - - + + Coordinate System Restriction Koordinatensystemeinschränkung - + No coordinate systems selected. Disabling restriction. Kein Koordinatensystem gewählt. Einschränkung aufgehoben. - + Selection color Auswahlfarbe - + CRS %1 was already selected KBS %1 war bereits gewählt - + Coordinate System Restrictions Koordinatensystemeinschränkung - + The current selection of coordinate systems will be lost. Proceed? Die aktuelle Koordinatensystemauswahl wird verloren gehen. Fortfahren? - + Select print composer Druckzusammenstellung wählen - + Composer Title Titel der Druckzusammenstellung - + Select restricted layers and groups Eingeschränkte Layer und Gruppen wählen - + Enter scale Maßstab eingeben - + Scale denominator Maßstabsnenner - + Load scales Maßstäbe laden - - + + XML files (*.xml *.XML) XML-Dateien (*.xml *.XML) - + Save scales Maßstäbe speichern - + Transparency %1% Transparenz %1% - + Select a valid symbol Ein gültiges Symbol wählen - + Invalid symbol : Ungültiges Symbil : + + + Parameters : + Parameter : + + + + + Parameters: + Parameter: + + + + Can only use ellipsoidal calculations when CRS transformation is enabled + Ellipsoide Berechnungen nur bei eingeschalteter KBS-Transformation möglich + QgsProjectPropertiesBase @@ -31733,310 +32863,345 @@ Fortfahren? Allgemeine Einstellungen - + + Measure tool + Messwerkzeug + + + + Ellipsoid for distance calculations + Ellipsoid für Abstandsberechnungen + + + + Semi-minor + Nebenachse + + + + Semi-major + Hauptachse + + + Canvas units Karteneinheiten - + Meters Meter - + Feet Fuß - + Degree Grad - + Degree display Gradanzeige - + Decimal degrees Dezimal Grad - + Degrees, Minutes Grad, Minuten - + Degrees, Minutes, Seconds Grad, Minuten, Sekunden - + Project scales Projektmaßstäbe - - - - - - - - + + + + + + + + ... ... - + Identifiable layers Abfragbare Layer - - + + Layer Layer - + Type Typ - + Identifiable Abfragbar - + Default Styles Vorgabestile - + Default Symbols Vorlagesymbole - + Marker Markierung - + Line Linie - + Fill Füllung - + Color Ramp Farbverlauf - + Style Manager Stilmanager - + Options Optionen - + Assign random colors to symbols Den Symbolen zufällige Farben zuordnen - + Opacity Deckkraft - + OWS Server OWS Server - + Service Capabilitities Diensteigenschaften - + Title Titel - + Person Person - + Phone Telefon - + Abstract Zusammenfassung - + E-Mail E-Mail - + Organization Organisation - + Online resource Online-Quelle - + + Fees + Gebühren + + + + Access constraints + Zugriffsbeschränkungen + + + + Keyword list + Schlüsselwortliste + + + WMS Capabilitities WMS-Capabilities - + Advertised Extent Angezeigte Ausmasse - + Min. X Min. X - + Min. Y Min. Y - + Max. X Max. X - + Max. Y Max. Y - + Use Current Canvas Extent Aktuelle Anzeigegrenzen übernehmen - + Exclude composers Druckzusammenstellungen ausschließen - + Exclude layers Layer ausschließen - + Update Aktualisieren - + Insert Einfügen - + Delete Löschen - + Unselect all Alle abwählen - + Select all Alle wählen - + Macros Makros - + Python macros Python-Makros - + Coordinate Systems Restrictions Koordinatensystemeinschränkungen - + Add Hinzufügen - + Remove Entfernen - + Used Benutzte - + Add WKT geometry to feature info response WKT-Geometrie in Objektinformationen einschließen - + Used when CRS transformation is turned off Wird benutzt, wenn KBS-Transformation abgeschaltet ist - + Advertised WMS url Angezeigte WMS-Url - + Maximum width Maximale Breite - + Maximum height Maximale Höhe - + WFS Capabilitities WFS-Capabilities - + Published Veröffentlich @@ -32066,44 +33231,44 @@ Fortfahren? Pfade speichern - + Automatic Automatisch - + Automatically sets the number of decimal places in the mouse position display Setzt automatisch die Anzahl Dezimalstellen in der Mauspositionsanzeige - + The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display Die Anzahl Dezimalstellen, die beim Anzeigen der Mausposition benutzt werden, wird automatisch so gesetzt, dass eine Mausbewegung um einen Pixel zu einer Änderung in der Positionsanzeige führt - + Manual Manuell - - + + Sets the number of decimal places to use for the mouse position display Setzt die Anzahl Dezimalstellen für die Mauspositionsanzeige - - + + The number of decimal places for the manual option Setzt die Anzahl Dezimalstellen für die manuelle Option - + decimal places Dezimalstellen - + Precision Genauigkeit @@ -32128,12 +33293,12 @@ Fortfahren? Hintergrundfarbe - + Coordinate Reference System (CRS) Koordinatenbezugssystem (KBS) - + Enable 'on the fly' CRS transformation 'On-The-Fly'-KBS-Transformation aktivieren @@ -32746,37 +33911,37 @@ p, li { white-space: pre-wrap; } Objektinformation - + Band Kanal - + Average Mittlere - + Nearest Neighbour Nächster Nachbar - + Gauss Gauß - + Cubic Kubisch - + Mode Modus - + None Keine @@ -33078,238 +34243,230 @@ Klicken Sie auf den Hilfeknopf, um die gültigen Optionen für dies Format zu er QgsRasterLayer - - - - - + + + + + Not Set Nicht gesetzt - + Retrieving stats for %1 Lade Statistik für %1 - + Could not reproject view extent: %1 Konnte Anzeigegrenzen nicht transformieren: %1 - + Could not reproject layer extent: %1 Konnte Layergrenzen nicht transformieren: %1 - + Cannot read data Kann Daten nicht lesen - + null (no data) Null (keine Daten) - + Driver: Treiber: - + Pyramid overviews: Pyramidenübersichten: - + Layer Extent (layer original source projection): Layerausdehnung (in urspünglicher Projektion des Layers): - - + + Band Kanal - + Band No Kanal Nr - + No Stats Keine Statistik - + No stats collected yet Noch keine Statistik gesammelt - + Min Val Minimalwert - + Max Val Maximalwert - + Range Bereich - + Mean Durchschnitt - + Sum of squares Summe der Quadrate - + Standard Deviation Standardabweichung - + Sum of all cells Summe aller Zellen - + Cell Count Zellenanzahl - - Failed to load provider %1 (Reason: %2) - Konnte Lieferanten %1 nicht laden (Grund: %2) + + Cannot instantiate the '%1' data provider + Konnte Datenlieferanten '%1' nicht erzeugen - - - - - - - - Raster - Raster - - - - Cannot resolve the classFactory function - Konnte die classFactory-Funktion nicht auflösen + + Provider is not valid (provider: %1, URI: %2 + Datenlieferant ist ungültig (Lieferant: %1, URI: %2) - - Cannot instantiate the data provider - Konnte Datenlieferanten nicht erzeugen + + + + + Raster + Raster - + <maplayer> not found. <maplayer> nicht gefunden. - + GDAL data type %1 is not supported GDAL-Datentyp %1 ist nicht unterstützt - + Data Type: Datentyp: - + GDT_Byte - Eight bit unsigned integer GDT_Byte - Eight bit unsigned integer - + GDT_UInt16 - Sixteen bit unsigned integer GDT_UInt16 - Sixteen bit unsigned integer - + GDT_Int16 - Sixteen bit signed integer GDT_Int16 - Sixteen bit signed integer - + GDT_UInt32 - Thirty two bit unsigned integer GDT_UInt32 - Thirty two bit unsigned integer - + GDT_Int32 - Thirty two bit signed integer GDT_Int32 - Thirty two bit signed integer - + GDT_Float32 - Thirty two bit floating point GDT_Float32 - Thirty two bit floating point - + GDT_Float64 - Sixty four bit floating point GDT_Float64 - Sixty four bit floating point - + GDT_CInt16 - Complex Int16 GDT_CInt16 - Complex Int16 - + GDT_CInt32 - Complex Int32 GDT_CInt32 - Complex Int32 - + GDT_CFloat32 - Complex Float32 GDT_CFloat32 - Complex Float32 - + GDT_CFloat64 - Complex Float64 GDT_CFloat64 - Complex Float64 - + Could not determine raster data type. Konnte Rasterdatentyp nicht erkennen. - + Layer Spatial Reference System: Referenzsystem des Layers: - + No Data Value Leerwert - + NoDataValue not set Leerwert nicht gesetzt - + Project Spatial Reference System: Projektkoordinatenbezugssystem: - + QgsRasterLayer created QgsRasterLayer erzeugt @@ -33317,37 +34474,37 @@ Klicken Sie auf den Hilfeknopf, um die gültigen Optionen für dies Format zu er QgsRasterLayerProperties - + Columns: Spalten: - + Rows: Zeilen: - - + + No-Data Value: LeerWert: + - - - + + n/a n/a - - + + Write access denied Schreibzugriff verweigert - + Write access denied. Adjust the file permissions and try again. @@ -33355,185 +34512,185 @@ Klicken Sie auf den Hilfeknopf, um die gültigen Optionen für dies Format zu er - - - - + + + + Building pyramids failed. Erstellung von Pyramiden fehlgeschlagen. - - + + Building pyramid overviews is not supported on this type of raster. Für diese Art von Raster können keine Pyramiden erstellt werden. - + Description Beschreibung - + Large resolution raster layers can slow navigation in QGIS. Hochaufgelöste Raster können das Navigieren in QGIS verlangsamen. - + By creating lower resolution copies of the data (pyramids) performance can be considerably improved as QGIS selects the most suitable resolution to use depending on the level of zoom. Durch das Erstellen geringer aufgelöster Kopien der Daten (Pyramiden), kann die Darstellung beschleunigt werden, da QGIS die optimale Auflösung entsprechend der gewählten Zoomeinstellung aussucht. - + You must have write access in the directory where the original data is stored to build pyramids. Sie brauchen Schreibrecht in dem Ordner mit den Originaldaten, um Pyramiden zu erstellen. - + Layer Properties - %1 Layereigenschaften - %1 - - + + Nearest neighbour Nächster Nachbar - - + + Bilinear Bilinear - - + + Cubic Kubisch - - + + Average Mittlere - + None Keine - - + + Red Rot - - + + Green Grün - - + + Blue Blau - - - + + + + - Percent Transparent Prozent Transparenz - - + + Gray Grau - - + + Indexed Value Indizierter Wert - + From Von - + To Nach - + not defined undefiniert - + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. Erstellung von interne Pyramiden-Übersichten weder für JPEG-komprimierte Rasterlayer noch durch Ihre aktuelle libtiff-Bibliothek unterstützt. - + Save file Datei speichern - + Load layer properties from style file Layereigenschaften aus Stildatei laden - - + + QGIS Layer Style File QGIS-Layerstildatei - + Save layer properties as style file Layereigenschaften als Stildatei speichern - + Filter Filter - + Bands Kanäle - + QGIS Generated Transparent Pixel Value Export File QGIS-erzeugte Export-Datei für transparente Pixelwerte - + Open file Datei öffnen - + Import Error Importfehler - + Read access denied Lesezugriff verweigert - + Read access denied. Adjust the file permissions and try again. @@ -33545,60 +34702,60 @@ Klicken Sie auf den Hilfeknopf, um die gültigen Optionen für dies Format zu er Nicht gesetzt - - + + Default Style Vorgabestil - + Please note that building internal pyramids may alter the original data file and once created they cannot be removed! Bitte beachten Sie, dass der Aufbau von internen Pyramiden die Originaldatei ändern kann und einmal angelegt nicht gelöscht werden kann! - + Please note that building internal pyramids could corrupt your image - always make a backup of your data first! Bitte beachten sie, dass der Aufbau von internen Pyramiden ihr Bild beschädigen kann - bitte sichern Sie Ihre Daten zuvor! - + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. Die Datei war nicht beschreibbar. Einige Formate unterstützen Übersichtspyramiden nicht. Gucken Sie im Zweifel in die GDAL-Dokumentation. - - + + Saved Style Gespeicherter Stil - + Columns: %1 Spalten: %1 - + Rows: %1 Zeilen: %1 - + No-Data Value: %1 Kein-Datum-Wert: %1 - + Write access denied. Adjust the file permissions and try again. Schreibzugriff verweigert. Passen Sie die Dateizugriffsrechte an und versuchen Sie es erneut. - - + + Textfile Textdatei - + The following lines contained errors %1 @@ -33615,343 +34772,376 @@ Klicken Sie auf den Hilfeknopf, um die gültigen Optionen für dies Format zu er Rasterlayereigenschaften - - - - - - + + + + + + ... ... - + Original data source no data value, if exists. Urspünglicher Leerwert der Quelle, falls vorhanden. - + <src no data value> <quellleerwert> - - + + Additional user defined no data value. Zusätzlicher benutzerdefinierter Leerwert. - + Additional no data value Zusätzlicher Leerwert - + + + Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. + Größter Maßstab (d.h. kleinster Maßstabsnenner). Diese Grenze ist einschließlich, d.h. der Layer wird bis zu diesem Maßstab angezeigt. + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inclusive)</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Größter Maßstab</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inklusive)</p></body></html> + + + + + Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. + Kleinster Maßstab, d.h. größter Maßstabsnenner. Die Grenze ist ausschließlich, d.h. der Layer wird bei diesem Maßstab nicht mehr angezeigt. + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exclusive)</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Kleinster Maßstab</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exklusive)</p></body></html> + + + Title Titel - + Abstract Zusammenfassung - + Transparency Transparenz - + Global transparency Globale Transparenz - + None Keine - + 00% 00% - + <p align="right">Full</p> <p align="right">Voll</p> - + No data value Leerwert - + Custom transparency options Benutzerdefinierte Transparenzeinstellung - + Style mRendererTab Stil - + Resampling Abtastung - + Zoomed in Hinein gezoomt - + Zoomed out Heraus gezoomt - + Render type Darstellungsart - - Invert color map - Farbtabelle invertieren - - - + Oversampling Überabtastung - + Transparency band Transparenzkanal - + Transparent pixel list Transparente Pixelliste - + Add values manually Werte manuell hinzufügen - + Add Values from display Werte aus Anzeige ergänzen - + Remove selected row Gewählte Zeile löschen - + Default values Vorgabewerte - + Import from file Aus Datei importieren - + Export to file In Datei exportieren - + Use original source no data value. Den ursprünglichen Leerwert benutzen. - + No data value: Leerwert: - + General Allgemein - + Display name Anzeigename - + Layer source Layerquelle - + Scale dependent visibility Maßstabsabhängige Sichtbarkeit - + + + Current + Aktuell + + + Coordinate reference system Koordinatenbezugssystem - - + + Specify the coordinate reference system of the layer's geometry. Koordinatenbezugsssystem der Geometrie des Layers angeben. - + Specify... Angeben... - + Thumbnail Thumbnail - + Legend Legende - + Palette Palette - + Metadata Metadaten - + Pyramids Pyramiden - + Notes Hinweise - + Pyramid resolutions Pyramidenauflösungen - + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> + + + Resampling method Abtastungsmethode - + Average Durchschnitt - + Nearest Neighbour Nächster Nachbar - + Build pyramids Pyramiden erzeugen - + Histogram Histogramm - + Columns Spalten - + Rows Zeilen - + No Data Leerwert - - Less than: - Weniger als: - - - - More than or equal to: - Mehr als oder gleich: - - - - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "http://www.w3.org/TR/REC-html40/strict.dtd"> -<html><head><meta name="qrichtext" content="1" /><style type="text/css"> -p, li { white-space: pre-wrap; } -</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> - - - + Overview format Übersichtsformat - + External Extern - + Internal (if possible) Intern (wenn möglich) - + External (Erdas Imagine) Extern (Erdas Imagine) - + Pipe Pipeline - + Restore Default Style Vorgabestil wiederherstellen - + Save As Default Als Vorgabe speichern - + Load Style ... Stil laden... - + Save Style ... Stil speichern... @@ -34515,77 +35705,77 @@ p, li { white-space: pre-wrap; } Ergebnis zum Projekt hinzufügen - + Illumination Beleuchtung - + Azimuth (horizontal angle) Azimuth (horizontaler Winkel) - + Vertical angle Vertikaler Winkel - + Relief colors Relief-Farben - + Create automatically Automatisch erzeugen - + Export distribution... Verteilung exportieren... - + Up Auf - + Down Ab - + + + - + - - - + Lower bound Untere Begrenzung - + Upper bound Obere Begrenzung - + Color Farbe - + Export colors... Farben exportieren... - + Import colors... Farben importieren... @@ -34680,7 +35870,7 @@ p, li { white-space: pre-wrap; } - + Filter Filter @@ -34726,24 +35916,24 @@ p, li { white-space: pre-wrap; } Symbol - + Error Fehler - + Filter expression parsing error: Filterausdrucksfehler: - + Evaluation error Auswertungsfehler - + Filter returned %n feature(s) number of filtered features @@ -34897,109 +36087,149 @@ p, li { white-space: pre-wrap; } QgsRuleBasedRendererV2Model - + (no filter) (kein Filter) - + + <li><nobr>%1 features also in rule %2</nobr></li> + <li><nobr>%1 Objekte auch in Regel %2</nobr></li> + + + Label Beschriftung - + Rule Regel - + Min. scale Min. Maßstab - + Max.scale Max. Maßstab + + + Count + Anzahl + + + + Duplicate count + Doppelte + + + + Number of features in this rule. + Anzahl der Objekte in dieser Regel. + + + + Number of features in this rule which are also present in other rule(s). + Anzahl von Objekten in dieser Regel, die auch in anderen Regeln vorkommen. + QgsRuleBasedRendererV2Widget - + Add Hinzufügen - + + Count features + Objektanzahl + + + Rendering order... Zeichenreihenfolge... - + Edit Bearbeiten - + Remove Entfernen - + Refine current rules Aktuelle Regeln verfeinern - + Add scales to rule Maßstabe zur Regel hinzufügen - + Add categories to rule Kategroien zur Regel hinzufügen - + Add ranges to rule Bereiche zur Regel hinzufügen - + Refine a rule to categories Eine Regel für Kategorien präzisieren - + Refine a rule to ranges Eine Regel für Maßstäbe präzisieren - - + + Scale refinement Eine Regel für Maßstäbe präzisieren - + Parent rule %1 must have a symbol for this operation. Für diese Operation muß die Elterregel %1 ein Symbol haben. - + Please enter scale denominators at which will split the rule, separate them by commas (e.g. 1000,5000): Bitte geben Sie einen Maßstabsnenner an bei dem die Regel aufgeteilt werden soll. Trennen Sie sie durch Kommata (z.B. 1000,5000): - + Error Fehler - + "%1" is not valid scale denominator, ignoring it. "%1" wird als ungültiger Nenner ignoriert. + + + Calculating feature count. + Objektanzahl wird berechnet. + + + + Abort + Abbrechen + QgsRunProcess @@ -35154,7 +36384,7 @@ p, li { white-space: pre-wrap; } QgsSVGFillSymbolLayerWidget - + Select svg texture file SVG-Texturdatei wählen @@ -35388,22 +36618,32 @@ Der Fehler war: QgsSingleBandGrayRendererWidget - + + Black to white + Schwarz nach Weiß + + + + White to black + Weiß nach Schwarz + + + No enhancement Keine Erweiterung - + Stretch to MinMax Strecken auf MinMax - + Stretch and clip to MinMax Auf MinMax strecken und zuschneiden - + Clip to MinMax Zuschneiden auf MinMax @@ -35435,32 +36675,37 @@ Der Fehler war: Max Max + + + Color gradient + Farbverlauf + QgsSingleBandPseudoColorRendererWidget - - - + + + Discrete Diskret - - - - + + + + Linear Linear - - + + Exact Genau @@ -35476,33 +36721,33 @@ Der Fehler war: Benutzerdefinierte Farbabbildungseintrag - + Load Color Map QGIS-Farbabbildung laden - + The color map for band %1 failed to load Die Farbabbildung für den Kanal %1 konnte nicht geladen werden - + Open file Datei öffnen - - + + Textfile (*.txt) Textdatei (*.txt) - + Import Error Importfehler - + The following lines contained errors @@ -35510,12 +36755,12 @@ Der Fehler war: - + Read access denied Lesezugriff verweigert - + Read access denied. Adjust the file permissions and try again. @@ -35523,22 +36768,22 @@ Der Fehler war: - + Save file Datei speichern - + QGIS Generated Color Map Export File QGIS-Farbabbildungsexportdatei - + Write access denied Schreibzugriff verweigert - + Write access denied. Adjust the file permissions and try again. @@ -35653,6 +36898,11 @@ Der Fehler war: Min / Max origin Min- / Max-Ursprung + + + Invert colors order + Farbreihenfolge umkehren + Classify @@ -35904,113 +37154,171 @@ Der Fehler war: QgsSpatiaLiteConnection - - - + + obsolete libspatialite: connecting to this DB requires using v.4.0 (or any subsequent) + Veraltete libspatialite: Ein Verbindung zu dieser Datenbank ist v4.0 oder höher erforderlich + + + + + + unknown error cause unbekannte Fehlerursache + + + obsolete libspatialite: AbstractInterface is unsupported + Veraltete libspatialite: AbstractInterface ist nicht unterstützt + + + + UNKNOWN + UNBEKANNT + + + + GEOMETRY + GEOMETRIE + + + + POINT + PUNKT + + + + LINESTRING + Linie + + + + POLYGON + Polygon + + + + MULTIPOINT + Multipunkt + + + + MULTILINESTRING + Multilinie + + + + MULTIPOLYGON + Multipolygon + + + + GEOMETRYCOLLECTION + Geometriesammlung + QgsSpatiaLiteProvider - + Text Text - + Binary object (BLOB) Binärobjekt (BLOB) - + Decimal number (double) Dezimalzahl (double) - + Whole number (integer) Ganzzahl (integer) - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + SQLite error: %2 SQL: %1 SQLite-Fehler:%2 SQL: %1 - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + SpatiaLite SpatiaLite - - - - - - - - - + + + + + + + + + unknown cause unbekannte Ursache - + SQLite error getting feature: %1 SQLite-Fehler beim Objektladen: %1 - + FAILURE: Field %1 not found. FEHLER: Feld %1 nicht gefunden. @@ -36028,80 +37336,106 @@ SQL: %1 Datenbanken - + &Build Query &Abfrage erstellen - + &Add &Hinzufügen - - + + &Update statistics + &Statistik aktualisieren + + + + Wildcard Platzhalter - - + + RegExp RegAusdr - - + + All Alle - - + + Table Tabelle - - + + Type Typ - - + + Geometry column Geometriespalte - - + + Sql SQL - + + Confirm Update Statistics + Statistikaktualisierung bestätigen + + + + + Update Statistics + Statistikaktualisierung + + + + Internal statistics successfully updated for: %1 + Interne Statistik für %1 erfolgreich aktualisiert. + + + + Error while updating internal statistics for: %1 + Fehler bei Aktualisierung der Statistik für %1 + + + SpatiaLite DB SpatiaLite DB - + All files Alle Dateien - - + + SpatiaLite DB Open Error SpatiaLite-DB-Fehler beim Öffnen - + Database does not exist: %1 Datenbank existiert nicht: %1 - + Failure while connecting to: %1 %2 @@ -36110,12 +37444,12 @@ SQL: %1 %2 - + SpatiaLite Error SpatiaLite-Fehler - + Unexpected error when working with: %1 %2 @@ -36124,42 +37458,53 @@ SQL: %1 %2 - + @ @ - + + Are you sure you want to update the internal statistics for DB: %1? + +This could take a long time (depending on the DB size), +but implies better performance thereafter. + Sind Sie sicher, dass die die interne Statistik der DB %1 aktualisieren wollen? + +Dies kann lange dauern (abhängig von der DB-Größe), +aber führt danach zu größerer Geschwindigkeit. + + + Choose a SpatiaLite/SQLite DB to open Zu öffnende SpatiaLite/SQLite-DB wählen - + Are you sure you want to remove the %1 connection and all associated settings? Sind Sie sicher, dass Sie die Verbindung %1 und alle zugehörigen Einstellungen löschen wollen? - + Confirm Delete Löschen bestätigen - + Select Table Tabelle wählen - + You must select a table in order to add a Layer. Zum Hinzufügen eines Layers müssen Sie eine Tabelle wählen. - + SpatiaLite getTableInfo Error SpatiaLite-getTableInfo-Fehler - + Failure exploring tables from: %1 %2 @@ -37607,37 +38952,37 @@ Ersetzen? Bitte einen Farbverlauftyp wählen: - - + + Invalid Selection Ungültige Auswahl - + The parent group you have selected is not user editable. Kindly select a user defined group. Die gewählte Eltergruppe ist nicht änderbar. Bitte eine benutzerdefinierte Gruppe wählen. - + Creation of nested smart groups are not allowed Select the 'Smart Group' to create a new group. Die Erzeugung von verschachtelten schlauen Gruppe ist nicht erlaubt. Bitte die 'Schlaue Gruppe' wählen, um eine neue zu erzeugen. - + Invalid selection Ungültige Auswahl - + There was some error while editing the smart group. Es gabe einen Fehler beim Bearbeiten der schlauen Gruppe. - + Operation Not Allowed Operation nicht erlaubt @@ -37657,71 +39002,71 @@ Bitte die 'Schlaue Gruppe' wählen, um eine neue zu erzeugen.Neuer zufälliger Farbverlauf - + Color Ramp Name Farbverlaufname - + Please enter a name for new color ramp: Name für neuen Farbverlauf eingeben: - + Save Color Ramp Farbverlauf speichern - + Cannot save color ramp without name. Enter a name. Kann namenlose Farbverläufe nicht speichern. Bitte benennen. - + Save color ramp Farbverlauf speichern - + Color ramp with name '%1' already exists. Overwrite? Farbverlauf names '%1' existiert bereits. Ersetzen? - + Cannot delete system defined categories. Kindly select a group or smart group you might want to delete. Systemdefinierte Kategorien können nicht gelöscht werden. Bitte Gruppe oder schlaue Gruppe zum Löschen wählen. - + Error! Fehler! - + New group could not be created. There was a problem with your symbol database. Neue Gruppe konnte nicht erzeugt werden. Es gab ein Problem mit Ihrer Symboldatenbank. - + Database Error Datenbank-Fehler - + There was a problem with the Symbols database while regrouping. Es gab ein Problem mit der Symboldatenbank bei der Neugruppierung. - + You have not selected a Smart Group. Kindly select a Smart Group to edit. Sie haben keine schlaue Gruppe gewählt. Bitte eine zur Bearbeitung wählen. - + Database Error! Datenbank-Fehler! @@ -37754,12 +39099,12 @@ Es gab ein Problem mit Ihrer Symboldatenbank. Farbverlauf - + Add item Element hinzufügen - + Share Freigeben @@ -37769,30 +39114,77 @@ Es gab ein Problem mit Ihrer Symboldatenbank. Elemente - + Edit item Element bearbeiten - + Edit Bearbeiten - + Remove item Element löschen + + QgsSvgAnnotationDialog + + + SVG annotation + SVG-Bemerkung + + + + Delete + Löschen + + + + Select SVG file + SVG-Datei wählen + + + + SVG files + SVG-Dateien + + + + QgsSvgCache + + + SVG request failed [error: %1 - url: %2] + SVG-Abfrage gescheitert [Fehler: %1 - URL %2] + + + + + SVG + SVG + + + + SVG request error [status: %1 - reason phrase: %2] + SVG-Abfragefehler [Status: %1 - Grund: %2] + + + + %1 of %2 bytes of svg image downloaded. + %1 von %2 Bytes des SVG-Bilds geladen. + + QgsSvgMarkerSymbolLayerV2Widget - + Select SVG file SVG-Datei wählen - + SVG files SVG-Dateien @@ -37957,20 +39349,15 @@ Es gab ein Problem mit Ihrer Symboldatenbank. QgsTextAnnotationDialog - + Delete Löschen - + Select font color Schriftfarbe wählen - - - Select background color - Hintergrundfarbe wählen - QgsTextAnnotationDialogBase @@ -37989,11 +39376,6 @@ Es gab ein Problem mit Ihrer Symboldatenbank. I K - - - Background color - Hintergrundfarbe - QgsTileScaleWidget @@ -38611,18 +39993,38 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsVectorGradientColorRampV2Dialog - - - - + + Discrete + Diskret + + + + Continous + Fortlaufend + + + + Gradient file : %1 + Gradienten-Datei : %1 + + + + License file : %1 + Lizenzdatei : %1 + + + + + + Offset of the stop Versatz des Wechsels - - - - + + + + Please enter offset in percents (%) of the new stop Bitte geben sie den Versatz in Prozent (%) des neuen Wechsels an @@ -38651,32 +40053,42 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Farbe 2 - + + Type + Typ + + + Multiple stops Mehrere Wechsel - + Add stop Hinzufügen - + Remove stop Entfernen - + Color Farbe - - Offset - Versatz + + Offset (%) + Versatz (%) - + + Information + Information + + + Preview Vorschau @@ -38684,37 +40096,47 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsVectorLayer - + + Updating feature count for layer %1 + Objektanzahl des Layers %1 aktualsieren + + + + Abort + Abbrechen + + + No renderer object Kein Darstellungsobjekt - + Classification field not found Klassifikationsfeld nicht gefunden - + renderer failed to save Darstellung konnte nicht gespeichert werden - + no renderer Keine Darstellung - + ERROR: no provider FEHLER: kein Datenlieferant - + ERROR: layer not editable FEHLER: Layer ist nicht veränderbar - + SUCCESS: %n attribute(s) deleted. deleted attributes count @@ -38723,7 +40145,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + ERROR: %n attribute(s) not deleted. not deleted attributes count @@ -38732,7 +40154,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + SUCCESS: %n attribute(s) added. added attributes count @@ -38741,7 +40163,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + ERROR: %n new attribute(s) not added not added attributes count @@ -38750,17 +40172,17 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + SUCCESS: attribute %1 was added. ERFOLG: Attribut %1 hinzugefügt. - + ERROR: attribute %1 not added FEHLER: Attribut %1 nicht hinzugefügt - + SUCCESS: %n attribute value(s) changed. changed attribute values count @@ -38769,7 +40191,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + ERROR: %n attribute value change(s) not applied. not changed attribute values count @@ -38778,7 +40200,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + SUCCESS: %n feature(s) added. added features count @@ -38787,7 +40209,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + ERROR: %n feature(s) not added. not added features count @@ -38796,7 +40218,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + ERROR: %n feature(s) not added - provider doesn't support adding features. not added features count @@ -38805,7 +40227,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + SUCCESS: %n geometries were changed. changed geometries count @@ -38814,7 +40236,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + ERROR: %n geometries not changed. not changed geometries count @@ -38823,7 +40245,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + SUCCESS: %n feature(s) deleted. deleted features count @@ -38832,7 +40254,7 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + ERROR: %n feature(s) not deleted. not deleted features count @@ -38841,128 +40263,128 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? - + Provider errors: Datenlieferantenfehler: - + Commit errors: %1 Commit-Fehler: %1 - + General: Allgemein: - + Layer comment: %1 Layerkommentar: %1 - + Storage type of this layer: %1 Datenspeicher dieses Layers: %1 - + Source for this layer: %1 Quelle dieses Layers: %1 - + Geometry type of the features in this layer: %1 Geometrietyp der Objekte dieses Layers: %1 - + The number of features in this layer: %1 Anzahl der Objekte dieses Layers: %1 - + Editing capabilities of this layer: %1 Bearbeitungseigenschaften dieses Layers: %1 - + Extents: Ausdehnung: - + In layer spatial reference system units : In Bezugssystemeinheiten des Projekts : - - + + xMin,yMin %1,%2 : xMax,yMax %3,%4 xMin,yMin %1;%2 : xMax,yMax %3;%4 - + unknown extent Unbekannte Ausmaße - - + + In project spatial reference system units : In Bezugssystemeinheiten des Projekts : - + Layer Spatial Reference System: Räumliches Bezugssystem des Layers: - + Project (Output) Spatial Reference System: Räumliches Bezugssystem des Projekts (Ausgabe): - + (Invalid transformation of layer extents) (Transformation der Layerausdehnung ungültig) - + Attribute field info: Attributfeldinformationen: - + Field Feld - + Type Typ - + Length Länge - + Precision Genauigkeit - + Comment Kommentar - + Unknown renderer Unbekannte Darstellung @@ -38970,291 +40392,136 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden? QgsVectorLayerProperties - - + + Stop editing mode to enable this. Bearbeitungsmodus beenden, um dies zu aktivieren. - - Name conflict - Namenskonflikt - - - - The attribute could not be inserted. The name already exists in the table. - Das Attribut konnte nicht eingefügt werden, da der Name bereits vorhanden ist. - - - - Added attribute - Attribut hinzugefügt - - - - Deleted attribute - Attribute gelöscht - - - + Transparency: %1% Transparenz: %1% - - + + Single Symbol Einzelsymbol - - + + Graduated Symbol Abgestuftes Symbol - - + + Continuous Color Fortlaufende Farbe - - + + Unique Value Eindeutiger Wert - + Insert expression Ausdruck einfügen - - Classification - Klassifikation - - - - Dial range - Drehreglerbereich - - - - Hidden - Versteckt - - - - Checkbox - Kontrollkästchen - - - - Text edit - Texteditor - - - - Calendar - Kalender - - - - Value relation - Wertbeziehung - - - - UUID generator - UUID-Generator - - - - + + Spatial Index Räumlicher Index - + Creation of spatial index successful Räumlichen Indexes erfolgreich erstellt - + Creation of spatial index failed Erstellung des räumlichen Indexes schlug fehl - + Load layer properties from style file Layereigenschaften aus Stildatei laden - - - + + + QGIS Layer Style File QGIS-Layerstildatei - - - + + + SLD File SLD-Datei - + Load Style Stil laden - + Save layer properties as style file Layereigenschaften als Stildatei speichern - - UI file - UI-Dateien - - - + Save Style Stil speichern - + Save Style... Stil speichern... - - Type - Typ - - - - Length - Länge - - - - Precision - Genauigkeit - - - - Comment - Kommentar - - - - + + Default Style Vorgabestil - + Saved Style Gespeicherter Stil - - Select edit form - Bearbeitungsformular wählen - - - + Symbology Darstellung - + Do you wish to use the new symbology implementation for this layer? Wollen Sie die neue Darstellungsimplementierung für diesen Layer nutzen? - + This button opens the query builder and allows you to create a subset of features to display on the map canvas rather than displaying all features in the layer Dieser Knopf öffnet die Abfrageerstellung und ermöglicht, statt aller Objekte, eine Untermenge der Objekte auf dem Kartenfenster darzustellen - + Layer Properties - %1 Layereigenschaften - %1 - - Id - Id - - - - Name - Name - - - - Edit widget - Bearbeitungselement - - - - Alias - Alias - - - + The query used to limit the features in the layer is shown here. To enter or modify the query, click on the Query Builder button Die Abfrage zur Begrenzung der Anzahl der Objekte wird hier angezeigt. Klicken Sie auf auf 'Abfrageerstellung', um eine Abfrage einzugeben oder zu ändern - - - Line edit - Eingabezeile - - - - Unique values - Eindeutige Werte - - - - Unique values editable - Eindeutige Werte (bearbeitbar) - - - - Value map - Wertabbildung - - - - Edit range - Eingabezeile mit Bereich - - - - Slider range - Schieberbereich - - - - File name - Dateiname - - - - Enumeration - Aufzählung - - - - Immutable - Unveränderbar - QgsVectorLayerPropertiesBase @@ -39294,33 +40561,33 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Felder - + General Allgemein - + Options Optionen - + Create Spatial Index Räumlichen Index erstellen - - + + Specify the coordinate reference system of the layer's geometry. Koordinatenbezugsssystem der Geometrie des Layers angeben. - + Specify CRS KBS angeben - + Update Extents Ausmaße aktualisieren @@ -39330,147 +40597,122 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Beschriftung (alt) - + CRS KBS - - Less than: - Weniger als: - - - - More than or equal to: - Mehr als oder gleich: - - - + Provider-specific options Datenlieferanteneinstellungen - + Encoding Kodierung - + Display Anzeigen - + Legend display text Legendenanzeigetext - + Map Tip display text Kartentippanzeigetext - + Inserts an expression into the action Einen Ausdruck in die Aktion einfügen - + Insert expression... Ausdruck einfügen... - + The valid attribute names for this layer Die gültigen Attributnamen für diesen Layer - + Inserts the selected field into the action Fügt das gewählte Feld in die Aktion ein - + Insert field Attribut einfügen - + HTML HTML - + Field Feld - + Title Titel - + Abstract Zusammenfassung - + Joins Verknüpfungen - + Join layer Joinlayer - + Join field Verknüpfungsfeld - + Target field Zielfeld - + Diagrams Diagramme - - - Edit UI - UI zur Bearbeitung - New symbology Neue Darstellung - - ... - ... - - - - Init function - Initialisierungsfunktion - - - + Use scale dependent rendering Maßstabsabhängig zeichnen - + Subset Untermenge - + Query Builder Abfrageerstellung @@ -39485,91 +40727,98 @@ Sollen die vorhandenen Klassen vor der Klassifizierung gelöscht werden?Transparenz - - Metadata - Metadaten - - - - Labels - Beschriftungen - - - - Display labels - Beschriftungen anzeigen + + + Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. + Kleinster Maßstab, d.h. größter Maßstabsnenner. Die Grenze ist ausschließlich, d.h. der Layer wird bei diesem Maßstab nicht mehr angezeigt. - - Actions - Aktionen + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exclusive)</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Kleinster Maßstab</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exklusive)</p></body></html> - - New column - Neue Spalte + + + Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. + Größter Maßstab (d.h. kleinster Maßstabsnenner). Diese Grenze ist einschließlich, d.h. der Layer wird bis zu diesem Maßstab angezeigt. - - Ctrl+N - Strg+N + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inclusive)</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//DE" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Größter Maßstab</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inklusive)</p></body></html> - - Delete column - Spalte löschen + + + Current + Aktuell - - Ctrl+X - Strg+X + + Metadata + Metadaten - - Toggle editing mode - Bearbeitungsmodus umschalten + + Labels + Beschriftungen - - - Click to toggle table editing - Anklicken um den Tabellenbearbeitungsmodus umzuschalten + + Display labels + Beschriftungen anzeigen - - Field calculator - Feldrechner + + Actions + Aktionen QgsVectorLayerSaveAsDialog - - SpatiaLite - SpatiaLite - - - + Layer CRS Layer-KBS - + Project CRS Projekt-KBS - + Selected CRS Gewähltes KBS - + Save layer as... Layer speichern als... - + Select the coordinate reference system for the vector file. The data points will be transformed from the layer coordinate reference system. Koordinatenbezugssystem für die Vektordatei wählen. Die Datenpunkte werden vom Koordinatenbezugssystem des Layers transformiert. @@ -40424,113 +41673,107 @@ Antwort war: QgsWcsProvider - + Cannot describe coverage Konnte Coverage nicht beschreiben - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + WCS WCS - + Coverage not found Coverage nicht gefunden - + Cannot calculate extent Konnte Ausdehnung nicht berechnen - + Cannot get test dataset. Konnte Testdatensatz nicht laden. - + Block read OK Blocklesung OK - + Getting map via WCS. Lade Karte über WCS. - + Map request error (Status: %1; Reason phrase: %2; URL:%3) Kartenabfrage-Fehler (Status: %1; Grund:%2; URL: %3) - - + Map request error (Title:%1; Error:%2; URL: %3) Kartenabfrage-Fehler (Titel: %1; Fehler:%2; URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) Kartenabfrage-Fehler (Status: %1; Antwort:%2; URL: %3) - + Cannot find boundary in multipart content type Konnte Begrenzungen in Multipart-Content-Type nicht finden - + Map request error (Response: %1; URL:%2) Kartenabfrage-Fehler (Antwort:%1; URL: %2) - + Cannot create memory file Konnte Speicherdatei nicht erzeugen - + Map request failed [error:%1 url:%2] Kartenabfrage-Fehler [Fehler:%1; URL: %2] - + Not logging more than 100 request errors. Nicht mehr als 100 Abfragefehler werden protokolliert. - + %1 of %2 bytes of map downloaded. %1 von %2 Bytes der Karte heruntergeladen. - + Dom Exception DOM-Ausnahme - + Could not get WCS Service Exception at %1: %2 at line %3 column %4 Response was: @@ -40543,168 +41786,173 @@ Antwort war: %5 - + Request contains a format not offered by the server. Anfrage enthält ein Format, dass der Server nicht anbietet. - + Request is for a Coverage not offered by the service instance. Angefragte Coverage wird von Serverinstanz nicht angeboten. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. Wert des (optionalen) Aktualisierungssequenenzzählers der GetCapabilities-Anfrage entspricht dem aktuellen Wert des Aktualisierungssequenzzähler in den Dienstmetadaten. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. Wert des (optionalen) Aktualisierungssequenenzzählers der GetCapabilities-Anfrage ist größer als der aktuelle Wert des Aktualisierungssequenzzähler in den Dienstmetadaten. - + Request contains an invalid parameter value. Anfrage enthält einen ungültigen Parameterwert. - + No other exceptionCode specified by this service and server applies to this exception. Kein anderer Ausnahmecode des Dienstes und Servers trifft auf diese Ausnahme zu. - + Operation request contains an output CRS that can not be used within the output format. Operationsanfrage enthält ein Ausgabe-KBS, das nicht mit dem Ausgabeformat verwendet werden kann. - + Expected 2 parts, %1 received %1 statt zwei Teilen empfangen - + Received coverage has wrong extent %1 (expected %2) Empfangene Coverage hat falsche Ausdehnung %1 (erwartet %2) - + Rotating raster Raster wird gedreht - + Received coverage has wrong size %1 x %2 (expected %3 x %4) Empfangene Coverage hat die falsche Größe %1 x %2 (erwartet %3 x %4) - + + Map request error:<br>Title: %1<br>Error: %2<br>URL: <a href='%3'>%3</a>) + Kartenabfrage-Fehler:<br>Titel: %1<br>Fehler:%2<br>URL: <a href='%3'>%3</a>) + + + More than 2 parts (%1) received Mehr als 2 Teile (%1) empfangen - + Content-Transfer-Encoding %1 not supported Content-Transfer-Encoding %1 nicht unterstützt - + No data received Keine Daten empfangen - + Request does not include a parameter value, and the server instance did not declare a default value for that dimension. Anfrage enthält keinen Parameterwert, und die Serverinstanz selbst definiert auch keine Vorgabe dafür. - + Operation request specifies to "store" the result, but not enough storage is available to do this. Operationsanfrage gibt das "Speichern" des Ergebnisses vor, aber es ist nicht genügend Speicher dafür verfügbar. - + (No error code was reported) (Kein Fehlercode zurückgegeben) - + (Unknown error code) (Unbekannter Fehlercode) - + The WCS vendor also reported: Der WCS-Betreiber meldete folgendes: - + composed error message '%1'. Zusammengestellte Fehlermeldung '%1'. - - + + Property Eigenschaft - - + + Value Wert - + Name (identifier) Name (Kennung) - - + + Title Titel - - + + Abstract Zusammenfassung - + Fixed Width Feste Breite - + Fixed Height Feste Höhe - + Native CRS Natives KBS - + Native Bounding Box Native Ausdehnung - + WGS 84 Bounding Box WGS84-Ausdehnung - - + + Available in CRS Verfügbar in KBS - - + + (and %n more) crs @@ -40713,74 +41961,74 @@ Antwort war: - - + + Available in format Verfügbar im Format - - + + Coverages Coverages - + Cache Stats Cache-Statistik - + Server Properties Server-Eigenschaften - + Keywords Schlüsselworte - + Online Resource Online-Quelle - + Contact Person Kontaktperson - + Fees Gebühren - + Access Constraints Zugriffsbeschränkungen - + Image Formats Bildformate - + GetCapabilitiesUrl GetCapabilities-URL - + Get Coverage Url GetCoverage-URL - + &nbsp;<font color="red">(advertised but ignored)</font> &nbsp;<font color="red">(gemeldet, aber ignoriert)</font> - + And %1 more coverages Und %1 weitere Coverages @@ -40788,122 +42036,122 @@ Antwort war: QgsWmsProvider - + Tried URL: %1 URL %1 versucht - + Capabilities request redirected. Eigenschaften-Abfrage umgeleitet. - + empty of capabilities: %1 Eigenschaften leer: %1 - + Download of capabilities failed: %1 Eigenschaften-Abfrage gescheitert: %1 - + %1 of %2 bytes of capabilities downloaded. %1 von %2 Bytes der Eigenschaften heruntergeladen. - + %1 of %2 bytes of map downloaded. %1 von %2 Bytes der Karte heruntergeladen. - - - + + + Dom Exception DOM-Ausnahme - + Request contains a CRS not offered by the server for one or more of the Layers in the request. Anfrage verlangt ein CRS für einen oder mehrere Layer, die der Server nicht anbietet. - + Request contains a SRS not offered by the server for one or more of the Layers in the request. Anfrage enthält ein SRS für einen oder mehrere Layer, die der Server nicht anbietet. - + GetMap request is for a Layer not offered by the server, or GetFeatureInfo request is for a Layer not shown on the map. GetMap-Anfrage für einen Layer, den der Server nicht anbietet oder GetFeature-Anfrage für einen Layer, der nicht auf der Karte angezeigt wird. - + Request is for a Layer in a Style not offered by the server. Anfrage für einen Layer in einem Stil, den der Server nicht anbietet. - + GetFeatureInfo request is applied to a Layer which is not declared queryable. GetFeatureInfo-Anfrage wird auf einen Layer bezogen, der nicht als abfragbar deklariert ist. - + GetFeatureInfo request contains invalid X or Y value. GetFeatureInfo-Anfrage enthält einen ungültigen X- oder Y-Wert. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. Wert des (optionalen) Aktualisierungssequenenzzählers der GetCapabilities-Anfrage entspricht dem aktuellen Wert des Aktualisierungssequenzzähler in den Dienstmetadaten. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. Wert des (optionalen) Aktualisierungssequenenzzählers der GetCapabilities-Anfrage ist größer als der aktuelle Wert des Aktualisierungssequenzzähler in den Dienstmetadaten. - + Request does not include a sample dimension value, and the server did not declare a default value for that dimension. Anfrage enthält keinen beispielhaften Dimensionswert, und der Server selbst definiert auch keinen. - + Request contains an invalid sample dimension value. Anfrage enthält einen ungültigen beispielhaften Dimensionswert. - + Request is for an optional operation that is not supported by the server. Anfrage ist für eine optionale Operation, die der Server nicht unterstützt. - + The WMS vendor also reported: Der WMS-Betreiber meldete folgendes: - - - - + + + + Property Eigenschaft - - - - + + + + Value Wert - + (and %n more) crs @@ -40912,286 +42160,316 @@ URL %1 versucht - - + + Selected Layers Gewählte Layer - - + + Other Layers Andere Layer - + Tile Layer Properties Kachellayer-Eigenschaften - + WMS Version WMS-Version - - - + + + Title Titel - - - + + + Abstract Zusammenfassung - + Keywords Schlüsselworte - + Online Resource Online-Quelle - + Contact Person Kontaktperson - + Fees Gebühren - + Access Constraints Zugriffsbeschränkungen - + Image Formats Bildformate - + Identify Formats Abfrageformate - + Layer Count Layeranzahl - + Selected Ausgewählt - - - - + + + + Yes Ja - - - - + + + + No Nein - + Visibility Sichtbarkeit - + Number of layers and styles don't match Anzahl von Layern und Stilen stimmt nicht überein - + Getting tiles. Lade Kacheln. - + Tile request error (Title:%1; Error:%2; URL: %3) Kachelabfrage-Fehler (Titel: %1; Fehler: %2; URL: %3) - + Tile request error (Status:%1; Content-Type:%2; Length:%3; URL: %4) Kachelabfrage-Fehler (Status: %1; Content-Typ: %2; Länge: %3; URL: %4) - + Tile request failed [error:%1 url:%2] Kachelabfrage-Fehler [Fehler: %1; URL: %2] - - + + Not logging more than 100 request errors. Nicht mehr als 100 Abfragefehler werden protokolliert. - + Map request error (Status: %1; Reason phrase: %2; URL:%3) Kartenabfrage-Fehler (Status: %1; Grund:%2; URL: %3) - + Map request error (Title:%1; Error:%2; URL: %3) Kartenabfrage-Fehler (Titel: %1; Fehler:%2; URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) Kartenabfrage-Fehler (Status: %1; Antwort:%2; URL: %3) - + Map request failed [error:%1 url:%2] Kartenabfrage-Fehler [Fehler:%1; URL: %2] - + Visible Sichtbar - + Hidden Versteckt - + Can Identify Kann abgefragt werden - + Can be Transparent Kann transparent sein - + Cascade Count Kaskadiere Anzahl - + Fixed Width Feste Breite - + Fixed Height Feste Höhe - + WGS 84 Bounding Box WGS84-Ausdehnung - - + + Available in CRS Verfügbar in KBS - + Available in style Verfügbar im Stil - - + + Name Name - + Available Tilesets Verfügbare Kachelsätze - + Cache stats Cache-Statistik - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + WMS WMS - + + Cannot parse URI + Konnte URI nicht parsen + + + + Cannot calculate extent + Konnte Ausdehnung nicht berechnen + + + + Cannot set CRS + Konnte KBS nicht setzen + + + + Number of tile layers must be one + Anzahl der Kachellayer muss eins sein + + + + Tile layer not found + Kachellayer nicht gefunden + + + + Tile layer or tile matrix set not found + Kachellayer oder Kachelmatrixsatz nicht gefunden + + + Getting map via WMS. Lade Karte über WMS. - + image is NULL Bild ist NULL - + unexpected image size Unerwartete Bildgröße - + Tile request error Tile-Anfragefehler - + Status: %1 Reason phrase: %2 Status: %1 Grund: %2 - - + + Returned image is flawed [%1] Geladenes Bild ist defekt [%1] - + empty capabilities document Leeres Capabilities-Dokument - + Could not get WMS capabilities: %1 at line %2 column %3 This is probably due to an incorrect WMS Server URL. Response was: @@ -41204,7 +42482,7 @@ Antwort war: %4 - + Could not get WMS capabilities in the expected format (DTD): no %1 or %2 found. This might be due to an incorrect WMS Server URL. Tag:%3 @@ -41218,7 +42496,7 @@ Antwort war: %4 - + Could not get WMS Service Exception at %1: %2 at line %3 column %4 Response was: @@ -41231,99 +42509,104 @@ Antwort war: %5 - + Request contains a format not offered by the server. Anfrage enthält ein Format, dass der Server nicht anbietet. - + composed error message '%1'. Zusammengestellte Fehlermeldung '%1'. - + + Extent for layer %1 not found in capabilities + Ausmaße des Layers %1 nicht in den Eigenschaften gefunden + + + GetCapabilitiesUrl GetCapabilities-URL - + GetMapUrl GetMap-URL - - + + &nbsp;<font color="red">(advertised but ignored)</font> &nbsp;<font color="red">(gemeldet, aber ignoriert)</font> - + WMTS WMTS - + WMS-C WMS-C - + Available Styles Verfügbare Stile - + CRS KBS - + Bounding Box Ausdehnung - + Hits Treffer - + Misses Fehlgriffe - + Errors Fehler - + identify request redirected. Identify-Anfrage umgeleitet. - + Map getfeatureinfo error %1: %2 GetFeatureInfo-Fehler %1: %2 - + ERROR: GetFeatureInfo failed FEHLER: GetFeatureInfo gescheitert - + Map getfeatureinfo error: %1 [%2] GetFeatureInfo-Fehler %1 [%2] - + Can Zoom In Kann herangezoomt werden - - + + %n tile requests in background tile request count @@ -41332,8 +42615,8 @@ Antwort war: - - + + , %n cache hits tile cache hits @@ -41342,8 +42625,8 @@ Antwort war: - - + + , %n cache misses. tile cache missed @@ -41352,8 +42635,8 @@ Antwort war: - - + + , %n errors. errors @@ -41362,53 +42645,53 @@ Antwort war: - - + + Server Properties Server-Eigenschaften - + Tile Layer Count Kachellayeranzahl - + GetTileUrl GetTileUrl - + Tile templates Kachelvorlagen - + FeatureInfo templates FeatureInfo-Vorlagen - + Tileset Properties Tileset-Eigenschaften - + Cache Stats Cache-Statistik - + GetFeatureInfoUrl GetFeatureInfoUrl - + (No error code was reported) (Kein Fehlercode zurückgegeben) - + (Unknown error code) (Unbekannter Fehlercode) @@ -41762,15 +43045,15 @@ Antwort war: Analyse - &SEXTANTE Toolbox + &SEXTANTE toolbox &SEXTANTE-Werkzeugkasten - &SEXTANTE Modeler + &SEXTANTE modeler &SEXTANTE-Modellierung - &SEXTANTE History and log + &SEXTANTE history and log &SEXTANTE Protokoll @@ -41781,14 +43064,6 @@ Antwort war: &SEXTANTE results viewer &SEXTANTE-Ergebnisanzeige - - &SEXTANTE help - &SEXTANTE-Hilfe - - - &About SEXTANTE - &Über SEXTANTE - SaDbTableModel @@ -42256,18 +43531,57 @@ Beschreibung: %3 Unterdaten + + SettingsDialog + + + Font + Schriftart + + + + Size + Größe + + + + API file + API-Datei + + + + Browse + Durchsuchen + + + + Use preloaded API file + API-Dateien vorladen + + SextanteToolbox + SEXTANTE Toolbox &SEXTANTE-Werkzeugkasten + Click here to configure additional algorithm providers Hier klicken um die zusätzlichen Algorithmen- lieferanten zur konfigurieren + + + Enter algorithm name to filter list + Algorithmenname eingeben, um Liste zu filtern + + + Search... + Suchen... + Execute Ausführen @@ -42452,10 +43766,36 @@ lieferanten zur konfigurieren Please specify input field Bitte Eingabefeld angeben + + Please specify output shapefile + Bitte eine Shapeausgabedatei angeben + Cancel Abbruch + + Geometry + Geometrie + + + Created output shapefile: +%1 +%2 + +Would you like to add the new layer to the TOC? + Ausgabeshapedatei erzeugt: +%1 +%2 + +Soll sie dem Projekt als neuer Layer hinzugefügt werden? + + + Error loading output shapefile: +%1 + Fehler beim Laden der Ausgabeshapedatei: +%1 + Feature Objekt @@ -44027,7 +45367,7 @@ Base Path (i.e. keep only filename from attribute) Vector grid - Vektorraster + Vektorgitter Select by location @@ -44069,6 +45409,10 @@ Base Path (i.e. keep only filename from attribute) Difference Differenz + + Eliminate sliver polygons + Splitterpolygone entfernen + G&eometry Tools G&eometrie-Werkzeuge diff --git a/i18n/qgis_eu_ES.ts b/i18n/qgis_eu_ES.ts new file mode 100644 index 000000000000..0040195c3700 --- /dev/null +++ b/i18n/qgis_eu_ES.ts @@ -0,0 +1,47405 @@ + + + + + CharacterWidget + + + <p>Character: <span style="font-size: 24pt; font-family: %1">%2</span><p>Value: 0x%3 + + + + + ConfigDialog + + Search... + + + + Wrong value + + + + Wrong parameter value: +%1 + + + + + CoordinateCapture + + + + Coordinate Capture + + + + + + Click on the map to view coordinates and capture to clipboard. + + + + + &Coordinate Capture + + + + + Click to select the CRS to use for coordinate display + + + + + Coordinate in your selected CRS (lat,lon or east,north) + + + + + Coordinate in map canvas coordinate reference system (lat,lon or east,north) + + + + + Copy to clipboard + + + + + Click to enable mouse tracking. Click the canvas to stop + + + + + Start capture + + + + + Click to enable coordinate capture + + + + + Dialog + + + Eliminate sliver polygons + + + + + area + + + + + Selected features: + + + + + + + + + Input vector layer + + + + + common boundary + + + + + Merge selection with the neighbouring polygon with the largest + + + + + + Save to new file + + + + + + + + + + + + + + + + + + + + + + Browse + + + + + + Add result to canvas + + + + + Extract Nodes + + + + + Input line or polygon vector layer + + + + + + + Unique ID field + + + + + Save to new shapefile + + + + + + Output point shapefile + + + + + Tolerance + + + + + Calculate using + + + + + Calculate extent for each feature separately + + + + + + + + + Use only selected features + + + + + Geoprocessing + + + + + Intersect layer + + + + + Buffer distance + + + + + Buffer distance field + + + + + Dissolve field + + + + + Dissolve buffer results + + + + + + + + Output shapefile + + + + + Segments to approximate + + + + + Locate Line Intersections + + + + + Input line layer + + + + + + Input unique ID field + + + + + Intersect line layer + + + + + Intersect unique ID field + + + + + + + + + + + Output Shapefile + + + + + Generate Centroids + + + + + Weight field + + + + + Number of standard deviations + + + + + Std. Dev. + + + + + Merge shapefiles + + + + + Select by layers in the folder + + + + + Shapefile type + + + + + Polygon + + + + + Line + + + + + Point + + + + + Input directory + + + + + Add result to map canvas + + + + + Create Distance Matrix + + + + + Input point layer + + + + + Target point layer + + + + + Target unique ID field + + + + + Output matrix type + + + + + Linear (N*k x 3) distance matrix + + + + + Standard (N x T) distance matrix + + + + + Summary distance matrix (mean, std. dev., min, max) + + + + + Use only the nearest (k) target points + + + + + Output distance matrix + + + + + Count Points In Polygons + + + + + + Input polygon vector layer + + + + + Input point vector layer + + + + + Output count field name + + + + + PNTCNT + + + + + Generate Random Points + + + + + + Input Boundary Layer + + + + + Sample Size + + + + + Unstratified Sampling Design (Entire layer) + + + + + + + Use this number of points + + + + + Stratified Sampling Design (Individual polygons) + + + + + Use this density of points + + + + + Use value from input field + + + + + Random Selection Tool + + + + + + + Input Vector Layer + + + + + + Randomly Select + + + + + + Number of Features + + + + + + Percentage of Features + + + + + + % + + + + + Projection Management Tool + + + + + Input spatial reference system + + + + + Output spatial reference system + + + + + Use predefined spatial reference system + + + + + Choose + + + + + Import spatial reference system from existing layer + + + + + Import spatial reference system + + + + + Generate Regular Points + + + + + Area + + + + + Input Coordinates + + + + + + X Min + + + + + + Y Min + + + + + + X Max + + + + + + Y Max + + + + + Grid Spacing + + + + + Use this point spacing + + + + + Apply random offset to point spacing + + + + + Initial inset from corner (LH side) + + + + + Simplify geometries + + + + + Input line or polygon layer + + + + + Simplify tolerance + + + + + Build spatial index + + + + + Select files from disk + + + + + Select files... + + + + + Select all + + + + + Select none + + + + + Clear list + + + + + Spatial Join + + + + + Target vector layer + + + + + Join vector layer + + + + + Attribute Summary + + + + + Mean + + + + + Take summary of intersecting features + + + + + Min + + + + + Sum + + + + + Median + + + + + Max + + + + + Take attributes of first located feature + + + + + Output table + + + + + Only keep matching records + + + + + Keep all records (including non-matching target records) + + + + + Random Selection From Within Subsets + + + + + Input subset field (unique ID field) + + + + + Sum Line Length In Polygons + + + + + Output summed length field name + + + + + LENGTH + + + + + Input line vector layer + + + + + Generate Vector Grid + + + + + Grid extent + + + + + Update extents from layer + + + + + Update extents from canvas + + + + + Align extents and resolution to selected raster layer + + + + + Parameters + + + + + X + + + + + Lock 1:1 ratio + + + + + Y + + + + + Output grid as polygons + + + + + Output grid as lines + + + + + Vector Split + + + + + Output folder + + + + + List Unique Values + + + + + Target field + + + + + Unique values list + + + + + Unique value count + + + + + Save errors location + + + + + Press Ctrl+C to copy results to the clipboard + + + + Regular points + + + + Please specify input layer + + + + Please properly specify extent coordinates + + + + Please specify output shapefile + + + + Created output point shapefile: +%1 + +Would you like to add the new layer to the TOC? + + + + creating new selection + + + + adding to current selection + + + + removing from current selection + + + + Select by location + + + + Select features in: + + + + that intersect features in: + + + + Modify current selection by: + + + + Use selected features only + + + + Please specify select layer + + + + Select directory with shapefiles to merge + + + + No shapefiles found + + + + There are no shapefiles in this directory. Please select another one. + + + + Input files + + + + No output file + + + + Please specify output file. + + + + Delete error + + + + Can't delete file %1 + + + + Cancel + + + + Merging + + + + Error loading output shapefile: +%1 + + + + Close + + + + Sum line lengths + + + + Sum Line Lengths In Polyons + + + + Please specify input polygon vector layer + + + + Please specify input line vector layer + + + + Please specify output length field + + + + Created output shapefile: +%1 + +Would you like to add the new layer to the TOC? + + + + CRS warning! + + + + Warning: Input layers have non-matching CRS. +This may cause unexpected results. + + + + length field + + + + Random selection within subsets + + + + Please specify input vector layer + + + + Please specify an input field + + + + Distance matrix + + + + Create Point Distance Matrix + + + + Please specify input point layer + + + + Please specify output file + + + + Please specify target point layer + + + + Please specify input unique ID field + + + + Please specify target unique ID field + + + + Created output matrix: + + + + + Define current projection + + + + Missing or invalid CRS + + + + No input shapefile specified + + + + Please specify spatial reference system + + + + Cannot define projection for PostGIS data...yet! + + + + Identical output spatial reference system chosen + +Are you sure you want to proceed? + + + + Output spatial reference system is not valid + + + + Defined Projection For: +%1.shp + + + + Please select the projection system that defines the current layer. + + + + Layer CRS information will be updated to the selected CRS. + + + + Export to new projection + + + + No Valid CRS selected + + + + Count Points in Polygon + + + + Count Points In Polygon + + + + Please specify input point vector layer + + + + Please specify output count field + + + + Random Points + + + + No input layer specified + + + + unstratified + + + + stratified + + + + density + + + + field + + + + Unknown layer type... + + + + Mean coordinates + + + + Standard distance + + + + (Optional) Weight field + + + + (Optional) Unique ID field + + + + Coordinate statistics + + + + No input vector layer specified + + + + Selected features: %1 + + + + Eliminate + + + + No selection in input layer + + + + Error creating output file + + + + Could not replace geometry of feature with id %1 + + + + Could not delete feature with id %1 + + + + Commit error + + + + Created output shapefile: +%1 + + + + Could not eliminate features with these ids: +%1 + + + + Line intersections + + + + Please specify input line layer + + + + Please specify line intersect layer + + + + Please specify intersect unique ID field + + + + Random selection + + + + Densify geometries + + + + Vertices to add + + + + Warning + + + + Currently QGIS doesn't allow simultaneous access from + different threads to the same datasource. Make sure your layer's + attribute tables are closed. Continue? + + + + Simplify results + + + + There were %1 vertices in original dataset which +were reduced to %2 vertices after simplification + + + + Error + + + + Finished + + + + Processing completed. + + + + Join attributes by location + + + + Please specify target vector layer + + + + Please specify join vector layer + + + + Please specify at least one summary statistic + + + + Summary field + + + + Incorrect field names + + + + No output will be created. +Following field names are longer than 10 characters: +%1 + + + + Error deleting shapefile + + + + Can't delete existing shapefile +%1 + + + + Vector grid + + + + Please select a raster layer + + + + Unable to compute extents aligned on selected raster layer + + + + Please specify valid extent coordinates + + + + Invalid extent coordinates entered + + + + Split vector layer + + + + Created output shapefiles in folder: +%1 + + + + + DlgAddGeometryColumn + + + Dialog + + + + + Name + + + + + geom + + + + + Type + + + + + POINT + + + + + LINESTRING + + + + + POLYGON + + + + + MULTIPOINT + + + + + MULTILINESTRING + + + + + MULTIPOLYGON + + + + + GEOMETRYCOLLECTION + + + + + Dimensions + + + + + SRID + + + + + -1 + + + + + DlgConfig + + + SEXTANTE options + + + + + Enter setting name to filter list + + + + + Setting + + + + + Value + + + + + DlgCreateConstraint + + + Add constraint + + + + + Column + + + + + Primary key + + + + + Unique + + + + + DlgCreateIndex + + + Create index + + + + + Column + + + + + Name + + + + + DlgCreateTable + + + Create Table + + + + + Schema + + + + + + Name + + + + + Add field + + + + + Delete field + + + + + Up + + + + + Down + + + + + Primary key + + + + + Create geometry column + + + + + POINT + + + + + LINESTRING + + + + + POLYGON + + + + + MULTIPOINT + + + + + MULTILINESTRING + + + + + MULTIPOLYGON + + + + + GEOMETRYCOLLECTION + + + + + geom + + + + + Dimensions + + + + + SRID + + + + + -1 + + + + + Create spatial index + + + + + DlgDbError + + + Database Error + + + + + An error occured: + + + + + An error occured when executing a query: + + + + + Query: + + + + + DlgExportVector + + + Export to vector file + + + + + Output file + + + + + ... + + + + + Action + + + + + Create new file + + + + + Drop existing one + + + + + Append data into file + + + + + Options + + + + + Source SRID + + + + + Target SRID + + + + + Encoding + + + + + DlgFieldProperties + + + Field properties + + + + + Name + + + + + Type + + + + + Can be NULL + + + + + Default value + + + + + Length + + + + + DlgHelpEdition + + + Help editor + + + + + about:blank + + + + + Select element to edit + + + + + Element description + + + + + DlgHistory + + + History and log + + + + + DlgImportVector + + + Import vector layer + + + + + Input + + + + + ... + + + + + Update options + + + + + Output table + + + + + Schema + + + + + Table + + + + + Action + + + + + Create new table + + + + + Drop existing one + + + + + Append data into table + + + + + Options + + + + + Primary key + + + + + Geometry column + + + + + Source SRID + + + + + Target SRID + + + + + Encoding + + + + + Create single-part geometries instead of multi-part + + + + + Create spatial index + + + + + DlgModeler + + + SEXTANTE modeler + + + + + Inputs + + + + + Algorithms + + + + + Enter algorithm name to filter list + + + + + Enter model name here + + + + + Enter group name here + + + + + DlgResults + + + Results + + + + + about:blank + + + + + DlgSqlWindow + + + SQL window + + + + + SQL query: + + + + + &Execute (F5) + + + + + F5 + + + + + &Clear + + + + + Result: + + + + + Load as new layer + + + + + Column with unique +integer values + + + + + Geometry column + + + + + Retrieve +columns + + + + + Layer name (prefix) + + + + + Type + + + + + Vector + + + + + Raster + + + + + Load now! + + + + + <html><head/><body><p>Avoid selecting feature by id. Sometimes - especially when running expensive queries/views - fetching the data sequentially instead of fetching features by id can be much quicker.</p></body></html> + + + + + Avoid selecting by feature id + + + + Sorry + + + + You must fill the required fields: +geometry column - column with unique integer values + + + + + DlgTableProperties + + + Table properties + + + + + Columns + + + + + Table columns: + + + + + Add column + + + + + Add geometry column + + + + + Edit column + + + + + Delete column + + + + + Constraints + + + + + Primary, foreign keys, unique and check constraints: + + + + + Add primary key / unique + + + + + Delete constraint + + + + + Indexes + + + + + Indexes defined for this table: + + + + + Add index + + + + + Add spatial index + + + + + Delete index + + + + + DlgVersioning + + + Add versioning support to a table + + + + + Table is expected to be empty, with a primary key. + + + + + Schema + + + + + Table + + + + + create a view with current content (<TABLE>_current) + + + + + New columns + + + + + Prim. key + + + + + id_hist + + + + + Start time + + + + + time_start + + + + + End time + + + + + time_end + + + + + SQL to be executed: + + + + + GdalTools + + The process failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program. + + + + The process crashed some time after starting successfully. + + + + An unknown error occurred. + + + + &Input directory + + + + &Output directory + + + + The selected file is not a supported OGR format + + + + Plugin error + + + + Unable to load %1 plugin. +The required "%2" module is missing. +Install it and try again. + + + + Quantum GIS version detected: + + + + This version of Gdal Tools requires at least QGIS version 1.0.0 +Plugin will not be enabled. + + + + Projections + + + + Warp (Reproject) + + + + Warp an image into a new coordinate system + + + + Assign projection + + + + Add projection info to the raster + + + + Extract projection + + + + Extract projection information from raster(s) + + + + Conversion + + + + Rasterize (Vector to raster) + + + + Burns vector geometries into a raster + + + + Polygonize (Raster to vector) + + + + Produces a polygon feature layer from a raster + + + + Translate (Convert format) + + + + Converts raster data between different formats + + + + RGB to PCT + + + + Convert a 24bit RGB image to 8bit paletted + + + + PCT to RGB + + + + Convert an 8bit paletted image to 24bit RGB + + + + Extraction + + + + Contour + + + + Builds vector contour lines from a DEM + + + + Clipper + + + + Analysis + + + + Sieve + + + + Removes small raster polygons + + + + Near black + + + + Convert nearly black/white borders to exact value + + + + Fill nodata + + + + Fill raster regions by interpolation from edges + + + + Proximity (Raster distance) + + + + Produces a raster proximity map + + + + Grid (Interpolation) + + + + Create raster from the scattered data + + + + DEM (Terrain models) + + + + Tool to analyze and visualize DEMs + + + + Miscellaneous + + + + Build Virtual Raster (Catalog) + + + + Builds a VRT from a list of datasets + + + + Merge + + + + Build a quick mosaic from a set of images + + + + Information + + + + Lists information about raster dataset + + + + Build overviews (Pyramids) + + + + Builds or rebuilds overview images + + + + Tile index + + + + Build a shapefile as a raster tileindex + + + + GdalTools settings + + + + Various settings for Gdal Tools + + + + + GdalToolsAboutDialog + + + About Gdal Tools + + + + + GDAL Tools + + + + + Version x.x-xxxxxx + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></body></html> + + + + + Web + + + + + Close + + + + + GdalToolsBaseBatchWidget + + Finished + + + + Operation completed. + + + + Warning + + + + The following files were not created: +%1 + + + + + GdalToolsBaseDialog + + Warning + + + + The command is still running. +Do you want terminate it anyway? + + + + Invalid parameters. + + + + + GdalToolsBasePluginWidget + + Warning + + + + No output file created. + + + + Finished + + + + Processing completed. + + + + %1 not created. + + + + + GdalToolsDialog + + + Dialog + + + + + &Load into canvas when finished + + + + + + Edit + + + + + + Reset + + + + + Extract projection + + + + + Batch mode (for processing whole directory) + + + + + &Input file + + + + + Recurse subdirectories + + + + + Create also prj file + + + + Select the input file for Rasterize + + + + Select the raster file to save the results to + + + + Output size required + + + + The output file doesn't exist. You must set up the output size to create it. + + + + Select the input file for Polygonize + + + + Select where to save the Polygonize output + + + + Select the input file for Contour + + + + Select where to save the Contour output + + + + Select the input file for Translate + + + + Select the input directory with files to Translate + + + + Select the output directory to save the results to + + + + Translate - srcwin + + + + Image coordinates (pixels) must be integer numbers. + + + + Translate - prjwin + + + + Image coordinates (geographic) must be numbers. + + + + Select the input file for convert + + + + Select the input directory with files for convert + + + + Select the files to Merge + + + + Error retrieving the extent + + + + GDAL was unable to retrieve the extent from any file. +The "Use intersected extent" option will be unchecked. + + + + Empty extent + + + + The computed extent is empty. +Disable the "Use intersected extent" option to have a nonempty output. + + + + Select where to save the Merge output + + + + Select the input directory with files to Merge + + + + Select the input file for Sieve + + + + Select the file to analyse + + + + Select the input directory with files to Assign projection + + + + Convert paletted image to RGB + + + + Warning + + + + Warning: CRS information for all raster in subfolders will be rewritten. Are you sure? + + + + Finished + + + + Processing completed. + + + + %1 not created. + + + + Assign projection + + + + This raster already found in map canvas + + + + Select the input file for Grid + + + + Select the input file for Near Black + + + + Select the files for VRT + + + + Select where to save the VRT + + + + VRT (*.vrt) + + + + Select the input directory with files for VRT + + + + Select the input directory with raster files + + + + Select where to save the TileIndex output + + + + Copy + + + + Copy all + + + + Select the input file for Warp + + + + Select the mask file + + + + Select the input directory with files to Warp + + + + Select the files to analyse + + + + Select the input directory with files + + + + Select the file for DEM + + + + Select the color configuration file + + + + Select the input file for Proximity + + + + Select the input file + + + + + GdalToolsExtentSelector + + + Select the extent by drag on canvas + + + + + or change the extent coordinates + + + + + + x + + + + + + y + + + + + 2 + + + + + 1 + + + + + Re-Enable + + + + + GdalToolsInOutSelector + + + Select... + + + + + GdalToolsOptionsTable + + + Name + + + + + Value + + + + + Add + + + + + Remove + + + + + GdalToolsSettingsDialog + + + Gdal Tools settings + + + + + Path to the GDAL executables + + + + + + + + + Browse + + + + + Path to the GDAL python modules + + + + + GDAL help path + + + + + GDAL data path + + + + + GDAL driver path + + + + A list of colon-separated (Linux and MacOS) or +semicolon-separated (Windows) paths to both binaries +and python executables. + +MacOS users usually need to set it to something like +/Library/Frameworks/GDAL.framework/Versions/1.8/Programs + + + + A list of colon-separated (Linux and MacOS) or +semicolon-separated (Windows) paths to python modules. + + + + Useful to open local GDAL documentation instead of online help +when pressing on the tool dialog's Help button. + + + + Select directory with GDAL executables + + + + Select directory with GDAL python modules + + + + Select directory with the GDAL documentation + + + + + GdalToolsWidget + + + Build Virtual Raster (Catalog) + + + + + Use visible raster layers for input + + + + + + Choose input directory instead of files + + + + + + &Input files + + + + + + + + Recurse subdirectories + + + + + + + + + + + + + + + + &Output file + + + + + &Resolution + + + + + Highest + + + + + Average + + + + + Lowest + + + + + &Source No Data + + + + + Se&parate + + + + + Allow projection difference + + + + + Clipper + + + + + + &No data value + + + + + + + &Input file (raster) + + + + + Clipping mode + + + + + + Extent + + + + + + + Mask layer + + + + + Create an output alpha band + + + + + Contour + + + + + &Output file for contour lines (vector) + + + + + I&nterval between contour lines + + + + + &Attribute name + + + + + If not provided, no elevation attribute is attached. + + + + + ELEV + + + + + Convert RGB image to paletted + + + + + + + + + + Batch mode (for processing whole directory) + + + + + + + + + + + + + &Input file + + + + + Number of colors + + + + + Band to convert + + + + + DEM (Terrain models) + + + + + &Input file (DEM raster) + + + + + &Band + + + + + Compute &edges + + + + + &Mode + + + + + Hillshade + + + + + Slope + + + + + Aspect + + + + + Color relief + + + + + TRI (Terrain Ruggedness Index) + + + + + TPI (Topographic Position Index) + + + + + Roughness + + + + + Use Zevenbergen&&Thorne formula (instead of the Horn's one) + + + + + Z factor (vertical exaggeration) + + + + + + Scale (ratio of vert. units to horiz.) + + + + + Azimuth of the light + + + + + Altitude of the light + + + + + Slope expressed as percent (instead of as degrees) + + + + + Return trigonometric angle (instead of azimuth) + + + + + Return 0 for flat (instead of -9999) + + + + + Color configuration file + + + + + Matching mode + + + + + Exact color (otherwise "0,0,0,0" RGBA) + + + + + Nearest color + + + + + Add alpha channel + + + + + + + &Creation Options + + + + + Fill Nodata + + + + + + &Input Layer + + + + + + Output format + + + + + Search distance + + + + + Smooth iterations + + + + + Band to operate on + + + + + Validity mask + + + + + Do not use the default validity mask + + + + + Grid (Interpolation) + + + + + &Z Field + + + + + &Algorithm + + + + + Inverse distance to a power + + + + + Moving average + + + + + Nearest neighbor + + + + + Data metrics + + + + + Power + + + + + Smoothing + + + + + + + + Radius1 + + + + + + + + Radius2 + + + + + Max points + + + + + + + Min points + + + + + + + + Angle + + + + + + + + + No data + + + + + Metrics + + + + + Minimum + + + + + Maximum + + + + + Range + + + + + + Resize + + + + + + + Width + + + + + + + Height + + + + + Info + + + + + Raster info + + + + + Suppress GCP printing + + + + + Suppress metadata printing + + + + + Merge + + + + + Layer stack + + + + + Use intersected extent + + + + + Grab pseudocolor table from the first image + + + + + Near Black + + + + + How &far from black (or white) + + + + + Search for nearly &white (255) pixels instead of black ones + + + + + Build overviews (Pyramids) + + + + + Resampling method + + + + + nearest + + + + + average + + + + + gauss + + + + + cubic + + + + + average_mp + + + + + average_magphase + + + + + mode + + + + + Levels (space delimited) + + + + + Remove all overviews. + + + + + Clean + + + + + In order to generate external overview (for GeoTIFF especially). + + + + + Open in read-only mode + + + + + Create external overviews in TIFF format, compressed using JPEG. + + + + + Overviews in TIFF format with JPEG compression + + + + + + For JPEG compressed external overviews, +the JPEG quality can be set. + + + + + JPEG Quality (1-100) + + + + + Alternate overview format using Erdas Imagine format, +placing the overviews in an associated .aux file +suitable for direct use with Imagine,ArcGIS, GDAL. + + + + + Use Imagine format (.aux file) + + + + + Polygonize (Raster to vector) + + + + + &Output file for polygons (shapefile) + + + + + &Field name + + + + + DN + + + + + Use mask + + + + + Assign projection + + + + + WARNING: current projection definition will be cleared + + + + + Desired SRS + + + + + Output will be: +- new GeoTiff if input file is not GeoTiff +- overwritten if input is GeoTiff + + + + + + + + Select... + + + + + Proximity (Raster distance) + + + + + &Values + + + + + &Dist units + + + + + GEO + + + + + PIXEL + + + + + &Max dist + + + + + &No data + + + + + &Fixed buf val + + + + + + 0 + + + + + Rasterize (Vector to raster) + + + + + &Input file (shapefile) + + + + + &Attribute field + + + + + &Output file for rasterized vectors (raster) + + + + + New size (required if output file doens't exist) + + + + + Sieve + + + + + &Threshold + + + + + &Pixel connections + + + + + 4 + + + + + 8 + + + + + Raster tile index + + + + + Input directory + + + + + Output shapefile + + + + + Tile index field + + + + + location + + + + + Write absolute path + + + + + Skip files with different projection ref + + + + + Translate (Convert format) + + + + + + &Target SRS + + + + + + Percentage to resize image. This will change pixel size/image resolution accordingly: 25% will create an image with pixels 4x larger. + + + + + Outsize + + + + + % + + + + + + Assign a specified nodata value to output bands. + + + + + + To expose a dataset with 1 band with a color table as a dataset with 3 (RGB) or 4 (RGBA) bands. +Useful for output drivers such as JPEG, JPEG2000, MrSID, ECW that don't support color indexed datasets. +The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a color table that only contains gray levels to a gray indexed dataset. + + + + + Expand + + + + + Gray + + + + + RGB + + + + + RGBA + + + + + + Selects a subwindow from the source image for copying based on pixel/line location. (Enter Xoff Yoff Xsize Ysize) + + + + + Srcwin + + + + + + Selects a subwindow from the source image for copying (like -srcwin) but with the corners given in georeferenced coordinates. (Enter ulx uly lrx lry) + + + + + Prjwin + + + + + Copy all subdatasets of this file to individual output files. Use with formats like HDF or OGDI that have subdatasets. + + + + + Sds + + + + + Warp (Reproject) + + + + + &Source SRS + + + + + &Resampling method + + + + + Near + + + + + Bilinear + + + + + Cubic + + + + + Cubic spline + + + + + Lanczos + + + + + No data values + + + + + &Memory used for caching + + + + + MB + + + + + Use m&ultithreaded warping implementation + + + + &Output directory for contour lines (shapefile) + + + + + GeometryDialog + + Merge all + + + + Geometry + + + + Please specify input vector layer + + + + Please specify output shapefile + + + + Please specify valid tolerance value + + + + Please specify valid UID field + + + + Singleparts to multipart + + + + Output shapefile + + + + Multipart to singleparts + + + + Extract nodes + + + + Polygons to lines + + + + Input polygon vector layer + + + + Export/Add geometry columns + + + + Input vector layer + + + + Layer CRS + + + + Project CRS + + + + Ellipsoid + + + + Polygon centroids + + + + Output point shapefile + + + + Delaunay triangulation + + + + Input point vector layer + + + + Voronoi polygon + + + + Buffer region + + + + Lines to polygons + + + + Input line vector layer + + + + Polygon from layer extent + + + + Input layer + + + + Output polygon shapefile + + + + Unable to delete existing shapefile. + + + + Currently QGIS doesn't allow simultaneous access from + different threads to the same datasource. Make sure your layer's + attribute tables are closed. Continue? + + + + Cancel + + + + Error processing specified tolerance! +Please choose larger tolerance... + + + + Unable to delete incomplete shapefile. + + + + At least two features must have same attribute value! +Please choose another field... + + + + One or more features in the output layer may have invalid geometry, please check using the check validity tool + + + + + Created output shapefile: +%1 +%2 + +Would you like to add the new layer to the TOC? + + + + Error loading output shapefile: +%1 + + + + Layer '%1' updated + + + + Error writing output shapefile. + + + + + GeoprocessingDialog + + Dissolve all + + + + Geoprocessing + + + + Please specify an input layer + + + + Please specify a difference/intersect/union layer + + + + Please specify valid buffer value + + + + Please specify dissolve field + + + + Please specify output shapefile + + + + No features selected, please uncheck 'Use selected' or make a selection + + + + Buffer(s) + + + + Create single minimum convex hull + + + + Create convex hulls based on input field + + + + Convex hull(s) + + + + Dissolve + + + + Difference layer + + + + Difference + + + + Intersect layer + + + + Intersect + + + + Symetrical difference + + + + Clip layer + + + + Clip + + + + Union layer + + + + Union + + + + Unable to delete existing shapefile. + + + + Cancel + + + + Close + + + + No output created. File creation error: +%1 + + + + +Warnings: + + + + +Some output geometries may be missing or invalid. + +Would you like to add the new layer anyway? + + + + + +Would you like to add the new layer to the TOC? + + + + +Input CRS error: Different input coordinate reference systems detected, results may not be as expected. + + + + +Input CRS error: One or more input layers missing coordinate reference information, results may not be as expected. + + + + +Feature geometry error: One or more output features ignored due to invalid geometry. + + + + +GEOS geoprocessing error: One or more input features have invalid geometry. + + + + Created output shapefile: +%1 +%2%3 + + + + Error loading output shapefile: +%1 + + + + + GlobePlugin + + + Launch Globe + + + + + Globe Settings + + + + + Unload Globe + + + + + Overlay data on a 3D globe + + + + + Settings for 3D globe + + + + + Unload globe + + + + + + + &Globe + + + + + Heatmap + + + Heatmap + + + + + Creates a heatmap raster for the input point vector. + + + + + + &Heatmap + + + + + GDAL driver error + + + + + Cannot open the driver for the specified format + + + + + Raster update error + + + + + Could not open the created raster for updating. The heatmap was not generated. + + + + + Point layer error + + + + + Could not identify the vector data provider. + + + + + Heatmap generation aborted + + + + + QGIS will now load the partially-computed raster. + + + + + HeatmapGui + + + Save Heatmap as: + + + + + No valid layers found! + + + + + Advanced options cannot be enabled. + + + + + Invalid output filename + + + + + Please enter a valid output file path and name. + + + + + Layer not found + + + + + Layer %1 not found. + + + + + HeatmapGuiBase + + + Heatmap Plugin + + + + + Input Point Vector + + + + + Output Raster + + + + + ... + + + + + Output Format + + + + + Radius + + + + + 10 + + + + + + meters + + + + + + map units + + + + + Decay Ratio + + + + + 0.1 + + + + + Advanced + + + + + Row + + + + + Cell Size X + + + + + Column + + + + + Cell Size Y + + + + + Use Radius from field + + + + + Use Weight from field + + + + + Help + + + Dialog + + + + + about:blank + + + + + HelpEditionDialog + + Outputs + + + + + HistoryDialog + + Clear + + + + Clear history and log + + + + + LayerPropertiesWidget + + + Form + + + + + Symbol layer type + + + + + This layer doesn't have any editable properties + + + + + MainWindow + + + &Edit + + + + + &File + + + + + &Open Recent Projects + + + + + Print Composers + + + + + New Project From Template + + + + + &View + + + + + Select + + + + + Measure + + + + + &Decorations + + + + + &Layer + + + + + New + + + + + &Plugins + + + + + &Help + + + + + &Settings + + + + + &Raster + + + + + File + + + + + Manage Layers + + + + + Digitizing + + + + + Advanced Digitizing + + + + + Map Navigation + + + + + Attributes + + + + + Plugins + + + + + Help + + + + + Raster + + + + + Label + + + + + Vector + + + + + Database + + + + + Web + + + + + &New Project + + + + + Ctrl+N + + + + + &Open Project... + + + + + Ctrl+O + + + + + &Save Project + + + + + Ctrl+S + + + + + Save Project &As... + + + + + Ctrl+Shift+S + + + + + Save as Image... + + + + + &New Print Composer + + + + + Ctrl+P + + + + + Composer Manager... + + + + + Exit + + + + + Ctrl+Q + + + + + &Undo + + + + + Ctrl+Z + + + + + &Redo + + + + + Ctrl+Shift+Z + + + + + Cut Features + + + + + Ctrl+X + + + + + Copy Features + + + + + Ctrl+C + + + + + Paste Features + + + + + Ctrl+V + + + + + Add Feature + + + + + Ctrl+. + + + + + Move Feature(s) + + + + + Reshape Features + + + + + Split Features + + + + + Delete Selected + + + + + Add Ring + + + + + Add Part + + + + + Simplify Feature + + + + + Delete Ring + + + + + Delete Part + + + + + Merge Selected Features + + + + + Merge Attributes of Selected Features + + + + + Node Tool + + + + + Rotate Point Symbols + + + + + Snapping Options... + + + + + Pan Map + + + + + Zoom In + + + + + Ctrl++ + + + + + Zoom Out + + + + + Ctrl+- + + + + + Select Single Feature + + + + + Select Features by Rectangle + + + + + Select Features by Polygon + + + + + Select Features by Freehand + + + + + Select Features by Radius + + + + + Deselect Features from All Layers + + + + + Identify Features + + + + + Ctrl+Shift+I + + + + + Measure Line + + + + + + Ctrl+Shift+M + + + + + Measure Area + + + + + Ctrl+Shift+J + + + + + Measure Angle + + + + + Zoom Full + + + + + Ctrl+Shift+F + + + + + Zoom to Layer + + + + + Zoom to Selection + + + + + Ctrl+J + + + + + Zoom Last + + + + + Zoom Next + + + + + Zoom Actual Size + + + + + Zoom to Native Pixel Resolution + + + + + Map Tips + + + + + Show information about a feature when the mouse is hovered over it + + + + + New Bookmark... + + + + + Ctrl+B + + + + + Show Bookmarks + + + + + Ctrl+Shift+B + + + + + Refresh + + + + + Ctrl+R + + + + + Text Annotation + + + + + Form Annotation + + + + + Move Annotation + + + + + Labeling + + + + + Layer Labeling Options + + + + + New Shapefile Layer... + + + + + Ctrl+Shift+N + + + + + New SpatiaLite Layer ... + + + + + Ctrl+Shift+A + + + + + Raster calculator ... + + + + + Add Vector Layer... + + + + + Ctrl+Shift+V + + + + + Add Raster Layer... + + + + + Ctrl+Shift+R + + + + + Add PostGIS Layers... + + + + + Ctrl+Shift+D + + + + + Add SpatiaLite Layer... + + + + + Ctrl+Shift+L + + + + + Add MSSQL Spatial Layer... + + + + + Add WMS Layer... + + + + + Ctrl+Shift+W + + + + + Open Attribute Table + + + + + Toggle Editing + + + + + Toggles the editing state of the current layer + + + + + Save Edits + + + + + Save edits to current layer, but continue editing + + + + + Save As... + + + + + Save Selection as Vector File... + + + + + Remove Layer(s) + + + + + Ctrl+D + + + + + Set CRS of Layer(s) + + + + + Ctrl+Shift+C + + + + + Set Project CRS from Layer + + + + + Properties... + + + + + Query... + + + + + Add to Overview + + + + + Ctrl+Shift+O + + + + + Add All to Overview + + + + + Remove All from Overview + + + + + Show All Layers + + + + + Ctrl+Shift+U + + + + + Hide All Layers + + + + + Ctrl+Shift+H + + + + + Manage Plugins... + + + + + Toggle Full Screen Mode + + + + + Ctrl+F + + + + + Project Properties... + + + + + Ctrl+Shift+P + + + + + Options... + + + + + Custom CRS... + + + + + Configure shortcuts... + + + + + Local Histogram Stretch + + + + + Stretch histogram of active raster to view extents + + + + + Help Contents + + + + + F1 + + + + + API documentation + + + + + QGIS Home Page + + + + + Ctrl+H + + + + + Check QGIS Version + + + + + Check if your QGIS version is up to date (requires internet access) + + + + + About + + + + + QGIS Sponsors + + + + + + Move Label + + + + + Rotate Label + + + + + Rotate Label +Ctl (Cmd) increments by 15 deg. + + + + + Change Label + + + + + Style Manager... + + + + + Python Console + + + + + Full histogram stretch + + + + + Stretch Histogram to Full Dataset + + + + + Customization... + + + + + mActionCatchForCustomization + + + + + This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization + + + + + Ctrl+M + + + + + Embed Layers and Groups... + + + + + Embed layers and groups from other project files + + + + + &Copyright Label + + + + + Creates a copyright label that is displayed on the map canvas. + + + + + &North Arrow + + + + + "Creates a north arrow that is displayed on the map canvas" + + + + + &Scale Bar + + + + + + Creates a scale bar that is displayed on the map canvas + + + + + Add WFS Layer... + + + + + Add WFS Layer + + + + + Feature Action + + + + + Run Feature Action + + + + + + Pan Map to Selection + + + + + + Touch zoom and pan + + + + + Offset Curve + + + + + Copy style + + + + + Paste style + + + + + Add WCS Layer... + + + + + &Grid + + + + + Grid + + + + + Pin/Unpin Labels + + + + + Pin/Unpin Labels +Click or marquee on label to pin +Shift unpins, Ctl (Cmd) toggles state +Acts on all editable layers + + + + + + Highlight Pinned Labels + + + + + + New Blank Project + + + + + Local Cumulative Cut Stretch + + + + + Local cumulative cut stretch using current extent, default limits and estimated values. + + + + + Full Dataset Cumulative Cut Stretch + + + + + Cumulative cut stretch using full dataset extent, default limits and estimated values. + + + + + Show/Hide Labels + + + + + Show/Hide Labels +Click or marquee on feature to show label +Shift+click or marquee on label to hide it +Acts on currently active editable layer + + + + + + Html Annotation + + + + + + Duplicate Layer(s) + + + + + SVG annotation + + + + + + Save Edits for All Layers + + + + + Save edits for all layers, but continue editing + + + + + ModelerDialog + + Edit model help + + + + Run + + + + Execute current model + + + + Open + + + + Open existing model + + + + Save + + + + Save current model + + + + Search... + + + + Warning + + + + Please enter group and model names before saving + + + + Save Model + + + + SEXTANTE models (*.model) + + + + Model saved + + + + Model was correctly saved. + + + + Open Model + + + + Could not open model + + + + The selected model could not be loaded. +Wrong line: %1 + + + + Parameters + + + + + OracleConnectGuiBase + + + Create Oracle Connection + + + + + Name + + + + + Name of the new connection + + + + + Database instance + + + + + Username + + + + + Password + + + + + Save Password + + + + + OsmAddRelationDlg + + + Create OSM relation + + + + + Relation type: + + + + + Show type description + + + + + + Shows brief description of selected relation type. + + + + + + + + + ... + + + + + Properties + + + + + Generate tags + + + + + + Fills tag table with tags that are typical for relation of specified type. + + + + + Remove all selected tags + + + + + + Removes all selected tags. + + + + + Members + + + + + Select member on map + + + + + + Starts process of selecting next relation member on map. + + + + + Remove all selected members + + + + + + Removes all selected members. + + + + + Create + + + + + Cancel + + + + Save + + + + Edit OSM relation + + + + for grouping boundaries and marking enclaves / exclaves + + + + to put holes into areas (might have to be renamed, see article) + + + + any kind of turn restriction + + + + like bus routes, cycle routes and numbered highways + + + + traffic enforcement devices; speed cameras, redlight cameras, weight checks, ... + + + + OSM Information + + + + + OsmDownloadDlg + + + Download OSM data + + + + + Extent + + + + + Latitude: + + + + + + From + + + + + + To + + + + + Longitude: + + + + + <nothing> + + + + + + ... + + + + + Download to: + + + + + Open data automatically after download + + + + + Replace current data (current layer will be removed) + + + + + Use custom renderer + + + + + Download + + + + + Cancel + + + + OSM Download + + + + Unable to save the file %1: %2. + + + + Waiting for OpenStreetMap server ... + + + + Download process failed. OpenStreetMap server response: %1 - %2 + + + + Check your internet connection + + + + OSM Download Error + + + + Download failed: %1. + + + + Choose file to save + + + + OSM Files (*.osm) + + + + Getting data + + + + The OpenStreetMap server you are downloading OSM data from (~ api.openstreetmap.org) has fixed limitations of how much data you can get. As written at <http://wiki.openstreetmap.org/wiki/Getting_Data> neither latitude nor longitude extent of downloaded region can be larger than 0.25 degrees. Note that Quantum GIS allows you to specify any extent you want, but OpenStreetMap server will reject all request that won't satisfy downloading limitations. + + + + Both extents are too large! + + + + Latitude extent is too large! + + + + Longitude extent is too large! + + + + OK! Area is probably acceptable to server. + + + + + OsmFeatureDW + + + OSM Feature + + + + + + + + + + + + + + + + + + + ... + + + + + + + Identify feature + + + + + + + Move feature + + + + + Create point + + + + + Create line + + + + + Create polygon + + + + + Create relation + + + + + + + Undo + + + + + + + Redo + + + + + + + Show/Hide OSM Edit History + + + + + Feature: + + + + + TYPE, ID: + + + + + CREATED: + + + + + USER: + + + + + + + unknown + + + + + + + Remove this feature + + + + + Properties + + + + + + + Remove selected tags + + + + + Relations + + + + + + + Add relation + + + + + + + Edit relation + + + + + + + Remove relation + + + + + Relation tags: + + + + + 1 + + + + + Relation members: + + + + OSM Plugin + + + + The 'Create OSM Relation' dialog was closed automatically because current OSM database was changed. + + + + OSM Feature Dock Widget + + + + Choose OSM feature first. + + + + Choose relation for editing first. + + + + Snapping ON. Hold Ctrl to disable it. + + + + Hide OSM Edit History + + + + Show OSM Edit History + + + + + OsmImportDlg + + + Import data to OSM + + + + + In this dialog you can import a layer loaded in QGIS into active OSM data. + + + + + Layer + + + + + Import only current selection + + + + Layer doesn't exist + + + + The selected layer doesn't exist anymore! + + + + Importing features... + + + + Cancel + + + + Import + + + + Import has been completed. + + + + + OsmLoadDlg + + + Load OSM + + + + + OpenStreetMap file to load: + + + + + ... + + + + + Add columns for tags: + + + + + Use custom renderer + + + + + Replace current data (current layers will be removed) + + + + Choose an Open Street Map file + + + + OSM Files (*.osm) + + + + OSM Load + + + + Please enter path to OSM data file. + + + + Path to OSM file is invalid: %1. + + + + Error + + + + Layers of OSM file "%1" are loaded already. + + + + Failed to load polygon layer. + + + + Failed to load line layer. + + + + Failed to load point layer. + + + + Could not connect to setRenderer signal. + + + + Failed to load layers: %1 + + + + + OsmPlugin + + Load OSM from file + + + + Load OpenStreetMap from file + + + + Import data from a layer + + + + Import data from a layer to OpenStreetMap + + + + Save OSM to file + + + + Save OpenStreetMap to file + + + + Download OSM data + + + + Download OpenStreetMap data + + + + Upload OSM data + + + + Upload OpenStreetMap data + + + + Show/Hide OSM Feature Manager + + + + Show/Hide OpenStreetMap Feature Manager + + + + Sorry + + + + You don't have OSM provider installed! + + + + OSM Save to file + + + + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. +Please change this situation first, because OSM Plugin doesn't know what to save. + + + + OSM Upload + + + + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. +Please change this situation first, because OSM Plugin doesn't know what to upload. + + + + OSM Import + + + + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. +Please change this situation first, because OSM Plugin doesn't know what layer will be destination of the import. + + + + There are currently no available vector layers. + + + + + OsmSaveDlg + + + Save OSM + + + + + Where to save: + + + + + ... + + + + + Features to save: + + + + + Points + + + + + Lines + + + + + Polygons + + + + + Relations + + + + + Tags + + + + Choose an Open Street Map file + + + + OSM Files (*.osm) + + + + Save OSM to file + + + + Unable to save the file %1: %2. + + + + Initializing... + + + + Saving nodes... + + + + Saving lines... + + + + Saving polygons... + + + + Saving relations... + + + + + OsmUndoRedoDW + + + OSM Edit History + + + + + + + Clear all + + + + + + + ... + + + + + + + Undo + + + + + + + Redo + + + + + OsmUploadDlg + + + Upload OSM data + + + + + Ready for upload + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + Comment on your changes: + + + + + OSM account + + + + + Username: + + + + + Password: + + + + + Show password + + + + + Save password + + + + Upload + + + + OSM Upload + + + + Uploading data... + + + + Node addition failed. + + + + Node update failed. + + + + Node deletion failed. + + + + Way addition failed. + + + + Way update failed. + + + + Way deletion failed. + + + + Relation addition failed. + + + + Relation update failed. + + + + Relation deletion failed. + + + + Connection to OpenStreetMap server cannot be established. Please check your proxy settings, firewall settings and try again. + + + + Changeset closing failed. + + + + Upload process failed. OpenStreetMap server response: %1 - %2. + + + + Authentication failed. Please try again with correct login and password. + + + + Setting host failed. + + + + Setting user and password failed. + + + + Setting proxy failed. + + + + + PointsInPolygonThread + + point count field + + + + + Python + + An error has occured while executing Python code: + + + + Python version: + + + + QGIS version: + + + + Python path: + + + + Python error + + + + Couldn't load plugin '%1' from ['%2'] + + + + Couldn't load plugin %1 + + + + %1 due an error when calling its classFactory() method + + + + %1 due an error when calling its initGui() method + + + + Error while unloading plugin %1 + + + + + PythonConsole + + Python Console + + + + Clear console + + + + Settings + + + + Import Class + + + + Manage Script + + + + Import Sextante class + + + + Import QgisInterface class + + + + Import PyQt.QtCore class + + + + Import PyQt.QtGui class + + + + Open script file + + + + Save to script file + + + + Run command + + + + Help + + + + + QGis::UnitType + + + meters + + + + + feet + + + + + + + + degrees + + + + + <unknown> + + + + + QObject + + + Interpolating... + + + + + + Abort + + + + + Building triangulation... + + + + + Estimating normal derivatives... + + + + + QGIS starting in non-interactive mode not supported. +You are seeing this message most likely because you have no DISPLAY environment variable set. + + + + + + Deleted vertices + + + + + Moved vertices + + + + + CRS undefined - defaulting to project CRS + + + + + CRS undefined - defaulting to default CRS: %1 + + + + + Reading raster + + + + + No active vector layer + + + + + To select features, you must choose a vector layer by clicking on its name in the legend + + + + + + CRS Exception + + + + + + Selection extends beyond layer's coordinate system. + + + + + Python is not enabled in QGIS. + + + + + + + + + + + + + + + Plugins + + + + + Loaded %1 (package: %2) + + + + + Library name is %1 + + + + + + + Failed to load %1 (Reason: %2) + + + + + Attempting to resolve the classFactory function + + + + + + Loaded %1 (Path: %2) + + + + + Error Loading Plugin + + + + + There was an error loading a plugin.The following diagnostic information may help the QGIS developers resolve the issue: +%1. + + + + + Unable to find the class factory for %1. + + + + + Plugin %1 did not return a valid type and cannot be loaded + + + + + + Python error + + + + + Error when reading metadata of plugin %1 + + + + + Could not open CRS database %1 +Error(%2): %3 + + + + + + CRS + + + + + Generated CRS + A CRS automatically generated from layer info get this prefix for description + + + + + Saved user CRS [%1] + + + + + Imported from GDAL + + + + + Can't open database: %1 + + + + + + Caught a coordinate system exception while trying to transform a point. Unable to calculate line length. + + + + + Caught a coordinate system exception while trying to transform a point. Unable to calculate polygon area or perimeter. + + + + + Caught a coordinate system exception while trying to transform a point. Unable to calculate polygon area. + + + + + + m² + + + + + km² + + + + + ha + + + + + + m + + + + + km + + + + + mm + + + + + cm + + + + + sq ft + + + + + acres + + + + + sq mile + + + + + foot + + + + + feet + + + + + mile + + + + + sq.deg. + + + + + degree + + + + + degrees + + + + + unknown + + + + + day + Note: Word is part matched in code + + + + + days + Note: Word is part matched in code + + + + + week + Note: Word is part matched in code + + + + + weeks + Note: Word is part matched in code + + + + + month + Note: Word is part matched in code + + + + + months + Note: Word is part matched in code + + + + + year + Note: Word is part matched in code + + + + + years + Note: Word is part matched in code + + + + + second + Note: Word is part matched in code + + + + + seconds + Note: Word is part matched in code + + + + + minute + Note: Word is part matched in code + + + + + minutes + Note: Word is part matched in code + + + + + hour + Note: Word is part matched in code + + + + + hours + Note: Word is part matched in code + + + + + Cannot convert '%1' to double + + + + + Cannot convert '%1' to int + + + + + Cannot convert '%1' to DateTime + + + + + Cannot convert '%1' to Date + + + + + Cannot convert '%1' to Time + + + + + Cannot convert '%1' to Interval + + + + + Cannot convert '%1' to boolean + + + + + Invalid regular expression '%1': %2 + + + + + Index is out of range + + + + + + + + + + + + + + + + + Math + + + + + + + + + + + Conversions + + + + + Conditionals + + + + + + + + + + + + + Date and Time + + + + + + + + + + + + + + + + + + + String + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Geometry + + + + + + + + Record + + + + + Special + + + + + + No root node! Parsing failed? + + + + + (no root) + + + + + Unary minus only for numeric values. + + + + + Can't preform /, *, or % on DateTime and Interval + + + + + [unsupported type;%1; value:%2] + + + + + Column '%1' not found + + + + + + + + + + + + + + + + + + + + + + + + + + Exception: %1 + + + + + + + + + + + + + + + + + + + + + + + + + + + GEOS + + + + + GEOS prior to 3.2 doesn't support GEOSInterpolate + + + + + segment %1 of ring %2 of polygon %3 intersects segment %4 of ring %5 of polygon %6 at %7 + + + + + ring %1 with less than four points + + + + + ring %1 not closed + + + + + line %1 with less than two points + + + + + line %1 contains %n duplicate node(s) at %2 + number of duplicate nodes + + + + + + + + segments %1 and %2 of line %3 intersect at %4 + + + + + ring %1 of polygon %2 not in exterior ring + + + + + GEOS error:could not produce geometry for GEOS (check log window) + + + + + + GEOS error:%1 + + + + + + polygon %1 inside polygon %2 + + + + + Unknown geometry type + + + + + Unknown geometry type %1 + + + + + Geometry validation was aborted. + + + + + Geometry has %1 errors. + + + + + Geometry is valid. + + + + + invalid line + + + + + Label + + + + + Console + + + + + + infinite + + + + + + W + + + + + + E + + + + + + S + + + + + + N + + + + + No QGIS data provider plugins found in: +%1 + + + + + + No vector layers can be loaded. Check your QGIS installation + + + + + No Data Providers + + + + + No data provider plugins are available. No vector layers can be loaded + + + + + Unable to instantiate the data provider plugin %1 + + + + + Failed to load %1: %2 + + + + + OGR driver for '%1' not found (OGR error: %2) + + + + + trimming attribute name '%1' to ten significant characters produces duplicate column name. + + + + + creation of data source failed (OGR error:%1) + + + + + creation of layer failed (OGR error:%1) + + + + + + unsupported type for field %1 + + + + + creation of field %1 failed (OGR error: %2) + + + + + created field %1 not found (OGR error: %2) + + + + + Invalid variant type for field %1[%2]: received %3 with type %4 + + + + + + + + + + + + + + + + + OGR + + + + + + + Feature geometry not imported (OGR error: %1) + + + + + Feature creation error (OGR error: %1) + + + + + + Failed to transform a point while drawing a feature of type '%1'. Writing stopped. (Exception: %2) + + + + + + Feature write errors: + + + + + + Stopping after %1 errors + + + + + +Only %1 of %2 features written. + + + + + + Arc/Info ASCII Coverage + + + + + + Atlas BNA + + + + + + Comma Separated Value + + + + + ESRI Shapefile + + + + + + + FMEObjects Gateway + + + + + + GeoJSON + + + + + + GeoRSS + + + + + + Geography Markup Language [GML] + + + + + + Generic Mapping Tools [GMT] + + + + + + GPS eXchange Format [GPX] + + + + + + INTERLIS 1 + + + + + + INTERLIS 2 + + + + + + Keyhole Markup Language [KML] + + + + + Mapinfo TAB + + + + + Mapinfo MIF + + + + + + Microstation DGN + + + + + + S-57 Base file + + + + + + Spatial Data Transfer Standard [SDTS] + + + + + + SQLite + + + + + SpatiaLite + + + + + + AutoCAD DXF + + + + + + Geoconcept + + + + + + ESRI FileGDB + + + + + Unable to load %1 provider + + + + + Provider %1 has no createEmptyLayer method + + + + + Loading of layer failed + + + + + Creation error for features from #%1 to #%2. Provider errors was: +%3 + + + + + Vector import + + + + + Only %1 of %2 features written. + + + + + + + + Reading raster part %1 of %2 + + + + + Building pyramids failed - write access denied + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + + Building pyramids failed. + + + + + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. + + + + + + Building pyramid overviews is not supported on this type of raster. + + + + + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. + + + + + Multiband color + + + + + Paletted + + + + + Singleband gray + + + + + Singleband pseudocolor + + + + + Singleband color data + + + + + + All Ramps + + + + + Single Symbol + + + + + Categorized + + + + + Graduated + + + + + Rule-based + + + + + Point displacement + + + + + Simple line + + + + + Marker line + + + + + Line decoration + + + + + Simple marker + + + + + SVG marker + + + + + Font marker + + + + + Ellipse marker + + + + + Vector Field marker + + + + + Simple fill + + + + + SVG fill + + + + + Centroid fill + + + + + Line pattern fill + + + + + Point pattern fill + + + + + Where is '%1' (original location: %2)? + + + + + QGIS rocks! + + + + + <html>QGIS rocks!</html> + + + + + Raster Histogram + + + + + Pixel Value + + + + + Frequency + + + + + Internal Compass + + + + + Shows a QtSensors compass reading + + + + + Version 0.9 + + + + + Coordinate Capture + + + + + Capture mouse coordinates in different CRS + + + + + + + + + Vector + + + + + + + + + + + + + + + + + Version 0.1 + + + + + + Version 0.2 + + + + + Loads and displays delimited text files containing x,y coordinates + + + + + + + Layers + + + + + Add Delimited Text Layer + + + + + Diagram Overlay (Legacy) + + + + + A plugin for placing diagrams on vector layers + + + + + Version 0.0.1 (Legacy) + + + + + Dxf2Shp Converter + + + + + Converts from dxf to shp file format + + + + + eVis + + + + + An event visualization tool - view images associated with vector features + + + + + + + + Database + + + + + Version 1.1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + Warning + + + + + This tool only supports vector data + + + + + No active layers found + + + + + Georeferencer GDAL + + + + + Georeferencing rasters using GDAL + + + + + + + + + Raster + + + + + Version 3.1.9 + + + + + Fit to a linear transform requires at least 2 points. + + + + + Fit to a Helmert transform requires at least 2 points. + + + + + Fit to an affine transform requires at least 4 points. + + + + + Fitting a projective transform requires at least 4 corresponding points. + + + + + Globe + + + + + Overlay data on a 3D globe + + + + + GPS Tools + + + + + Tools for loading and importing GPS data + + + + + Location: %1 + + + + + + Location: %1<br>Mapset: %2 + + + + + <b>Raster</b> + + + + + Cannot open raster header + + + + + + Rows + + + + + + Columns + + + + + + N-S resolution + + + + + + E-W resolution + + + + + + + North + + + + + + + South + + + + + + + East + + + + + + + West + + + + + Format + + + + + Minimum value + + + + + Maximum value + + + + + Data source + + + + + Data description + + + + + Comments + + + + + Categories + + + + + + <b>Vector</b> + + + + + Points + + + + + Lines + + + + + Boundaries + + + + + Centroids + + + + + Faces + + + + + Kernels + + + + + Areas + + + + + Islands + + + + + + Top + + + + + + Bottom + + + + + yes + + + + + no + + + + + History<br> + + + + + <b>Layer</b> + + + + + Features + + + + + Driver + + + + + Table + + + + + Key column + + + + + <b>Region</b> + + + + + Cannot open region header + + + + + XY + + + + + UTM + + + + + SP + + + + + LL + + + + + Other + + + + + Projection Type + + + + + Zone + + + + + 3D Cols + + + + + 3D Rows + + + + + Depths + + + + + E-W 3D resolution + + + + + N-S 3D resolution + + + + + GRASS + + + + + GRASS layer + + + + + Heatmap + + + + + Creates a Heatmap raster for the input point vector + + + + + Interpolation plugin + + + + + A plugin for interpolation based on vertices of a vector layer + + + + + Version 0.001 + + + + + OfflineEditing + + + + + Allow offline editing and synchronizing with database + + + + + Oracle Spatial GeoRaster + + + + + Access Oracle Spatial GeoRaster + + + + + Raster Terrain Analysis plugin + + + + + A plugin for raster based terrain analysis + + + + + Road graph plugin + + + + + It solves the shortest path problem. + + + + + Processing 1/2 - %p% + + + + + Processing 2/2 - %p% + + + + + Intersects + + + + + Is disjoint + + + + + + + Touches + + + + + + Crosses + + + + + + Within + + + + + + Contains + + + + + Equals + + + + + Overlaps + + + + + Spatial Query Plugin + + + + + A plugin that makes spatial queries on vector layers + + + + + SPIT + + + + + Shapefile to PostgreSQL/PostGIS Import Tool + + + + + SQL Anywhere plugin + + + + + Store vector layers within a SQL Anywhere database + + + + + Zonal statistics plugin + + + + + A plugin to calculate count, sum, mean of rasters for each polygon of a vector layer + + + + + Cannot open GDAL MEM dataset %1: %2 + + + + + Cannot GDALCreateGenImgProjTransformer: + + + + + Cannot inittialize GDALWarpOperation : + + + + + Cannot ChunkAndWarpImage: %1 + + + + + [GDAL] All files (*) + + + + + + GDAL/OGR VSIFileHandler + + + + + This raster file has no bands and is invalid as a raster layer. + + + + + Cannot get GDAL raster band: %1 + + + + + Couldn't open the data source: %1 + + + + + Parse error at line %1 : %2 + + + + + GPS eXchange format provider + + + + + + GRASS plugin + + + + + QGIS couldn't find your GRASS installation. +Would you like to specify path (GISBASE) to your GRASS installation? + + + + + Choose GRASS installation path (GISBASE) + + + + + GRASS data won't be available if GISBASE is not specified. + + + + + GISBASE is not set. + + + + + %1 is not a GRASS mapset. + + + + + Cannot start %1/etc/lock + + + + + Mapset is already in use. + + + + + Temporary directory %1 exists but is not writable + + + + + Cannot create temporary directory %1 + + + + + Cannot create %1 + + + + + Cannot remove mapset lock: %1 + + + + + Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module). + + + + + Cannot open vector %1 in mapset %2 + + + + + Cannot read raster map region + + + + + Cannot read vector map region + + + + + Cannot read region + + + + + Cannot open GISRC file + + + + + Cannot start module + + + + + command: %1 %2 + + + + + Cannot run module + + + + + command: %1 %2<br>%3<br>%4 + + + + + Cannot get projection + + + + + + Cannot get raster extent + + + + + Cannot get map info + + + + + Cannot get colors + + + + + Cannot query raster + + + + + + + Cannot draw raster + + + + + Loading of the MSSQL provider failed + + + + + + Unsupported type for field %1 + + + + + + Creation of fields failed + + + + + OGR[%1] error %2: %3 + + + + + Unable to create the datasource. %1 exists and overwrite flag is false. + + + + + Unable to get driver %1 + + + + + Arc/Info Binary Coverage + + + + + DODS + + + + + + ESRI Personal GeoDatabase + + + + + ESRI ArcSDE + + + + + ESRI Shapefiles + + + + + Grass Vector + + + + + Informix DataBlade + + + + + Ingres + + + + + Mapinfo File + + + + + MySQL + + + + + MSSQL + + + + + Oracle Spatial + + + + + ODBC + + + + + OGDI Vectors + + + + + PostgreSQL + + + + + UK. NTF2 + + + + + U.S. Census TIGER/Line + + + + + VRT - Virtual Datasource + + + + + X-Plane/Flightgear + + + + + All files + + + + + Duplicate field (10 significant characters): %1 + + + + + Creating the data source %1 failed: %2 + + + + + Unknown vector type of %1 + + + + + Creation of OGR data source %1 failed: %2 + + + + + creation of field %1 failed + + + + + Couldn't create file %1.qpj + + + + + no result buffer + + + + + + + + Connection to database failed + + + + + Creation of data source %1 failed: +%2 + + + + + Loading of the layer %1 failed + + + + + + Unable to delete layer %1: +%2 + + + + + creation of data source %1 failed. %2 + + + + + loading of the layer %1 failed + + + + + creation of fields failed + + + + + Unable to initialize SpatialMetadata: + + + + + + Could not create a new database + + + + + + Unable to activate FOREIGN_KEY constraints [%1] + + + + + Unable to delete table %1 + + + + + + Unable to delete table %1: + + + + + + Couldn't load SIP module. + + + + + + + + Python support will be disabled. + + + + + Couldn't load PyQt4. + + + + + Couldn't load PyQGIS. + + + + + Couldn't load QGIS utils. + + + + + An error occured during execution of following code: + + + + + Python version: + + + + + QGIS version: + + + + + Python path: + + + + + QextSerialPort + + + No Error has occurred + + + + + Invalid file descriptor (port was not opened correctly) + + + + + Unable to allocate memory tables (POSIX) + + + + + Caught a non-blocked signal (POSIX) + + + + + Operation timed out (POSIX) + + + + + The file opened by the port is not a valid device + + + + + The port detected a break condition + + + + + The port detected a framing error (usually caused by incorrect baud rate settings) + + + + + There was an I/O error while communicating with the port + + + + + Character buffer overrun + + + + + Receive buffer overflow + + + + + The port detected a parity error in the received data + + + + + Transmit buffer overflow + + + + + General read operation failure + + + + + General write operation failure + + + + + Unknown error: %1 + + + + + QgisApp + + + &Raster + + + + + Quantum GIS + + + + + Multiple Instances of QgisApp + + + + + Multiple instances of Quantum GIS application object detected. +Please contact the developers. + + + + + + Checking database + + + + + Reading settings + + + + + Setting up the GUI + + + + + Map canvas. This is where raster and vector layers are displayed when added to the map + + + + + GPS Information + + + + + Log Messages + + + + + Quantum GIS - %1 ('%2') + + + + + QGIS starting... + + + + + Checking provider plugins + + + + + Starting Python + + + + + Restoring loaded plugins + + + + + Initializing file filters + + + + + Restoring window state + + + + + + QGIS Ready! + + + + + Minimize + + + + + Ctrl+M + Minimize Window + + + + + Minimizes the active window to the dock + + + + + Zoom + + + + + Toggles between a predefined size and the window size set by the user + + + + + Bring All to Front + + + + + Bring forward all open windows + + + + + + + + + + + + + Error + + + + + Failed to open Python console: + + + + + Panels + + + + + Toolbars + + + + + Window + + + + + &Database + + + + + Vect&or + + + + + &Web + + + + + Progress bar that displays the status of rendering layers and other time-intensive operations + + + + + Toggle extents and mouse position display + + + + + + Coordinate: + + + + + Current map coordinate + + + + + Shows the map coordinates at the current cursor position. The display is continuously updated as the mouse is moved. It also allows editing to set the canvas center to a given position. The format is lat,lon or east,north + + + + + Current map coordinate (lat,lon or east,north) + + + + + Scale + + + + + Current map scale + + + + + Displays the current map scale + + + + + Current map scale (formatted as x:y) + + + + + Stop map rendering + + + + + Render + + + + + When checked, the map layers are rendered in response to map navigation commands and other events. When not checked, no rendering is done. This allows you to add a large number of layers and symbolize them before rendering. + + + + + Toggle map rendering + + + + + This icon shows whether on the fly coordinate reference system transformation is enabled or not. Click the icon to bring up the project properties dialog to alter this behaviour. + + + + + CRS status - Click to open coordinate reference system dialog + + + + + Ready + + + + + Map overview canvas. This canvas can be used to display a locator map that shows the current extent of the map canvas. The current extent is shown as a red rectangle. Any layer on the map can be added to the overview canvas. + + + + + Overview + + + + + Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties. + + + + + Layers + + + + + Control rendering order + + + + + Map layer list that displays all layers in drawing order. + + + + + Layer order + + + + + [ERROR] Can not make qgis.db private copy + + + + + + + Private qgis.db + + + + + Could not open qgis.db + + + + + Migration of private qgis.db failed. +%1 + + + + + Update of view in private qgis.db failed. +%1 + + + + + + < Blank > + + + + + QGIS version + + + + + QGIS code revision + + + + + Compiled against Qt + + + + + Running against Qt + + + + + Compiled against GDAL/OGR + + + + + Running against GDAL/OGR + + + + + GEOS Version + + + + + PostgreSQL Client Version + + + + + + No support. + + + + + SpatiaLite Version + + + + + QWT Version + + + + + PROJ.4 Version + + + + + QScintilla2 Version + + + + + This copy of QGIS writes debugging output. + + + + + %1 doesn't have any layers + + + + + + Invalid Data Source + + + + + %1 is not a valid or recognized data source + + + + + Select zip layers to add... + + + + + Vector + + + + + Select raster layers to add... + + + + + Raster + + + + + Select vector layers to add... + + + + + PostgreSQL + + + + + Cannot get PostgreSQL select dialog from provider. + + + + + %1 is an invalid layer - not loaded + + + + + + + + Invalid Layer + + + + + %1 is an invalid layer and cannot be loaded. + + + + + SpatiaLite + + + + + Cannot get SpatiaLite select dialog from provider. + + + + + MSSQL + + + + + Cannot get MSSQL select dialog from provider. + + + + + WMS + + + + + Cannot get WMS select dialog from provider. + + + + + WCS + + + + + Cannot get WCS select dialog from provider. + + + + + WFS + + + + + Cannot get WFS select dialog from provider. + + + + + Calculating... + + + + + + Abort... + + + + + Choose a QGIS project file to open + + + + + + + QGis files + + + + + Unable to open project + + + + + Security warning: + + + + + project macros have been disabled. + + + + + Enable macros + + + + + Choose a QGIS project file + + + + + + Saved project to: %1 + + + + + + Unable to save project %1 + + + + + Choose a file name to save the QGIS project file as + + + + + Unable to load %1 + + + + + Choose a file name to save the map image as + + + + + Saved map image to %1 + + + + + Labeling + + + + + Please select a vector layer first. + + + + + Layer labeling settings + + + + + Saving done + + + + + Export to vector file has been completed + + + + + Save error + + + + + Export to vector file failed. +Error: %1 + + + + + + No Layer Selected + + + + + To delete features, you must select a vector layer in the legend + + + + + No Vector Layer Selected + + + + + Deleting features only works on vector layers + + + + + Provider does not support deletion + + + + + Data provider does not support deleting features + + + + + + + Layer not editable + + + + + The current layer is not editable. Choose 'Start editing' in the digitizing toolbar. + + + + + Delete features + + + + + Delete %n feature(s)? + number of features to delete + + + + + + + + Features deleted + + + + + Problem deleting features + + + + + A problem occured during deletion of features + + + + + Merging features... + + + + + Abort + + + + + + Composer %1 + + + + + + No active layer + + + + + + No active layer found. Please select a layer in the layer list + + + + + + Active layer is not vector + + + + + + The merge features tool only works on vector layers. Please select a vector layer from the layer list + + + + + + Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing + + + + + + + Not enough features selected + + + + + + + The merge tool requires at least two selected features + + + + + Merged feature attributes + + + + + + Merge failed + + + + + + An error occured during the merge operation + + + + + Union operation canceled + + + + + + The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled + + + + + Merged features + + + + + Features cut + + + + + Features pasted + + + + + Cannot copy style: %1 + + + + + Cannot parse style: %1:%2:%3 + + + + + Cannot read style: %1 + + + + + + Could not commit changes to layer %1 + +Errors: %2 + + + + + + Start editing failed + + + + + Provider cannot be opened for editing + + + + + Stop editing + + + + + Do you want to save the changes to layer %1? + + + + + Problems during roll back + + + + + copy + + + + + Plugin layer + + + + + Memory layer + + + + + + Duplicate layer: + + + + + %1 (duplication resulted in invalid layer) + + + + + %1 (%2type unsupported) + + + + + Couldn't load Python support library: %1 + + + + + Couldn't resolve python support library's instance() symbol. + + + + + Python support ENABLED :-) + + + + + There is a new version of QGIS available + + + + + You are running a development version of QGIS + + + + + You are running the current version of QGIS + + + + + Would you like more information? + + + + + + + + QGIS Version Information + + + + + QGIS - Changes since last release + + + + + Unable to get current version information from server + + + + + Connection refused - server may be down + + + + + QGIS server was not found + + + + + Unknown network socket error: %1 + + + + + Unable to communicate with QGIS Version server +%1 + + + + + + To perform a full histogram stretch, you need to have a raster layer selected. + + + + + No Raster Layer Selected + + + + + + Layer is not valid + + + + + The layer %1 is not a valid layer and can not be added to the map + + + + + The layer is not a valid layer and can not be added to the map + + + + + Project has layer(s) in edit mode with unsaved edits, which will NOT be saved! + + + + + Save? + + + + + Do you want to save the current project?%1 + + + + + Current CRS: %1 (OTFR enabled) + + + + + Current CRS: %1 (OTFR disabled) + + + + + Map coordinates for the current view extents + + + + + Map coordinates at mouse cursor position + + + + + Extents: + + + + + Maptips require an active layer + + + + + %n feature(s) selected on layer %1. + number of selected features + + + + + + + + Open a GDAL Supported Raster Data Source + + + + + + Error adding valid layer to map canvas + + + + + + + Raster layer + + + + + %1 is not a supported raster data source + + + + + Unsupported Data Source + + + + + <p>This project file was saved by an older version of QGIS. When saving this project file, QGIS will update it to the latest version, possibly rendering it useless for older versions of QGIS.<p>Even though QGIS developers try to maintain backwards compatibility, some of the information from the old project file might be lost. To improve the quality of QGIS, we appreciate if you file a bug report at %3. Be sure to include the old project file, and state the version of QGIS you used to discover the error.<p>To remove this warning when opening an older project file, uncheck the box '%5' in the %4 menu.<p>Version of the project file: %1<br>Current version of QGIS: %2 + + + + + <tt>Settings:Options:General</tt> + Menu path to setting options + + + + + Warn me when opening a project file saved with an older version of QGIS + + + + + Project file is older + + + + + This project file was saved by an older version of QGIS + + + + + Warning + + + + + This layer doesn't have a properties dialog. + + + + + Authentication required + + + + + Proxy authentication required + + + + + SSL errors occured accessing URL %1: + + + + + + +Always ignore these errors? + + + + + %n SSL errors occured + number of errors + + + + + + + + QgisAppInterface + + + Attributes changed + + + + + QgsAbout + + + About Quantum GIS + + + + + About + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Quantum GIS (QGIS)</span></p></body></html> + + + + + Quantum GIS is licensed under the GNU General Public License + + + + + http://www.gnu.org/licenses + + + + + QGIS Home Page + + + + + Join our user mailing list + + + + + What's New + + + + + Providers + + + + + Developers + + + + + Essen (Germany), Developer meeting 2012 + + + + + Contributors + + + + + Translators + + + + + about:blank + + + + + Donors + + + + + <p>For a list of individuals and institutions who have contributed money to fund QGIS development and other project costs see <a href="http://qgis.org/en/sponsorship/donors.html">http://qgis.org/en/sponsorship/donors.html</a></p> + + + + + Available QGIS Data Provider Plugins + + + + + Available Qt Database Plugins + + + + + Available Qt Image Plugins + + + + + Qt Image Plugin Search Paths <br> + + + + + QgsAddAttrDialog + + + Warning + + + + + Invalid field name. This field name is reserved and cannot be used. + + + + + QgsAddAttrDialogBase + + + Add column + + + + + N&ame + + + + + Comment + + + + + + Type + + + + + Width + + + + + Precision + + + + + QgsAddJoinDialogBase + + + Add vector join + + + + + Join layer + + + + + Join field + + + + + Target field + + + + + Create attribute index on join field + + + + + Cache join layer in virtual memory + + + + + QgsAddTabOrGroup + + + Add tab or group for %1 + + + + + QgsAddTabOrGroupBase + + + Dialog + + + + + Create category + + + + + as + + + + + a tab + + + + + a group in container + + + + + QgsAnnotationWidget + + + Select frame color + + + + + Select background color + + + + + QgsAnnotationWidgetBase + + + Form + + + + + Fixed map position + + + + + Map marker + + + + + Frame width + + + + + Background color + + + + + Frame color + + + + + QgsApplication + + + + + Exception + + + + + unknown exception + + + + + Application state: +QGIS_PREFIX_PATH env var: %1 +Prefix: %2 +Plugin Path: %3 +Package Data Path: %4 +Active Theme Name: %5 +Active Theme Path: %6 +Default Theme Path: %7 +SVG Search Paths: %8 +User DB Path: %9 + + + + + + + + match indentation of application state + + + + + QgsAtlasCompositionWidget + + + + Map %1 + + + + + Expression based filename + + + + + QgsAtlasCompositionWidgetBase + + + Atlas generation + + + + + Atlas options + + + + + Hide the coverage layer when generating the output + + + + + Hidden coverage layer + + + + + Margin around coverage + + + + + Output filename expression + + + + + % + + + + + ... + + + + + Coverage layer + + + + + Fixed scale + + + + + Single file export when possible + + + + + Composer map to use + + + + + Generate an atlas + + + + + QgsAttributeActionDialog + + + Select an action + File dialog window title + + + + + Insert expression + + + + + Missing Information + + + + + To create an attribute action, you must provide both a name and the action to perform. + + + + + Echo attribute's value + + + + + Run an application + + + + + Get feature id + + + + + Selected field's value (Identify features tool) + + + + + Clicked coordinates (Run feature actions tool) + + + + + Open file + + + + + Search on web based on attribute's value + + + + + QgsAttributeActionDialogBase + + + Attribute Actions + + + + + Action list + + + + + This list contains all actions that have been defined for the current layer. Add actions by entering the details in the controls below and then pressing the Add to action list button. Actions can be edited here by double clicking on the item. + + + + + + + Type + + + + + + Name + + + + + + Action + + + + + Capture + + + + + Remove the selected action + + + + + Remove action + + + + + Move the selected action up + + + + + Move up + + + + + Move the selected action down + + + + + Move down + + + + + Add default actions + + + + + Action properties + + + + + Generic + + + + + Python + + + + + Mac + + + + + Windows + + + + + Unix + + + + + Open + + + + + Captures any output from the action + + + + + Captures the standard output or error generated by the action and displays it in a dialog box + + + + + Capture output + + + + + + Enter the name of an action here. The name should be unique (qgis will make it unique if necessary). + + + + + Enter the action name here + + + + + Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash + + + + + Enter the action command here + + + + + Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters within [% and %] will be evaluated as expression and replaced by its result. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash + + + + + Browse for action + + + + + Click to browse for an action + + + + + Clicking the button will let you select an application to use as the action + + + + + ... + + + + + Inserts an expression into the action + + + + + Insert expression... + + + + + The valid attribute names for this layer + + + + + Inserts the selected field into the action + + + + + Insert field + + + + + Inserts the action into the list above + + + + + Add to action list + + + + + Update the selected action + + + + + Update selected action + + + + + QgsAttributeDialog + + + Error + + + + + Error: %1 + + + + + Attributes - %1 + + + + + QgsAttributeEditor + + + Select a file + + + + + Select a date + + + + + (no selection) + + + + + ... + + + + + QgsAttributeLoadValues + + + Load values from layer + + + + + Layer + + + + + + Description + + + + + + Value + + + + + Select data from attributes in selected layer. + + + + + View All + + + + + QgsAttributeSelectionDialog + + + + + Ascending + + + + + + Descending + + + + + QgsAttributeSelectionDialogBase + + + Select attributes + + + + + Select all + + + + + Clear + + + + + Sorting + + + + + Column + + + + + Ascending + + + + + <b>Attribute</b> + + + + + <b>Alias</b> + + + + + QgsAttributeTableAction + + + Attributes changed + + + + + QgsAttributeTableDelegate + + + Attribute changed + + + + + QgsAttributeTableDialog + + + Attribute Table + + + + + Show selected only + + + + + Search selected only + + + + + Case sensitive + + + + + Opens the search query builder + + + + + Advanced search + + + + + ? + + + + + Close + + + + + Unselect all (Ctrl+U) + + + + + Ctrl+U + + + + + Move selection to top (Ctrl+T) + + + + + Ctrl+T + + + + + Invert selection (Ctrl+R) + + + + + Ctrl+S + + + + + Copy selected rows to clipboard (Ctrl+C) + + + + + Ctrl+C + + + + + Zoom map to the selected rows (Ctrl+J) + + + + + Ctrl+J + + + + + Pan map to the selected rows (Ctrl+P) + + + + + Ctrl+P + + + + + Toggle editing mode (Ctrl+E) + + + + + + Ctrl+E + + + + + Save Edits (Ctrl+S) + + + + + Delete selected features (Ctrl+D) + + + + + ... + + + + + Ctrl+D + + + + + New column (Ctrl+W) + + + + + Ctrl+W + + + + + Delete column (Ctrl+L) + + + + + Ctrl+L + + + + + Add feature + + + + + + + + + + + Open field calculator (Ctrl+I) + + + + + Ctrl+I + + + + + Look for + + + + + in + + + + + Looks for the given value in the given attribute column + + + + + &Search + + + + + Attribute table - %1 (%n Feature(s)) + feature count + + + + + + + + Attribute table - %1 :: %n / %2 feature(s) selected + feature count + + + + + + + + Parsing error + + + + + Evaluation error + + + + + Error during search + + + + + Attribute table - %1 (%n matching features) + matching features + + + + + + + + Attribute table - %1 (No matching features) + + + + + Attribute added + + + + + + Attribute Error + + + + + The attribute could not be added to the layer + + + + + Deleted attribute + + + + + The attribute(s) could not be deleted + + + + + Geometryless feature added + + + + + Run action + + + + + + Open form + + + + + Loading feature attributes... + + + + + Abort + + + + + Attribute table + + + + + %1 features loaded. + + + + + QgsAttributeTableModel + + + feature id + + + + + QgsAttributeTypeDialog + + + + Attribute Edit Dialog + + + + + Simple edit box. This is the default editation widget. + + + + + Displays combo box containing values of attribute used for classification. + + + + + Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box. + + + + + Minimum + + + + + Maximum + + + + + Step + + + + + Local minimum/maximum = 0/0 + + + + + The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used. + + + + + + + Editable + + + + + Simplifies file selection by adding a file chooser dialog. + + + + + Combo box with predefined items. Value is stored in the attribute, description is shown in the combo box. + + + + + Load Data from layer + + + + + Value + + + + + Description + + + + + Remove Selected + + + + + Load Data from CSV file + + + + + Combo box with values that can be used within the column's type. Must be supported by the provider. + + + + + An immutable attribute is read-only - the user is not able to modify the contents. + + + + + A hidden attribute will be invisible - the user is not able to see it's contents. + + + + + Representation for checked state + + + + + Representation for unchecked state + + + + + A text edit field that accepts multiple lines will be used. + + + + + A calendar widget to enter a date. + + + + + Layer + + + + + Key column + + + + + Select layer, key column and value column + + + + + Allow null value + + + + + Order by value + + + + + Allow multiple selections + + + + + Value column + + + + + Filter column + + + + + Filter value + + + + + Read-only field that generates a UUID if empty. + + + + + Line edit + + + + + Classification + + + + + Range + + + + + Unique values + + + + + File name + + + + + Value map + + + + + Enumeration + + + + + Immutable + + + + + Hidden + + + + + Checkbox + + + + + Text edit + + + + + Calendar + + + + + Value relation + + + + + UUID generator + + + + + Select a file + + + + + Error + + + + + Could not open file %1 +Error was:%2 + + + + + + Slider + + + + + Dial + + + + + + Current minimum for this value is %1 and current maximum is %2. + + + + + Attribute has no integer or real type, therefore range is not usable. + + + + + Enumeration is not available for this attribute + + + + + No filter + + + + + QgsBookmarks + + + &Add + + + + + &Delete + + + + + &Zoom to + + + + + + Error + + + + + Unable to open bookmarks database. +Database: %1 +Driver: %2 +Database: %3 + + + + + Name + + + + + Project + + + + + xMin + + + + + yMin + + + + + xMax + + + + + yMax + + + + + SRID + + + + + New bookmark + + + + + Unable to create the bookmark. +Driver:%1 +Database:%2 + + + + + Really Delete? + + + + + Are you sure you want to delete %n bookmark(s)? + number of rows + + + + + + + + Empty extent + + + + + Reprojected extent is empty. + + + + + QgsBookmarksBase + + + Geospatial Bookmarks + + + + + QgsBrowser + + + WMS + + + + + Cannot get WMS select dialog from provider. + + + + + CRS + + + + + Cannot set layer CRS + + + + + QgsBrowserBase + + + QGIS Browser + + + + + Param + + + + + Metadata + + + + + Preview + + + + + Stop rendering + + + + + Attributes + + + + + toolBar + + + + + New Shapefile + + + + + Ctrl+Shift+N + + + + + Refresh + + + + + Ctrl+R + + + + + + Set layer CRS + + + + + Manage WMS + + + + + Manage WMS Connections + + + + + Ctrl+Shift+W + + + + + QgsBrowserDirectoryPropertiesBase + + + Dialog + + + + + Path + + + + + QgsBrowserDockWidget + + + Browser + + + + + Filter Pattern Syntax + + + + + Wildcard(s) + + + + + Regular Expression + + + + + Add as a favourite + + + + + Remove favourite + + + + + + Properties + + + + + Fast scan this dir. + + + + + Add Layer + + + + + Add Selected Layers + + + + + Add a directory + + + + + Add directory to favourites + + + + + Error + + + + + Layer Properties + + + + + Directory Properties + + + + + QgsBrowserDockWidgetBase + + + Browser + + + + + + Refresh + + + + + Add Selected Layers + + + + + Add + + + + + Filter Files + + + + + + ... + + + + + Collapse All + + + + + Options + + + + + Filter files + + + + + QgsBrowserLayerPropertiesBase + + + Dialog + + + + + Display Name + + + + + Layer Source + + + + + Provider + + + + + Metadata + + + + + QgsBrowserModel + + + Home + + + + + Favourites + + + + + QgsBrushStyleComboBox + + + Solid + + + + + No Brush + + + + + Horizontal + + + + + Vertical + + + + + Cross + + + + + BDiagonal + + + + + FDiagonal + + + + + Diagonal X + + + + + Dense 1 + + + + + Dense 2 + + + + + Dense 3 + + + + + Dense 4 + + + + + Dense 5 + + + + + Dense 6 + + + + + Dense 7 + + + + + QgsCategorizedSymbolRendererV2Model + + + Symbol + + + + + Value + + + + + Label + + + + + QgsCategorizedSymbolRendererV2Widget + + + Column + + + + + Symbol + + + + + change + + + + + Color ramp + + + + + Classify + + + + + Add + + + + + Delete + + + + + Delete all + + + + + Join + + + + + Advanced + + + + + Symbol levels... + + + + + High number of classes! + + + + + Classification would yield %1 entries which might not be expected. Continue? + + + + + + Error + + + + + There are no available color ramps. You can add them in Style Manager. + + + + + The selected color ramp is not available. + + + + + Confirm Delete + + + + + The classification field was changed from '%1' to '%2'. +Should the existing classes be deleted before classification? + + + + + QgsCharacterSelectorBase + + + Character Selector + + + + + Font: + + + + + Current font family and style + + + + + QgsColorRampComboBox + + + New color ramp... + + + + + QgsCompassPlugin + + + Show compass + + + + + &About + + + + + QgsCompassPluginGui + + + Pixmap not found + + + + + QgsCompassPluginGuiBase + + + Internal Compass + + + + + Azimut + + + + + QgsComposer + + + QGIS + + + + + File + + + + + View + + + + + Panels + + + + + Toolbars + + + + + Layout + + + + + Composition + + + + + Item Properties + + + + + Command history + + + + + Atlas generation + + + + + + Choose a file name to save the map as + + + + + PDF Format + + + + + + + Empty filename pattern + + + + + + + The filename pattern is empty. A default one will be used. + + + + + Directory where to save PDF files + + + + + + + Unable to write into the directory + + + + + + + The given output directory is not writeable. Cancelling. + + + + + + + + Rendering maps... + + + + + + + + Abort + + + + + + + + Atlas processing error + + + + + Big image + + + + + To create image %1x%2 requires about %3 MB of memory. Proceed? + + + + + Choose a file name to save the map image as + + + + + Directory where to save image files + + + + + Image format: + + + + + SVG warning + + + + + + Don't show this message again + + + + + <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the + + + + + Qt4 svg code. In particular, there are problems with layers not being clipped to the map bounding box.</p> + + + + + If you require a vector-based output file from Qgis it is suggested that you try printing to PostScript if the SVG output is not satisfactory.</p> + + + + + SVG Format + + + + + Directory where to save SVG files + + + + + Save template + + + + + Composer templates + + + + + Save error + + + + + Error, could not save file + + + + + Load template + + + + + Read error + + + + + Error, could not read file + + + + + Composer + + + + + Project contains WMS layers + + + + + Some WMS servers (e.g. UMN mapserver) have a limit for the WIDTH and HEIGHT parameter. Printing layers from such servers may exceed this limit. If this is the case, the WMS layer will not be printed + + + + + QgsComposerArrowWidget + + + General options + + + + + Arrow outline width + + + + + Arrowhead width + + + + + Arrow color + + + + + Arrow color changed + + + + + + + Arrow marker changed + + + + + + Arrow start marker + + + + + + Arrow end marker + + + + + Start marker svg file + + + + + End marker svg file + + + + + QgsComposerArrowWidgetBase + + + Form + + + + + Arrow + + + + + Arrow color... + + + + + Line width + + + + + Arrow head width + + + + + Arrow markers + + + + + Start marker + + + + + + ... + + + + + SVG markers + + + + + End marker + + + + + No marker + + + + + Default marker + + + + + QgsComposerBase + + + MainWindow + + + + + Toolbar + + + + + &Print... + + + + + Zoom Full + + + + + Zoom In + + + + + Zoom Out + + + + + Add Map + + + + + Add new map + + + + + Add Label + + + + + Add new label + + + + + Add Legend + + + + + Add new legend + + + + + Move Item + + + + + Select/Move item + + + + + Export as Image... + + + + + Export as PDF... + + + + + Export as SVG... + + + + + Add Scalebar + + + + + Add new scalebar + + + + + Refresh + + + + + Refresh view + + + + + Add Image + + + + + Move Content + + + + + Move item content + + + + + Group + + + + + Group items + + + + + Ungroup + + + + + Ungroup items + + + + + Raise + + + + + Raise selected items + + + + + Lower + + + + + Lower selected items + + + + + Bring to Front + + + + + Move selected items to top + + + + + Send to Back + + + + + Move selected items to bottom + + + + + Load From template + + + + + Save as template + + + + + Align left + + + + + Align selected items left + + + + + Align center + + + + + Align center horizontal + + + + + Align right + + + + + Align selected items right + + + + + Align top + + + + + Align selected items to top + + + + + + Align center vertical + + + + + Align bottom + + + + + Align selected items bottom + + + + + &Quit + + + + + Quit + + + + + Ctrl+Q + + + + + Add arrow + + + + + Add table + + + + + Adds attribute table + + + + + Page Setup + + + + + Undo + + + + + Revert last change + + + + + Ctrl+Z + + + + + Redo + + + + + Restore last change + + + + + Ctrl+Shift+Z + + + + + + Add Rectangle + + + + + + Add Triangle + + + + + + Add Ellipse + + + + + Add html + + + + + Add html frame + + + + + QgsComposerHtmlWidget + + + Use existing frames + + + + + Extend to next page + + + + + Repeat on every page + + + + + Repeat until finished + + + + + General options + + + + + Change html url + + + + + Select HTML document + + + + + Change resize mode + + + + + QgsComposerHtmlWidgetBase + + + Form + + + + + HTML + + + + + ... + + + + + URL + + + + + Resize mode + + + + + QgsComposerItem + + + Change item position + + + + + QgsComposerItemWidget + + + Frame color changed + + + + + Background color changed + + + + + Item opacity changed + + + + + Item outline width + + + + + Item frame toggled + + + + + Item position changed + + + + + Item id changed + + + + + QgsComposerItemWidgetBase + + + Form + + + + + Frame color... + + + + + Background color... + + + + + Opacity + + + + + Outline width + + + + + Position and size... + + + + + Show frame + + + + + Item ID + + + + + QgsComposerLabelWidget + + + General options + + + + + Label text changed + + + + + + Label font changed + + + + + Label margin changed + + + + + + Insert expression + + + + + + + + + + Label alignment changed + + + + + Label id changed + + + + + Label rotation changed + + + + + QgsComposerLabelWidgetBase + + + Label Options + + + + + Label + + + + + Font color... + + + + + Horizontal Alignment: + + + + + Left + + + + + Center + + + + + Right + + + + + Vertical Alignment: + + + + + Top + + + + + Middle + + + + + Bottom + + + + + Margin + + + + + mm + + + + + Rotation + + + + + Font + + + + + Insert an expression + + + + + QgsComposerLegend + + + Legend + + + + + QgsComposerLegendItemDialogBase + + + Legend item properties + + + + + Item text + + + + + QgsComposerLegendLayersDialogBase + + + Add layer to legend + + + + + QgsComposerLegendWidget + + + General Options + + + + + Item wrapping changed + + + + + Legend title changed + + + + + Legend column count + + + + + Legend split layers + + + + + Legend equal column width + + + + + Legend symbol width + + + + + Legend symbol height + + + + + Legend group space + + + + + Legend layer space + + + + + Legend symbol space + + + + + Legend icon label space + + + + + Title font changed + + + + + Legend group font changed + + + + + Legend layer font changed + + + + + Legend item font changed + + + + + + Legend box space + + + + + Legend map changed + + + + + Legend item edited + + + + + + + Legend updated + + + + + Legend group added + + + + + Map %1 + + + + + None + + + + + QgsComposerLegendWidgetBase + + + Barscale Options + + + + + General + + + + + Title Font... + + + + + Group Font... + + + + + Layer Font... + + + + + Item Font... + + + + + Symbol width + + + + + + + + + + + + mm + + + + + Symbol height + + + + + Layer space + + + + + Symbol space + + + + + Icon label space + + + + + Box space + + + + + Map + + + + + Group Space + + + + + Wrap text on + + + + + &Title + + + + + Column count + + + + + Allow to split layer items into multiple columns. + + + + + Split layers + + + + + Equal column widths + + + + + Column space + + + + + Legend items + + + + + Auto Update + + + + + Update + + + + + All + + + + + Add group + + + + + Show feature count for each class of vector layer. + + + + + QgsComposerManager + + + &Show + + + + + &Remove + + + + + Re&name + + + + + Empty composer + + + + + Remove composer + + + + + Do you really want to remove the map composer '%1'? + + + + + Change title + + + + + Title + + + + + QgsComposerManagerBase + + + Composer manager + + + + + Add + + + + + QgsComposerMap + + + + Map %1 + + + + + Map will be printed here + + + + + QgsComposerMapWidget + + + General options + + + + + + + Cache + + + + + + + Render + + + + + + + Rectangle + + + + + + Solid + + + + + + + Cross + + + + + Decimal + + + + + DegreeMinute + + + + + DegreeMinuteSecond + + + + + + No frame + + + + + + + Zebra + + + + + Change item width + + + + + Change item height + + + + + Map scale changed + + + + + Map rotation changed + + + + + + Map extent changed + + + + + Canvas items toggled + + + + + + + None + + + + + Grid checkbox toggled + + + + + + Grid interval changed + + + + + + Grid offset changed + + + + + Grid pen changed + + + + + Grid type changed + + + + + Grid cross width changed + + + + + Annotation font changed + + + + + Annotation distance changed + + + + + Annotation format changed + + + + + Annotation toggled + + + + + Changed annotation precision + + + + + Changed grid frame style + + + + + Changed grid frame width + + + + + + + Inside frame + + + + + + Outside frame + + + + + + + Disabled + + + + + + + Horizontal + + + + + + Vertical + + + + + Annotation position changed + + + + + Changed annotation direction + + + + + Map %1 + + + + + QgsComposerMapWidgetBase + + + Map options + + + + + Map + + + + + Update preview + + + + + Overview style + + + + + Change... + + + + + Overview frame + + + + + Width + + + + + Height + + + + + Scale + + + + + Rotation + + + + + degrees + + + + + Lock layers for map item + + + + + Draw map canvas items + + + + + Extents + + + + + X min + + + + + X max + + + + + Y min + + + + + Y max + + + + + Set to map canvas extent + + + + + Grid + + + + + Show grid? + + + + + Grid &type + + + + + Interval X + + + + + Interval Y + + + + + Offset X + + + + + Offset Y + + + + + Cross width + + + + + Frame style + + + + + Frame width + + + + + Line style + + + + + change... + + + + + Draw annotation + + + + + Annotation position left side + + + + + Annotation position right side + + + + + Annotation position top side + + + + + Annotation position bottom side + + + + + Annotation direction left side + + + + + Annotation direction right side + + + + + Annotation direction top side + + + + + Annotation direction bottom side + + + + + Annotation format + + + + + Font... + + + + + Distance to map frame + + + + + Coordinate precision + + + + + QgsComposerPictureWidget + + + General options + + + + + Select svg or image file + + + + + + + Picture changed + + + + + Picture width changed + + + + + Picture height changed + + + + + Picture rotation changed + + + + + Select new preview directory + + + + + Rotation synchronisation toggled + + + + + Rotation map changed + + + + + + Map %1 + + + + + Creating icon for file %1 + + + + + QgsComposerPictureWidgetBase + + + Picture Options + + + + + Picture options + + + + + Preloaded images + + + + + Load another + + + + + ... + + + + + Options + + + + + Width + + + + + Height + + + + + Rotation + + + + + Sync with map + + + + + Search directories + + + + + Add... + + + + + Remove + + + + + QgsComposerScaleBar + + + km + + + + + m + + + + + QgsComposerScaleBarWidget + + + General options + + + + + + Single Box + + + + + + Double Box + + + + + + + Line Ticks Middle + + + + + + Line Ticks Down + + + + + + Line Ticks Up + + + + + + Numeric + + + + + Left + + + + + Middle + + + + + Right + + + + + Map units + + + + + Meters + + + + + Feet + + + + + + + Map %1 + + + + + Scalebar map changed + + + + + Scalebar line width + + + + + Scalebar segment size + + + + + Scalebar segments left + + + + + Scalebar n segments + + + + + Scalebar height changed + + + + + Scalebar font changed + + + + + Scalebar color changed + + + + + Scalebar unit text + + + + + Scalebar map units per segment + + + + + Scalebar style changed + + + + + Scalebar label bar space + + + + + Scalebar box content space + + + + + Scalebar alignment + + + + + Scalebar unit changed + + + + + QgsComposerScaleBarWidgetBase + + + Barscale Options + + + + + Scale bar + + + + + Segment size + + + + + Units + + + + + Map units per bar unit + + + + + Left segments + + + + + Right segments + + + + + Style + + + + + Map + + + + + Alignment + + + + + + + + mm + + + + + Height + + + + + Line width + + + + + Label space + + + + + Box space + + + + + Unit label + + + + + Font... + + + + + Color... + + + + + QgsComposerShapeWidget + + + General options + + + + + + + Ellipse + + + + + + + Rectangle + + + + + + + Triangle + + + + + Shape rotation changed + + + + + Shape type changed + + + + + Select outline color + + + + + Shape outline color + + + + + Shape outline width + + + + + Shape transparency toggled + + + + + Select fill color + + + + + Shape fill color + + + + + QgsComposerShapeWidgetBase + + + Form + + + + + Shape + + + + + Shape outline color... + + + + + Outline width + + + + + Transparent fill + + + + + Shape fill Color... + + + + + Rotation + Rotation + Rotation + + + + + QgsComposerTableWidget + + + General options + + + + + + Map %1 + + + + + Table layer changed + + + + + Table attribute settings + + + + + Table map changed + + + + + + Table maximum columns + + + + + + + + Select Font + + + + + Table header font + + + + + Table content font + + + + + Table grid stroke + + + + + Select grid color + + + + + Table grid color + + + + + Table grid toggled + + + + + Table visible only toggled + + + + + QgsComposerTableWidgetBase + + + Form + + + + + Table + + + + + Layer + + + + + Attributes... + + + + + Composer map + + + + + Maximum rows + + + + + Show grid + + + + + Grid stroke width + + + + + Grid color + + + + + Header Font... + + + + + Content Font... + + + + + Margin + + + + + Show only visible features + + + + + QgsComposerVectorLegendBase + + + Vector Legend Options + + + + + Preview + + + + + Map + + + + + Title + + + + + Layers + + + + + Group + + + + + ID + + + + + Box + + + + + Font + + + + + QgsComposerView + + + Quantum GIS + + + + + Label added + + + + + Scale bar added + + + + + Legend added + + + + + Picture added + + + + + Table added + + + + + Shape added + + + + + Move item content + + + + + Arrow added + + + + + Map added + + + + + Html item added + + + + + Html frame added + + + + + + + + Item moved + + + + + Zoom item content + + + + + QgsComposition + + + Label added + + + + + Map added + + + + + Arrow added + + + + + Scale bar added + + + + + Shape added + + + + + Picture added + + + + + Legend added + + + + + Table added + + + + + Aligned items left + + + + + Aligned items hcenter + + + + + Aligned items right + + + + + Aligned items top + + + + + Aligned items vcenter + + + + + Aligned items bottom + + + + + Item z-order changed + + + + + Remove item group + + + + + Frame deleted + + + + + Item deleted + + + + + Multiframe removed + + + + + QgsCompositionBase + + + Composition + + + + + Paper + + + + + Size + + + + + Units + + + + + Width + + + + + Height + + + + + Orientation + + + + + QgsCompositionWidget + + + mm + + + + + inch + + + + + + + Landscape + + + + + + Portrait + + + + + + Solid + + + + + + Dots + + + + + + Crosses + + + + + A5 (148x210 mm) + + + + + A4 (210x297 mm) + + + + + A3 (297x420 mm) + + + + + A2 (420x594 mm) + + + + + A1 (594x841 mm) + + + + + A0 (841x1189 mm) + + + + + B5 (176 x 250 mm) + + + + + B4 (250 x 353 mm) + + + + + B3 (353 x 500 mm) + + + + + B2 (500 x 707 mm) + + + + + B1 (707 x 1000 mm) + + + + + B0 (1000 x 1414 mm) + + + + + Legal (8.5x14 inches) + + + + + ANSI A (Letter; 8.5x11 inches) + + + + + ANSI B (Tabloid; 11x17 inches) + + + + + ANSI C (17x22 inches) + + + + + ANSI D (22x34 inches) + + + + + ANSI E (34x44 inches) + + + + + Arch A (9x12 inches) + + + + + Arch B (12x18 inches) + + + + + Arch C (18x24 inches) + + + + + Arch D (24x36 inches) + + + + + Arch E (36x48 inches) + + + + + Arch E1 (30x42 inches) + + + + + + + + Custom + + + + + QgsCompositionWidgetBase + + + Composition + + + + + Paper and quality + + + + + Size + + + + + Width + + + + + Height + + + + + Orientation + + + + + Print as raster + + + + + dpi + + + + + Quality + + + + + Number of pages + + + + + Snapping + + + + + Snap to grid + + + + + X offset + + + + + Y offset + + + + + Grid color + + + + + Grid style + + + + + Selection tolerance (mm) + + + + + Spacing + + + + + Pen width + + + + + QgsConfigureShortcutsDialog + + + Configure shortcuts + + + + + Action + + + + + Shortcut + + + + + + Change + + + + + Set none + + + + + Set default + + + + + Load... + + + + + Save... + + + + + Save shortcuts + + + + + + XML file + + + + + + All files + + + + + Saving shortcuts + + + + + Cannot write file %1: +%2. + + + + + Load shortcuts + + + + + + + + Loading shortcuts + + + + + Cannot read file %1: +%2. + + + + + Parse error at line %1, column %2: +%3 + + + + + The file is not an shortcuts exchange file. + + + + + The file contains shortcuts created with different locale, so you can't use it. + + + + + None + + + + + Set default (%1) + + + + + Input: + + + + + Shortcut conflict + + + + + This shortcut is already assigned to action %1. Reassign? + + + + + QgsContinuousColorDialogBase + + + Continuous color + + + + + Classification field + + + + + Minimum value + + + + + Maximum value + + + + + Outline width + + + + + Draw polygon outline + + + + + QgsCoordinateTransform + + + The source spatial reference system (CRS) is not valid. The coordinates can not be reprojected. The CRS is: %1 + + + + + + CRS + + + + + The destination spatial reference system (CRS) is not valid. The coordinates can not be reprojected. The CRS is: %1 + + + + + inverse transform + + + + + forward transform + + + + + %1 of +%2PROJ.4: %3 +to %4 +Error: %5 + + + + + QgsCptCityBrowserModel + + + Name + + + + + Info + + + + + QgsCptCityColorRampItem + + + colors + + + + + discrete + + + + + continuous + + + + + continuous (multi) + + + + + variants + + + + + QgsCptCityColorRampV2Dialog + + + Error - cpt-city gradient files not found. + +You have two means of installing them: + +1) Install the "Color Ramp Manager" python plugin (you must enable Experimental plugins in the plugin manager) and use it to download latest cpt-city package. +You can install the entire cpt-city archive or a selection for QGIS. + +2) Download the complete archive (in svg format) and unzip it to your QGis settings directory [%1] . + +This file can be found at [%2] +and current file is [%3] + + + + + Selections by theme + + + + + All by author + + + + + You can download a more complete set of cpt-city gradients by installing the "Color Ramp Manager" plugin (you must enable Experimental plugins in the plugin manager). + + + + + + + All Ramps (%1) + + + + + %1 directory details + + + + + %1 gradient details + + + + + QgsCptCityColorRampV2DialogBase + + + cpt-city color ramp + + + + + Selection and preview + + + + + + License + + + + + Palette + + + + + Path + + + + + Information + + + + + Author(s) + + + + + Source + + + + + Details + + + + + Save as standard gradient + + + + + QgsCredentialDialog + + + Enter Credentials + + + + + Username + + + + + Password + + + + + + TextLabel + + + + + Realm + + + + + QgsCustomProjectionDialog + + + Delete Projection Definition? + + + + + Deleting a projection definition is not reversable. Do you want to delete it? + + + + + + + + %1 of %2 + + + + + + + + Abort + + + + + + New + + + + + * of %1 + + + + + + + + + + + + QGIS Custom Projection + + + + + + + + + This proj4 projection definition is not valid. + + + + + Please give the projection a name before pressing save. + + + + + Please add the parameters before pressing save. + + + + + Please add a proj= clause before pressing save. + + + + + This proj4 ellipsoid definition is not valid. Please add a ellips= clause before pressing save. + COMMENTED OUT + + + + + Please correct before pressing save. + + + + + Northing and Easthing must be in decimal form. + + + + + Internal Error (source projection invalid?) + + + + + + Error + + + + + QgsCustomProjectionDialogBase + + + Custom Coordinate Reference System Definition + + + + + Define + + + + + You can define your own custom Coordinate Reference System (CRS) here. The definition must conform to the proj4 format for specifying a CRS. + + + + + Name + + + + + + Parameters + + + + + |< + + + + + < + + + + + 1 of 1 + + + + + > + + + + + >| + + + + + * + + + + + S + + + + + X + + + + + Test + + + + + Use the text boxes below to test the CRS definition you are creating. Enter a coordinate where both the lat/long and the transformed result are known (for example by reading off a map). Then press the calculate button to see if the CRS definition you are creating is accurate. + + + + + Geographic / WGS84 + + + + + Destination CRS + + + + + North + + + + + East + + + + + Calculate + + + + + QgsCustomizationDialog + + + Object name + + + + + Label + + + + + Description + + + + + + Choose a customization INI file + + + + + + Customization files (*.ini) + + + + + Widgets + + + + + QgsCustomizationDialogBase + + + Customization + + + + + Enable customization + + + + + toolBar + + + + + Catch + + + + + Switch to catching widgets in main application + + + + + Save + + + + + Save to file + + + + + Load + + + + + Load from file + + + + + Expand All + + + + + Collapse All + + + + + Select All + + + + + QgsDashSpaceDialogBase + + + Dash space pattern + + + + + Dash + + + + + Space + + + + + QgsDbSourceSelectBase + + + Add PostGIS layers + + + + + Connections + + + + + Connect + + + + + New + + + + + Edit + + + + + Delete + + + + + Load + Load connections from file + + + + + Save connections to file + + + + + Save + + + + + Also list tables with no geometry + + + + + Search options + + + + + Search + + + + + Search mode + + + + + Search in columns + + + + + QgsDecorationCopyright + + + Bottom Left + + + + + Top Left + + + + + Top Right + + + + + Bottom Right + + + + + QgsDecorationCopyrightDialog + + + Copyright Label Decoration + + + + + Enable copyright label + + + + + &Enter your copyright label here: + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">© QGIS 2009</span></p></body></html> + + + + + &Placement + + + + + Bottom Left + + + + + Top Left + + + + + Bottom Right + + + + + Top Right + + + + + &Orientation + + + + + Horizontal + + + + + Vertical + + + + + &Color + + + + + QgsDecorationGrid + + + + + + Error + + + + + No active layer + + + + + Please select a raster layer + + + + + Invalid raster layer + + + + + Layer CRS must be equal to project CRS + + + + + QgsDecorationGridDialog + + + Dialog + + + + + Enable grid + + + + + Interval X + + + + + Interval Y + + + + + Grid type + + + + + Line symbol + + + + + Draw annotation + + + + + Annotation direction + + + + + Font... + + + + + Distance to map frame + + + + + Coordinate precision + + + + + Marker symbol + + + + + Offset X + + + + + Offset Y + + + + + Update Interval / Offset from + + + + + Canvas Extents + + + + + Active Raster Layer + + + + + + Line + + + + + + Marker + + + + + + Horizontal + + + + + + Vertical + + + + + Horizontal and vertical + + + + + Boundary direction + + + + + Horizontal and Vertical + + + + + QgsDecorationNorthArrow + + + Bottom Left + + + + + Top Left + + + + + Top Right + + + + + Bottom Right + + + + + North arrow pixmap not found + + + + + QgsDecorationNorthArrowDialog + + + North Arrow Decoration + + + + + Preview of north arrow + + + + + Angle + + + + + Placement + + + + + Placement on screen + + + + + Top Left + + + + + Top Right + + + + + Bottom Left + + + + + Bottom Right + + + + + Enable North Arrow + + + + + Set direction automatically + + + + + Pixmap not found + + + + + QgsDecorationScaleBar + + + Bottom Left + + + + + Top Left + + + + + Top Right + + + + + Bottom Right + + + + + Tick Down + + + + + Tick Up + + + + + Bar + + + + + Box + + + + + km + + + + + mm + + + + + cm + + + + + m + + + + + miles + + + + + mile + + + + + inches + + + + + foot + + + + + feet + + + + + degree + + + + + degrees + + + + + unknown + + + + + QgsDecorationScaleBarDialog + + + Scale Bar Decoration + + + + + Placement + + + + + Top Left + + + + + Top Right + + + + + Bottom Left + + + + + Bottom Right + + + + + Scale bar style + + + + + Select the style of the scale bar + + + + + Tick Down + + + + + Tick Up + + + + + Box + + + + + Bar + + + + + Color of bar + + + + + + Click to select the color + + + + + Size of bar + + + + + Enable scale bar + + + + + Automatically snap to round number on resize + + + + + metres/km + + + + + feet/miles + + + + + degrees + + + + + QgsDelAttrDialogBase + + + Delete Attributes + + + + + QgsDelimitedTextPlugin + + + DelimitedTextLayer + + + + + &Add Delimited Text Layer + + + + + Add a delimited text file as a map layer. The file must have a header row containing the field names. The file must either contain X and Y fields with coordinates in decimal units or a WKT field. + + + + + Delimited Text + + + + + Cannot get Delimited Text select dialog from provider. + + + + + QgsDelimitedTextProvider + + + Error + + + + + Note: the following lines were not loaded because QGIS was unable to determine values for the x and y coordinates: + + + + + + QgsDelimitedTextSourceSelect + + + No layer name + + + + + Please enter a layer name before adding the layer to the map + + + + + Choose a delimited text file to open + + + + + Text files + + + + + Well Known Text files + + + + + All files + + + + + QgsDelimitedTextSourceSelectBase + + + Create a Layer from a Delimited Text File + + + + + File Name + + + + + Full path to the delimited text file + + + + + Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file. + + + + + Layer name + + + + + Name to display in the map legend + + + + + Name displayed in the map legend + + + + + Browse to find the delimited text file to be processed + + + + + Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the <i>Delimiter</i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file. + + + + + Browse... + + + + + Selected delimiters + + + + + + The delimiter is a regular expression + + + + + Regular expression + + + + + + The delimiter is taken as is + + + + + Plain characters + + + + + Tab + + + + + Space + + + + + Comma + + + + + Semicolon + + + + + Colon + + + + + Delimiter to use when splitting fields in the text file. The delimiter can be more than one character. + + + + + Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length. + + + + + Start import at row + + + + + The file contains X and Y coordinate columns + + + + + X Y fields + + + + + <p align="right">X field</p> + + + + + Name of the field containing x values + + + + + Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. + + + + + <p align="right">Y field</p> + + + + + + Name of the field containing y values + + + + + + Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. + + + + + The file contains a well known text geometry field + + + + + WKT field + + + + + Decimal point + + + + + Sample text + + + + + QgsDetailedItemWidgetBase + + + Form + + + + + Heading Label + + + + + Detail label + + + + + Category label + + + + + QgsDiagramProperties + + + + mm + + + + + Map units + + + + + Around Point + + + + + Over Point + + + + + Line + + + + + Horizontal + + + + + Free + + + + + On line + + + + + Above line + + + + + Below Line + + + + + Map orientation + + + + + Pie chart + + + + + Text diagram + + + + + Histogram + + + + + Height + + + + + + x-height + + + + + Area + + + + + Diameter + + + + + + None + + + + + Unknown diagram type. + + + + + The diagram type '%1' is unknown. A default type is selected for you. + + + + + Transparency: %1% + + + + + Background color + + + + + Pen color + + + + + No attributes added. + + + + + You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams. + + + + + No attribute value specified + + + + + You did not specify a maximum value for the diagram size. Please specify the attribute and a reference value as a base for scaling in the Tab Diagram / Size. + + + + + QgsDiagramPropertiesBase + + + Display diagrams + + + + + Diagram type + + + + + Priority: + + + + + Low + + + + + High + + + + + Appearance + + + + + Background color + + + + + Line color + + + + + Line width + + + + + Font... + + + + + Bar width + + + + + Transparency 0% + + + + + Only show diagrams with a size inside the specified range. + + + + + Hide diagrams with a size outside the specified range. + + + + + Scale dependent visibility + + + + + Minimum + + + + + Maximum + + + + + + Size + + + + + Fixed size + + + + + Size units + + + + + Scale linearly between 0 and the following attribute value / diagram size: + + + + + + Attribute + + + + + Find maximum value + + + + + Scale + + + + + Will scale diagrams with a size smaller than the minimum size to the minimum size + + + + + Increase size of small diagrams + + + + + Minimum size + + + + + Position + + + + + Placement + + + + + Line Options + + + + + Distance + + + + + Data defined position + + + + + x + + + + + y + + + + + Automated placement settings + + + + + Options + + + + + Label placement + + + + + Bar Orientation + + + + + Up + + + + + Down + + + + + Right + + + + + Left + + + + + Attributes + + + + + Available attributes + + + + + Assigned attributes + + + + + Drag and drop to reorder + + + + + Color + + + + + QgsDirectoryParamWidget + + + + Name + + + + + + Size + + + + + + Date + + + + + + Permissions + + + + + + Owner + + + + + + Group + + + + + + Type + + + + + folder + + + + + file + + + + + link + + + + + QgsDisplayAngle + + + %1 degrees + + + + + %1 radians + + + + + %1 gon + + + + + QgsDisplayAngleBase + + + Angle + + + + + QgsEncodingFileDialog + + + Encoding: + + + + + Cancel &All + + + + + QgsEngineConfigDialog + + + Dialog + + + + + Search method + + + + + Chain (fast) + + + + + Popmusic Tabu + + + + + Popmusic Chain + + + + + Popmusic Tabu Chain + + + + + FALP (fastest) + + + + + Number of candidates + + + + + Point + + + + + Line + + + + + Polygon + + + + + (i.e. including colliding objects) + + + + + Show all labels and features for all layers + + + + + Show candidates (for debugging) + + + + + Save settings with project + + + + + QgsErrorDialog + + + Error + + + + + QgsErrorDialogBase + + + Dialog + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Summary</p></body></html> + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Detailed report.</p></body></html> + + + + + Always show details + + + + + Details >> + + + + + QgsExpressionBuilderDialogBase + + + Expression string builder + + + + + QgsExpressionBuilderWidget + + + + + + + + + + + + + + + + + + + + + Operators + + + + + (String Concatenation) + + + + + Joins two values together into a string + + + + + Usage + + + + + 'Dia' || Diameter + + + + + + Conditionals + + + + + Search + + + + + Fields and Values + + + + + Parser Error + + + + + Eval Error + + + + + Expression is invalid <a href=more>(more info)</a> + + + + + More info on expression error + + + + + Load top 10 unique values + + + + + Load all unique values + + + + + <h3>Oops! QGIS can't find help for this function.</h3>The help file for %1 was not found.<br> + + + + + (Showing English version as there was no help available in your language (%1). If you would like to create it, contact the QGIS translation team).<br> + + + + + It was neither available in your language (%1) nor English. + + + + + <br>If you would like to create it, contact the QGIS development team. + + + + + QgsExpressionBuilderWidgetBase + + + Form + + + + + Function List + + + + + Selected Function Help + + + + + Field Values + + + + + Load all unique values + + + + + Load 10 sample values + + + + + Operators + + + + + = + + + + + + + + + + + - + + + + + / + + + + + * + + + + + ^ + + + + + || + + + + + ( + + + + + ) + + + + + + Output preview is generated <br> using the first feature from the layer. + + + + + Output preview: + + + + + Expression + + + + + QgsFeatureAction + + + Run actions + + + + + QgsFieldCalculator + + + + Not available for layer + + + + + Evaluation error + + + + + Provider error + + + + + Could not add the new field to the provider. + + + + + Error + + + + + An error occured while evaluating the calculation string: +%1 + + + + + Please enter a field name + + + + + + The expression is invalid see (more info) for details + + + + + QgsFieldCalculatorBase + + + Field calculator + + + + + Only update selected features + + + + + Create a new field + + + + + Output field name + + + + + Output field type + + + + + Output field width + + + + + Width of complete output. For example 123,456 means 6 as field width. + + + + + Precision + + + + + Update existing field + + + + + QgsFieldsProperties + + + Label + + + + + Id + + + + + Name + + + + + Type + + + + + Length + + + + + Precision + + + + + Comment + + + + + Edit widget + + + + + Alias + + + + + + Name conflict + + + + + + The attribute could not be inserted. The name already exists in the table. + + + + + Added attribute + + + + + + Deleted attribute + + + + + Line edit + + + + + Unique values + + + + + Unique values editable + + + + + Classification + + + + + Value map + + + + + Edit range + + + + + Slider range + + + + + Dial range + + + + + File name + + + + + Enumeration + + + + + Immutable + + + + + Hidden + + + + + Checkbox + + + + + Text edit + + + + + Calendar + + + + + Value relation + + + + + UUID generator + + + + + Select edit form + + + + + UI file + + + + + QgsFieldsPropertiesBase + + + Field calculator + + + + + + Click to toggle table editing + + + + + Toggle editing mode + + + + + New column + + + + + Ctrl+N + + + + + Delete column + + + + + Ctrl+X + + + + + ... + + + + + Init function + + + + + Edit UI + + + + + + + + + + + - + + + + + > + + + + + ^ + + + + + v + + + + + Autogenerate + + + + + Drag and drop designer + + + + + Provide ui-file + + + + + Attribute editor layout: + + + + + QgsFormAnnotationDialog + + + Delete + + + + + Qt designer file + + + + + QgsFormAnnotationDialogBase + + + Form annotation + + + + + ... + + + + + QgsGCPListModel + + + + map units + + + + + + pixels + + + + + QgsGCPListWidget + + + Recenter + + + + + Remove + + + + + QgsGPSDetector + + + internal GPS + + + + + local gpsd + + + + + QgsGPSDeviceDialog + + + New device %1 + + + + + Are you sure? + + + + + Are you sure that you want to delete this device? + + + + + QgsGPSDeviceDialogBase + + + GPS Device Editor + + + + + Devices + + + + + Delete + + + + + New + + + + + Update + + + + + Device name + + + + + This is the name of the device as it will appear in the lists + + + + + Commands + + + + + Track download + + + + + Route upload + + + + + Waypoint download + + + + + The command that is used to download routes from the device + + + + + Route download + + + + + The command that is used to upload waypoints to the device + + + + + Track upload + + + + + The command that is used to download tracks from the device + + + + + The command that is used to upload routes to the device + + + + + The command that is used to download waypoints from the device + + + + + The command that is used to upload tracks to the device + + + + + Waypoint upload + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:</span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%babel</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the path to GPSBabel<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%in</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the GPX filename when uploading or the port when downloading<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%out</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the port when uploading or the GPX filename when downloading</span></p></body></html> + + + + + QgsGPSInformationWidget + + + /gps + + + + + No path to the GPS port is specified. Please enter a path then try again. + + + + + Connecting... + + + + + Connecting to GPS device... + + + + + Timed out! + + + + + Failed to connect to GPS device. + + + + + Connected! + + + + + Dis&connect + + + + + Connected to GPS device. + + + + + Error opening log file. + + + + + Disconnected... + + + + + &Connect + + + + + Disconnected from GPS device. + + + + + %1 m + + + + + %1 km/h + + + + + Automatic + + + + + Manual + + + + + 3D + + + + + 2D + + + + + No fix + + + + + Differential + + + + + Non-differential + + + + + No position + + + + + Valid + + + + + Invalid + + + + + + Not enough vertices + + + + + Cannot close a line feature until it has at least two vertices. + + + + + Cannot close a polygon feature until it has at least three vertices. + + + + + + Feature added + + + + + + + + + Error + + + + + + Could not commit changes to layer %1 + +Errors: %2 + + + + + + The feature could not be added because removing the polygon intersections would change the geometry type + + + + + An error was reported during intersection removal + + + + + Cannot add feature. Unknown WKB type. Choose a different layer and try again. + + + + + Save GPS log file as + + + + + NMEA files + + + + + &Add feature + + + + + &Add Point + + + + + &Add Line + + + + + &Add Polygon + + + + + QgsGPSInformationWidgetBase + + + GPS Connect + + + + + &Add feature + + + + + Quick status indicator: +green = good or 3D fix +yellow = good 2D fix +red = no fix or bad fix +gray = no data + +2D/3D depends on this information being available + + + + + Add track point + + + + + Reset track + + + + + + + + + + + + ... + + + + + Position + + + + + Signal + + + + + Satellite + + + + + Options + + + + + Debug + + + + + &Connect + + + + + latitude of position fix (degrees) + + + + + Longitude + + + + + longitude of position fix (degrees) + + + + + antenna altitude with respect to geoid (mean sea level) + + + + + Altitude + + + + + Latitude + + + + + Time of fix + + + + + date/time of position fix (UTC) + + + + + speed over ground + + + + + Speed + + + + + track direction (degrees) + + + + + Direction + + + + + Horizontal Dilution of Precision + + + + + HDOP + + + + + Vertical Dilution of Precision + + + + + VDOP + + + + + Position Dilution of Precision + + + + + PDOP + + + + + GPS receiver configuration 2D/3D mode: Automatic or Manual + + + + + Mode + + + + + position fix dimensions: 2D, 3D or No fix + + + + + Dimensions + + + + + quality of the position fix: Differential, Non-differential or No position + + + + + Quality + + + + + position fix status: Valid or Invalid + + + + + Status + + + + + number of satellites used in the position fix + + + + + Satellites + + + + + H accurancy + + + + + V accurancy + + + + + Connection + + + + + Autodetect + + + + + Serial device + + + + + Refresh serial device list + + + + + Port + + + + + Host + + + + + Device + + + + + 00000; + + + + + gpsd + + + + + Internal + + + + + Digitizing + + + + + Track + + + + + Automatically add points + + + + + Track width in pixels + + + + + width + + + + + Color + + + + + save layer after every feature added + + + + + Automatically save added feature + + + + + save GPS data (NMEA sentences) to a file + + + + + Log File + + + + + browse for log file + + + + + Map centering + + + + + when leaving + + + + + % of map extent + + + + + never + + + + + always + + + + + Cursor + + + + + Small + + + + + Large + + + + + QgsGPSPlugin + + + &GPS Tools + + + + + &Create new GPX layer + + + + + + Creates a new GPX layer and displays it on the map canvas + + + + + + &GPS + + + + + Save new GPX file as... + + + + + GPS eXchange file + + + + + Could not create file + + + + + Unable to create a GPX file with the given name. Try again with another name or in another directory. + + + + + GPX Loader + + + + + Unable to read the selected file. +Please reselect a valid file. + + + + + + + + Could not start process + + + + + + + + Could not start GPSBabel! + + + + + + Importing data... + + + + + + + + Cancel + + + + + Could not import data from %1! + + + + + + + Error importing data + + + + + Could not convert data from %1! + + + + + + + Error converting data + + + + + + Not supported + + + + + This device does not support downloading of %1. + + + + + Downloading data... + + + + + Could not download data from GPS! + + + + + + + Error downloading data + + + + + This device does not support uploading of %1. + + + + + Uploading data... + + + + + Error while uploading data to GPS! + + + + + + + Error uploading data + + + + + QgsGPSPluginGui + + + + Waypoints + + + + + + Routes + + + + + + Tracks + + + + + + + Choose a file name to save under + + + + + + + + GPS eXchange format + + + + + + Select GPX file + + + + + Select file and format to import + + + + + Waypoints from a route + + + + + Waypoints from a track + + + + + Route from waypoints + + + + + Track from waypoints + + + + + GPS eXchange format (*.gpx) + + + + + QgsGPSPluginGuiBase + + + GPS Tools + + + + + Load GPX file + + + + + File + + + + + + + Browse... + + + + + Feature types + + + + + + Waypoints + + + + + + Routes + + + + + + Tracks + + + + + Import other file + + + + + File to import + + + + + + Feature type + + + + + + + Layer name + + + + + + GPX output file + + + + + + + Save As... + + + + + (Note: Selecting correct file type in browser dialog important!) + + + + + Download from GPS + + + + + + GPS device + + + + + Edit devices... + + + + + + Port + + + + + Refresh + + + + + Output file + + + + + Upload to GPS + + + + + Data layer + + + + + Edit devices + + + + + GPX Conversions + + + + + GPX input file + + + + + Conversion + + + + + QgsGPXProvider + + + Bad URI - you need to specify the feature type. + + + + + GPS eXchange file + + + + + Digitized in QGIS + + + + + QgsGdalProvider + + + Dataset Description + + + + + Band %1 + + + + + Dimensions: + + + + + X: %1 Y: %2 Bands: %3 + + + + + Origin: + + + + + Pixel Size: + + + + + Gauss + + + + + Cubic + + + + + Average + + + + + Mode + + + + + None + + + + + Cannot get GDAL raster band: %1 + + + + + QgsGenericProjectionSelector + + + Define this layer's coordinate reference system: + + + + + This layer appears to have no projection specification. + + + + + By default, this layer will now have its projection set to that of the project, but you may override this by selecting a different projection below. + + + + + QgsGenericProjectionSelectorBase + + + Coordinate Reference System Selector + + + + + QgsGeorefConfigDialog + + + A5 (148x210 mm) + + + + + A4 (210x297 mm) + + + + + A3 (297x420 mm) + + + + + A2 (420x594 mm) + + + + + A1 (594x841 mm) + + + + + A0 (841x1189 mm) + + + + + B5 (176 x 250 mm) + + + + + B4 (250 x 353 mm) + + + + + B3 (353 x 500 mm) + + + + + B2 (500 x 707 mm) + + + + + B1 (707 x 1000 mm) + + + + + B0 (1000 x 1414 mm) + + + + + Legal (8.5x14 inches) + + + + + ANSI A (Letter; 8.5x11 inches) + + + + + ANSI B (Tabloid; 11x17 inches) + + + + + ANSI C (17x22 inches) + + + + + ANSI D (22x34 inches) + + + + + ANSI E (34x44 inches) + + + + + Arch A (9x12 inches) + + + + + Arch B (12x18 inches) + + + + + Arch C (18x24 inches) + + + + + Arch D (24x36 inches) + + + + + Arch E (36x48 inches) + + + + + Arch E1 (30x42 inches) + + + + + QgsGeorefConfigDialogBase + + + Configure Georeferencer + + + + + Point tip + + + + + Show IDs + + + + + Show coords + + + + + Residual units + + + + + Pixels + + + + + Use map units if possible + + + + + PDF report + + + + + Left margin + + + + + + mm + + + + + Right margin + + + + + Show Georeferencer window docked + + + + + PDF map + + + + + Paper size + + + + + QgsGeorefDescriptionDialogBase + + + Description georeferencer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Droid Sans'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"></p></body></html> + + + + + QgsGeorefPlugin + + + + + &Georeferencer + + + + + QgsGeorefPluginGui + + + Georeferencer + + + + + All other files (*) + + + + + Open raster + + + + + %1 is not a supported raster data source + + + + + Unsupported Data Source + + + + + Raster loaded: %1 + + + + + Georeferencer - %1 + + + + + + + Transform: + + + + + + + + + + + + + + + Info + + + + + GDAL scripting is not supported for %1 transformation + + + + + Load GCP points + + + + + + GCP file + + + + + No GCP points to save + + + + + Save GCP points + + + + + + Please load raster to be georeferenced + + + + + + Help + + + + + Panels + + + + + Toolbars + + + + + Current transform parametrisation + + + + + Coordinate: + + + + + Current map coordinate + + + + + None + + + + + Coordinate of image(column/line) + + + + + Unable to open GCP points file %1 + + + + + Save GCPs + + + + + Save GCP points? + + + + + Failed to get linear transform parameters + + + + + World file exists + + + + + <p>The selected file already seems to have a world file! Do you want to replace it with the new world file?</p> + + + + + + Failed to compute GCP transform: Transform is not solvable + + + + + Error + + + + + Could not write to %1 + + + + + + + + map units + + + + + + pixels + + + + + Transformation parameters + + + + + Translation x + + + + + Translation y + + + + + Scale x + + + + + Scale y + + + + + Rotation [degrees] + + + + + Mean error [%1] + + + + + Residuals + + + + + yes + + + + + no + + + + + Translation (%1, %2) + + + + + Scale (%1, %2) + + + + + Rotation: %1 + + + + + Mean error: %1 + + + + + Copy in clipboard + + + + + %1 + + + + + GDAL script + + + + + Please set transformation type + + + + + Please set output raster name + + + + + %1 requires at least %2 GCPs. Please define more + + + + + Linear + + + + + Helmert + + + + + Polynomial 1 + + + + + Polynomial 2 + + + + + Polynomial 3 + + + + + Thin plate spline (TPS) + + + + + Projective + + + + + Not set + + + + + QgsGeorefPluginGuiBase + + + Georeferencer + + + + + + File + + + + + + View + + + + + + Edit + + + + + Settings + + + + + GCP table + + + + + toolBar + + + + + + Open raster + + + + + Ctrl+O + + + + + + Zoom In + + + + + Ctrl++ + + + + + + Zoom Out + + + + + Ctrl+- + + + + + + Zoom to Layer + + + + + Ctrl+Shift+F + + + + + + Pan + + + + + + Transformation settings + + + + + + Add point + + + + + Ctrl+A + + + + + + Delete point + + + + + Ctrl+D + + + + + + Quit + + + + + + Start georeferencing + + + + + Ctrl+G + + + + + + Generate GDAL script + + + + + Ctrl+C + + + + + + Link Georeferencer to QGis + + + + + + Link QGis to Georeferencer + + + + + + Save GCP points as... + + + + + Ctrl+S + + + + + + Load GCP points + + + + + Ctrl+L + + + + + Configure Georeferencer + + + + + Ctrl+P + + + + + Raster properties + + + + + + Move GCP point + + + + + Zoom Next + + + + + Zoom Last + + + + + Local histogram stretch + + + + + Full histogram stretch + + + + + QgsGlobePluginDialog + + + GDAL files + + + + + DEM files + + + + + + All files + + + + + Open raster file + + + + + Invalid Path: The file is either unreadable or does not exist + + + + + Invalid URL: + + + + + Do you want to add the datasource anyway? + + + + + Open 3D model file + + + + + Model files + + + + + QgsGlobePluginDialogGuiBase + + + Globe Settings + + + + + Elevation + + + + + + Type + + + + + Raster + + + + + TMS + + + + + URL/File + + + + + + ... + + + + + Up + + + + + Down + + + + + Add + + + + + Remove + + + + + Cache + + + + + Path + + + + + Model + + + + + Point Layer + + + + + 3D Model + + + + + Stereo + + + + + Stereo Mode + + + + + Screen distance (m) + + + + + Screen width (m) + + + + + Split stereo horizontal separation (px) + + + + + Split stereo vertical separation (px) + + + + + Split stereo vertical eye mapping + + + + + Screen height (m) + + + + + Eye separation (m) + + + + + Reset to defaults + + + + + Split stereo horizontal eye mapping + + + + + QgsGraduatedSymbolDialog + + + + + + Equal Interval + + + + + + + + + Quantiles + + + + + + + + Empty + + + + + QgsGraduatedSymbolDialogBase + + + graduated Symbol + + + + + Classification field + + + + + Mode + + + + + Number of classes + + + + + Classify + + + + + Delete class + + + + + QgsGraduatedSymbolRendererV2Model + + + Symbol + + + + + Value + + + + + Label + + + + + QgsGraduatedSymbolRendererV2Widget + + + Column + + + + + Symbol + + + + + change + + + + + Classes + + + + + Color ramp + + + + + Mode + + + + + Equal Interval + + + + + Quantile + + + + + Natural Breaks (Jenks) + + + + + Standard Deviation + + + + + Pretty Breaks + + + + + Classify + + + + + Add class + + + + + Delete + + + + + Delete all + + + + + Advanced + + + + + Symbol levels... + + + + + + + Error + + + + + There are no available color ramps. You can add them in Style Manager. + + + + + The selected color ramp is not available. + + + + + Renderer creation has failed. + + + + + QgsGrassAttributes + + + Column + + + + + Value + + + + + Type + + + + + Layer + + + + + Warning + + + + + ERROR + + + + + OK + + + + + QgsGrassAttributesBase + + + GRASS Attributes + + + + + Tab 1 + + + + + result + + + + + Update database record + + + + + Update + + + + + Add new category using settings in GRASS Edit toolbox + + + + + New + + + + + Delete selected category + + + + + Delete + + + + + QgsGrassBrowser + + + Tools + + + + + Add selected map to canvas + + + + + Copy selected map + + + + + Rename selected map + + + + + Delete selected map + + + + + Set current region to selected map + + + + + Refresh + + + + + + New name + + + + + + New name for layer "%1" + + + + + + + + Warning + + + + + Cannot copy map %1@%2 + + + + + + + <br>command: %1 %2<br>%3<br>%4 + + + + + Cannot rename map %1 + + + + + Information + + + + + Remove the selected layer(s) from QGis canvas before continue. + + + + + Question + + + + + Are you sure you want to delete %n selected layer(s)? + number of layers to delete + + + + + + + + Cannot delete map %1 + + + + + Cannot write new region + + + + + QgsGrassEdit + + + + + + + + + + + + + Warning + + + + + You are not owner of the mapset, cannot open the vector for editing. + + + + + Cannot open vector for update. + + + + + Edit tools + + + + + New point + + + + + New line + + + + + New boundary + + + + + New centroid + + + + + Move vertex + + + + + Add vertex + + + + + Delete vertex + + + + + Move element + + + + + Split line + + + + + Delete element + + + + + Edit attributes + + + + + Close + + + + + Background + + + + + Highlight + + + + + Dynamic + + + + + Point + + + + + Line + + + + + Boundary (no area) + + + + + Boundary (1 area) + + + + + Boundary (2 areas) + + + + + Centroid (in area) + + + + + Centroid (outside area) + + + + + Centroid (duplicate in area) + + + + + Node (1 line) + + + + + Node (2 lines) + + + + + Next not used + + + + + Manual entry + + + + + No category + + + + + Info + + + + + The table was created + + + + + Tool not yet implemented. + + + + + Cannot check orphan record: %1 + + + + + Orphan record was left in attribute table. <br>Delete the record? + + + + + Cannot delete orphan record: + + + + + Cannot describe table for field %1 + + + + + Left: %1 + + + + + -- Middle: %1 + + + + + -- Right: %1 + + + + + QgsGrassEditAddVertex + + + + + + Select line segment + + + + + New vertex position + + + + + Release + + + + + QgsGrassEditAttributes + + + Select element + + + + + QgsGrassEditBase + + + GRASS Edit + + + + + + Category + + + + + Mode + + + + + + Layer + + + + + Settings + + + + + Snapping in screen pixels + + + + + Symbology + + + + + Line width + + + + + Marker size + + + + + Disp + + + + + Color + + + + + + Type + + + + + Index + + + + + Table + + + + + Column + + + + + Length + + + + + Add Column + + + + + Create / Alter Table + + + + + QgsGrassEditDeleteLine + + + + + Select element + + + + + Delete selected / select next + + + + + Release selected + + + + + QgsGrassEditDeleteVertex + + + + + + Select vertex + + + + + Delete vertex + + + + + Release vertex + + + + + QgsGrassEditMoveLine + + + + + + Select element + + + + + New location + + + + + Release selected + + + + + QgsGrassEditMoveVertex + + + + + Select vertex + + + + + Select new position + + + + + QgsGrassEditNewLine + + + + + + + New vertex + + + + + + Undo last vertex + + + + + Close line + + + + + QgsGrassEditNewPoint + + + New centroid + + + + + New point + + + + + QgsGrassEditSplitLine + + + + Select position on line + + + + + Split the line + + + + + Release the line + + + + + + Select point on line + + + + + QgsGrassElementDialog + + + Cancel + + + + + Ok + + + + + <font color='red'>Enter a name!</font> + + + + + <font color='red'>This is name of the source!</font> + + + + + <font color='red'>Exists!</font> + + + + + Overwrite + + + + + QgsGrassMapcalc + + + Mapcalc tools + + + + + Add map + + + + + Add constant value + + + + + Add operator or function + + + + + Add connection + + + + + Select item + + + + + Delete selected item + + + + + Open + + + + + Save + + + + + Save as + + + + + Addition + + + + + Subtraction + + + + + Multiplication + + + + + Division + + + + + Modulus + + + + + Exponentiation + + + + + Equal + + + + + Not equal + + + + + Greater than + + + + + Greater than or equal + + + + + Less than + + + + + Less than or equal + + + + + And + + + + + Or + + + + + Absolute value of x + + + + + Inverse tangent of x (result is in degrees) + + + + + Inverse tangent of y/x (result is in degrees) + + + + + Current column of moving window (starts with 1) + + + + + Cosine of x (x is in degrees) + + + + + Convert x to double-precision floating point + + + + + Current east-west resolution + + + + + Exponential function of x + + + + + x to the power y + + + + + Convert x to single-precision floating point + + + + + Decision: 1 if x not zero, 0 otherwise + + + + + Decision: a if x not zero, 0 otherwise + + + + + Decision: a if x not zero, b otherwise + + + + + Decision: a if x > 0, b if x is zero, c if x < 0 + + + + + Convert x to integer [ truncates ] + + + + + Check if x = NULL + + + + + Natural log of x + + + + + Log of x base b + + + + + + Largest value + + + + + + Median value + + + + + + Smallest value + + + + + + Mode value + + + + + 1 if x is zero, 0 otherwise + + + + + Current north-south resolution + + + + + NULL value + + + + + Random value between a and b + + + + + Round x to nearest integer + + + + + Current row of moving window (Starts with 1) + + + + + Sine of x (x is in degrees) + sin(x) + + + + + Square root of x + sqrt(x) + + + + + Tangent of x (x is in degrees) + tan(x) + + + + + Current x-coordinate of moving window + + + + + Current y-coordinate of moving window + + + + + + Output + + + + + + + + + + + + + + + Warning + + + + + + Cannot get current region + + + + + Cannot check region of map %1 + + + + + Cannot get region of map %1 + + + + + No GRASS raster maps currently in QGIS + + + + + Cannot create 'mapcalc' directory in current mapset. + + + + + New mapcalc + + + + + Enter new mapcalc name: + + + + + Enter vector name + + + + + The file already exists. Overwrite? + + + + + + Save mapcalc + + + + + File name empty + + + + + Cannot open mapcalc file + + + + + The mapcalc schema (%1) not found. + + + + + Cannot open mapcalc schema (%1) + + + + + Cannot read mapcalc schema (%1): + + + + + +%1 +at line %2 column %3 + + + + + QgsGrassMapcalcBase + + + MainWindow + + + + + Output + + + + + QgsGrassModule + + + Module: %1 + + + + + + + + + + + + + + + Warning + + + + + The module file (%1) not found. + + + + + Cannot open module file (%1) + + + + + + Cannot read module file (%1) + + + + + + +%1 +at line %2 column %3 + + + + + Module %1 not found + + + + + Cannot find man page %1 + + + + + Please ensure you have the GRASS documentation installed. + + + + + Not available, description not found (%1) + + + + + Not available, cannot open description (%1) + + + + + Not available, incorrect description (%1) + + + + + + Run + + + + + + Cannot get input region + + + + + Input %1 outside current region! + + + + + Use Input Region + + + + + Output %1 exists! Overwrite? + + + + + Cannot find module %1 + + + + + Cannot start module: %1 + + + + + Stop + + + + + <B>Successfully finished</B> + + + + + <B>Finished with error</B> + + + + + <B>Module crashed or killed</B> + + + + + QgsGrassModuleBase + + + GRASS Module + + + + + Options + + + + + Output + + + + + Manual + + + + + TextLabel + + + + + Run + + + + + View output + + + + + Close + + + + + QgsGrassModuleField + + + Attribute field + + + + + Warning + + + + + 'layer' attribute in field tag with key= %1 is missing. + + + + + QgsGrassModuleFile + + + File + + + + + %1:&nbsp;missing value + + + + + %1:&nbsp;directory does not exist + + + + + QgsGrassModuleGdalInput + + + OGR/PostGIS/GDAL Input + + + + + + + Warning + + + + + Cannot find layeroption %1 + + + + + Cannot find whereoption %1 + + + + + Password + + + + + Select a layer + + + + + PostGIS driver in OGR does not support schemas!<br>Only the table name will be used.<br>It can result in wrong input if more tables of the same name<br>are present in the database. + + + + + %1:&nbsp;no input + + + + + QgsGrassModuleInput + + + Input + + + + + + + + Warning + + + + + Cannot find typeoption %1 + + + + + Cannot find values for typeoption %1 + + + + + Cannot find layeroption %1 + + + + + GRASS element %1 not supported + + + + + Use region of this map + + + + + Select a layer + + + + + %1:&nbsp;no input + + + + + QgsGrassModuleOption + + + + Warning + + + + + Cannot parse version_min %1 + + + + + Cannot parse version_max %1 + + + + + %1:&nbsp;missing value + + + + + QgsGrassModuleSelection + + + Selected categories + + + + + QgsGrassModuleStandardOptions + + + + + + + + + + + + Warning + + + + + Cannot find module %1 + + + + + Cannot start module %1 + + + + + <br>command: %1 %2<br>%3<br>%4 + + + + + Cannot read module description (%1): + + + + + +%1 +at line %2 column %3 + + + + + Cannot find key %1 + + + + + << Hide advanced options + + + + + Show advanced options >> + + + + + Item with key %1 not found + + + + + Item with id %1 not found + + + + + + Cannot get current region + + + + + Cannot check region of map %1 + + + + + Cannot set region of map %1 + + + + + QgsGrassNewMapset + + + Database + + + + + Location 1 + + + + + + System mapset + + + + + + + User's mapset + + + + + Location 2 + + + + + Enter path to GRASS database + + + + + The directory doesn't exist! + + + + + No writable locations, the database is not writable! + + + + + Enter location name! + + + + + The location exists! + + + + + Selected projection is not supported by GRASS! + + + + + + + + + + + + + + + Warning + + + + + Cannot create projection. + + + + + Cannot reproject previously set region, default region set. + + + + + North must be greater than south + + + + + East must be greater than west + + + + + Regions file (%1) not found. + + + + + Cannot open locations file (%1) + + + + + Cannot read locations file (%1): + + + + + +%1 +at line %2 column %3 + + + + + + + + Cannot create QgsCoordinateReferenceSystem + + + + + Cannot reproject selected region. + + + + + Cannot reproject region + + + + + Enter mapset name. + + + + + The mapset already exists + + + + + Database: + + + + + Location: + + + + + Mapset: + + + + + Create location + + + + + Cannot create new location: %1 + + + + + + + Create mapset + + + + + Cannot create new mapset directory + + + + + Cannot open DEFAULT_WIND + + + + + Cannot open WIND + + + + + + New mapset + + + + + New mapset successfully created, but cannot be opened: %1 + + + + + New mapset successfully created and set as current working mapset. + + + + + QgsGrassNewMapsetBase + + + New Mapset + + + + + GRASS Database + + + + + Tree + + + + + Comment + + + + + Example directory tree: + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">GRASS data are stored in tree directory structure. The GRASS database is the top-level directory in this tree structure.</p></body></html> + + + + + Database Error + + + + + + Database: + + + + + Browse... + + + + + Select existing directory or create a new one: + + + + + GRASS Location + + + + + Location + + + + + Select location + + + + + Create new location + + + + + Location Error + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">The GRASS location is a collection of maps for a particular territory or project.</p></body></html> + + + + + + Projection + + + + + Projection Error + + + + + Coordinate system + + + + + Not defined + + + + + Default GRASS Region + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">The GRASS region defines a workspace for raster modules. The default region is valid for one location. It is possible to set a different region in each mapset. It is possible to change the default location region later.</p></body></html> + + + + + Set current QGIS extent + + + + + Set + + + + + Region Error + + + + + S + + + + + W + + + + + E + + + + + N + + + + + + Mapset + + + + + New mapset: + + + + + Mapset Error + + + + + <p align="center">Existing masets</p> + + + + + Owner + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">The GRASS mapset is a collection of maps used by one user. A user can read maps from all mapsets in the location but he can open for writing only his mapset (owned by user).</p></body></html> + + + + + Create New Mapset + + + + + Location: + + + + + Mapset: + + + + + QgsGrassPlugin + + + GrassVector + + + + + 0.1 + + + + + GRASS layer + + + + + Plugins + + + + + Open mapset + + + + + New mapset + + + + + Close mapset + + + + + Add GRASS vector layer + + + + + Add GRASS raster layer + + + + + + Open GRASS tools + + + + + Display Current Grass Region + + + + + Edit Current Grass Region + + + + + Edit Grass Vector layer + + + + + Create new Grass Vector + + + + + Adds a GRASS vector layer to the map canvas + + + + + Adds a GRASS raster layer to the map canvas + + + + + Displays the current GRASS region as a rectangle on the map canvas + + + + + Edit the current GRASS region + + + + + Edit the currently selected GRASS vector layer. + + + + + + + + + + + + + + + + + + + + + + + + &GRASS + + + + + GRASS + + + + + + + + + + + + + + + + + + + Warning + + + + + Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module). + + + + + Cannot open vector %1 in mapset %2 + + + + + Cannot open GRASS vector: + %1 + + + + + + GRASS Edit is already running. + + + + + + New vector name + + + + + Cannot create new vector: %1 + + + + + New vector created but cannot be opened by data provider. + + + + + Cannot start editing. + + + + + Cannot open vector for update. + + + + + GISDBASE, LOCATION_NAME or MAPSET is not set, cannot display current region. + + + + + Cannot read current region: %1 + + + + + Cannot open the mapset. %1 + + + + + Cannot close mapset. %1 + + + + + Cannot close current mapset. %1 + + + + + Cannot open GRASS mapset. %1 + + + + + QgsGrassProvider + + + GRASS vector map %1 does not have topology. Build topology? + + + + + QgsGrassRasterProvider + + + cellhd file %1 does not exist + + + + + Groups not yet supported + + + + + QgsGrassRegion + + + + + Warning + + + + + GISDBASE, LOCATION_NAME or MAPSET is not set, cannot display current region. + + + + + Cannot read current region: %1 + + + + + Cannot write region + + + + + QgsGrassRegionBase + + + GRASS Region Settings + + + + + Extent + + + + + North + + + + + West + + + + + East + + + + + South + + + + + Select the extent by dragging on canvas +or change the following values + + + + + Resolution + + + + + Cell width + + + + + Cell height + + + + + Columns + + + + + Rows + + + + + Border + + + + + Color + + + + + Width + + + + + QgsGrassSelect + + + Select GRASS Vector Layer + + + + + Select GRASS Raster Layer + + + + + Select GRASS mapcalc schema + + + + + Select GRASS Mapset + + + + + Choose existing GISDBASE + + + + + Wrong GISDBASE, no locations available. + + + + + Wrong GISDBASE + + + + + Select a map. + + + + + No map + + + + + No layer + + + + + No layers available in this map + + + + + QgsGrassSelectBase + + + Add GRASS Layer + + + + + Gisdbase + + + + + Location + + + + + Mapset + + + + + Map name + + + + + Select or type map name (wildcards '*' and '?' accepted for rasters) + + + + + Layer + + + + + Browse... + + + + + QgsGrassShell + + + Ctrl+Shift+V + + + + + Ctrl+Shift+C + + + + + + Warning + + + + + + Cannot rename the lock file %1 + + + + + QgsGrassTools + + + GRASS Tools + + + + + + GRASS Tools: %1/%2 + + + + + Browser + + + + + Cannot start command shell (%1) + + + + + + + + Warning + + + + + GRASS Shell is not compiled. + + + + + The config file (%1) not found. + + + + + Cannot open config file (%1). + + + + + Cannot read config file (%1): + + + + + +%1 +at line %2 column %3 + + + + + QgsGrassToolsBase + + + Grass Tools + + + + + Modules Tree + + + + + 1 + + + + + Modules List + + + + + Filter + + + + + QgsHandleBadLayers + + + Browse + + + + + Layer name + + + + + Type + + + + + Provider + + + + + New file + + + + + New datasource + + + + + none + + + + + Select file to replace '%1' + + + + + Please select exactly one file. + + + + + Select new directory of selected files + + + + + All files (*) + + + + + + Unhandled layer will be lost. + + + + + + There are still %n unhandled layer(s), that will be lost if you closed now. + unhandled layers + + + + + + + + QgsHandleBadLayersBase + + + Handle bad layers + + + + + Layer name + + + + + Type + + + + + Provider + + + + + Original filename + + + + + New filename + + + + + Original datasource + + + + + New datasource + + + + + QgsHelpViewer + + + <h3>Oops! QGIS can't find help for this form.</h3>The help file for %1 was not found for your language<br>If you would like to create it, contact the QGIS development team + + + + + Quantum GIS Help + + + + + Quantum GIS Help - %1 + + + + + + Error + + + + + Failed to get the help text from the database: + %1 + + + + + The QGIS help database is not installed + + + + + QgsHelpViewerBase + + + + QGIS Help + + + + + about:blank + + + + + &Home + + + + + Alt+H + + + + + &Forward + + + + + Alt+F + + + + + &Back + + + + + Alt+B + + + + + &Close + + + + + Alt+C + + + + + QgsHtmlAnnotationDialog + + + Delete + + + + + html + + + + + QgsHttpTransaction + + + WMS Server responded unexpectedly with HTTP Status Code %1 (%2) + + + + + Received %1 of %2 bytes + + + + + Received %1 bytes (total unknown) + + + + + HTTP response completed, however there was an error: %1 + + + + + HTTP transaction completed, however there was an error: %1 + + + + + Not connected + + + + + Looking up '%1' + + + + + Connecting to '%1' + + + + + Sending request '%1' + + + + + Receiving reply + + + + + Response is complete + + + + + Closing down connection + + + + + Network timed out after %n second(s) of inactivity. +This may be a problem in your network connection or at the WMS server. + inactivity timeout + + + + + + + + QgsIDWInterpolatorDialogBase + + + Dialog + + + + + Distance coefficient P + + + + + QgsIdentifyResults + + + Identify Results + + + + + Feature + + + + + Value + + + + + + (Derived) + + + + + (Actions) + + + + + + + Edit feature form + + + + + + + View feature form + + + + + Print + + + + + Zoom to feature + + + + + Copy attribute value + + + + + Copy feature attributes + + + + + Clear results + + + + + Clear highlights + + + + + Highlight all + + + + + Highlight layer + + + + + Layer properties... + + + + + Expand all + + + + + Collapse all + + + + + Attribute changes + + + + + Could not open url + + + + + Could not open URL '%1' + + + + + QgsIdentifyResultsBase + + + Identify Results + + + + + Expand tree. + + + + + + + + ... + + + + + Collapse tree. + + + + + New results will be expanded by default. + + + + + Print selected HTML response. + + + + + QgsImageWarper + + + Progress indication + + + + + QgsInterpolationDialog + + + + Triangular interpolation (TIN) + + + + + + Inverse Distance Weighting (IDW) + + + + + No input data for interpolation + + + + + Please add one or more input layers + + + + + Output file name invalid + + + + + Please enter a valid output file name + + + + + + Break lines + + + + + + Structure lines + + + + + Points + + + + + Save interpolated raster as... + + + + + QgsInterpolationDialogBase + + + Interpolation plugin + + + + + Input + + + + + Vector layers + + + + + Interpolation attribute + + + + + Use z-Coordinate for interpolation + + + + + Add + + + + + Remove + + + + + Vector layer + + + + + Attribute + + + + + Type + + + + + Output + + + + + Interpolation method + + + + + + ... + + + + + Number of columns + + + + + Number of rows + + + + + Cellsize X + + + + + Cellsize Y + + + + + X min + + + + + X max + + + + + Y min + + + + + Y max + + + + + Set to current extent + + + + + Output file + + + + + Add result to project + + + + + QgsInterpolationPlugin + + + + + &Interpolation + + + + + QgsItemPositionDialogBase + + + Set item position + + + + + Item reference point + + + + + Coordinates + + + + + x + + + + + y + + + + + Width + + + + + Height + + + + + Set Position + + + + + Close + + + + + QgsLUDialogBase + + + Enter class bounds + + + + + Lower value + + + + + Upper value + + + + + QgsLabelDialog + + + Auto + + + + + QgsLabelDialogBase + + + Form1 + + + + + Label Properties + + + + + + Placement + + + + + Below Right + + + + + Right + + + + + Below + + + + + Over + + + + + Above + + + + + Left + + + + + Below Left + + + + + Above Right + + + + + Above Left + + + + + Use scale dependent rendering + + + + + Maximum + + + + + Minimum + + + + + Buffer labels + + + + + Buffer size + + + + + + + In points + + + + + + + In map units + + + + + + Color + + + + + % + + + + + Transparency + + + + + Offset + + + + + X offset + + + + + Y offset + + + + + Basic label options + + + + + Field containing label + + + + + Default label + + + + + Font size + + + + + + Angle (deg) + + + + + ° + + + + + Font + + + + + Multiline labels? + + + + + Label only selected features + + + + + Advanced + + + + + Data defined placement + + + + + Data defined properties + + + + + &Font family + + + + + &Bold + + + + + &Italic + + + + + &Underline + + + + + &Size + + + + + Size units + + + + + &Color + + + + + Strikeout + + + + + Data defined buffer + + + + + Transparency: + + + + + Size: + + + + + Data defined position + + + + + X Coordinate + + + + + Y Coordinate + + + + + X Offset (pts) + + + + + Y Offset (pts) + + + + + Preview: + + + + + QGIS Rocks! + + + + + QgsLabelPropertyDialog + + + + Label font + + + + + Font color + + + + + Buffer color + + + + + QgsLabelPropertyDialogBase + + + Label properties + + + + + Text + + + + + + Font + + + + + + Size + + + + + Display + + + + + Scale-based + + + + + Min + + + + + Max + + + + + Show label + + + + + Ignores priority and permits collisions/overlaps + + + + + Always show (exceptions above) + + + + + Buffer + + + + + Position + + + + + Label distance + + + + + X Coordinate + + + + + Y Coordinate + + + + + Horizontal alignment + + + + + Vertical alignment + + + + + Rotation + + + + + QgsLabelingGui + + + (not found!) + + + + + Sample @ %1 pts (using map units) + + + + + Sample @ %1 pts (using map units, BUFFER IN MILLIMETERS) + + + + + Sample + + + + + Sample (BUFFER NOT SHOWN, in map units) + + + + + Expression based label + + + + + Mixed Case + + + + + All Uppercase + + + + + All Lowercase + + + + + Title Case + + + + + QgsLabelingGuiBase + + + Layer labeling settings + + + + + Label this layer with + + + + + Expression + + + + + + + + + + + + ... + + + + + Label settings + + + + + Sample + + + + + + Lorem Ipsum + + + + + Sample text + + + + + Reset sample text + + + + + Size for sample text in map units + + + + + Sample background color + + + + + Formatted numbers + + + + + Decimal places + + + + + Show plus sign + + + + + Multiple lines + + + + + Wrap on character + + + + + + Line height + + + + + Line height spacing for multi-line text + + + + + line + + + + + Alignment + + + + + Paragraph style alignment of multi-line text + + + + + + Left + + + + + Center + + + + + + Right + + + + + Text style + + + + + Available typeface styles + + + + + Underlined Text + + + + + U + + + + + Strikeout text + + + + + S + + + + + points + + + + + + + map units + + + + + Style + + + + + + + Transparency + + + + + + % + + + + + TextLabel + + + + + Capitalization style of text + + + + + + Word spacing + + + + + + Letter spacing + + + + + + Space in pixels or map units, relative to size unit choice + + + + + Type case + + + + + Font + + + + + + + Color + + + + + + + Size + + + + + Buffer + + + + + + mm + + + + + Pen Join style + + + + + Color area inside of pen stroke + + + + + Pixel size-based visibility + + + + + Labels will not show if larger than this on screen + + + + + + px + + + + + + Maximum + + + + + Labels will not show if smaller than this on screen + + + + + + Minimum + + + + + + + + + < + + + + + Label in Map Units + + + + + Scale-based visibility + + + + + + Label + + + + + Line direction symbols + + + + + Symbol(s) + + + + + > + + + + + + Placement + + + + + left/right + + + + + above + + + + + below + + + + + Reverse direction + + + + + Advanced + + + + + Priority + + + + + Low + + + + + High + + + + + Around point + + + + + Offset from point + + + + + Parallel + + + + + Curved + + + + + Horizontal + + + + + Offset from centroid + + + + + Around centroid + + + + + Horizontal (slow) + + + + + Free (slow) + + + + + Using perimeter + + + + + Centroid of + + + + + visible polygon + + + + + whole polygon + + + + + + In mm + + + + + + In map units + + + + + + degrees + + + + + + + Rotation + + + + + + + Label distance + + + + + Above line + + + + + On line + + + + + Below line + + + + + Line orientation dependent position + + + + + outside + + + + + inside + + + + + Maximum angle between curved characters + + + + + X + + + + + Y + + + + + Above Right + + + + + Above Left + + + + + Over + + + + + Above + + + + + Below Left + + + + + Below + + + + + Below Right + + + + + Options + + + + + Merge connected lines to avoid duplicate labels + + + + + Label every part of multi-part features + + + + + Suppress labeling of features smaller than + + + + + mm + + + + + Features don't act as obstacles for labels + + + + + Automated placement settings + + + + + Show all labels for this layer (including colliding labels) + + + + + Show upside-down labels + + + + + never + + + + + when rotation defined + + + + + always + + + + + Limit number of features to be labeled to + + + + + Number of features sent to labeling engine, though not all may be labeled + + + + + Data defined settings + + + + + Buffer properties + + + + + Buffer size + + + + + Buffer color + + + + + Buffer transparency + + + + + Position + + + + + X Coordinate + + + + + Y Coordinate + + + + + Horizontal alignment + + + + + Vertical alignment + + + + + Uncheck to write labeling engine derived rotation on pin and NULL on unpin + + + + + Preserve existing rotation values during label pin/unpin operations + + + + + Display properties + + + + + Always show + + + + + Minimum scale + + + + + Show label + + + + + Maximum scale + + + + + Font properties + + + + + Bold + + + + + Italic + + + + + Underline + + + + + Strikeout + + + + + Font family + + + + + Capitalization + + + + + Multi-line align + + + + + Add label columns to attribute table + + + + + About data defined values + + + + + QgsLayerPropertiesWidget + + + Outline: %1 + + + + + QgsLegend + + + + sub-group + + + + + + group + + + + + Legend context + + + + + &Make to Toplevel Item + + + + + Zoom to Group + + + + + &Remove + + + + + &Set Group CRS + + + + + Re&name + + + + + &Group Selected + + + + + Copy Style + + + + + Paste Style + + + + + &Add New Group + + + + + &Expand All + + + + + &Collapse All + + + + + &Update Drawing Order + + + + + QgsLegendLayer + + + &Zoom to Layer Extent + + + + + &Zoom to Best Scale (100%) + + + + + &Stretch Using Current Extent + + + + + &Show in Overview + + + + + &Remove + + + + + &Duplicate + + + + + &Set Layer CRS + + + + + Set &Project CRS from Layer + + + + + &Open Attribute Table + + + + + + Save As... + + + + + Save Selection As... + + + + + &Query... + + + + + Show Feature Count + + + + + &Properties + + + + + Updating feature count for layer %1 + + + + + Abort + + + + + QgsLegendModel + + + Group + + + + + QgsManageConnectionsDialog + + + Select all + + + + + Clear selection + + + + + Select connections to import + + + + + Import + + + + + Export + + + + + Export/import error + + + + + You should select at least one connection from list. + + + + + Save connections + + + + + XML files (*.xml *.XML) + + + + + Saving connections + + + + + Cannot write file %1: +%2. + + + + + + + + + + + + + + + + + + + + + Loading connections + + + + + + Cannot read file %1: +%2. + + + + + + Parse error at line %1, column %2: +%3 + + + + + The file is not an WMS connections exchange file. + + + + + + The file is not an WFS connections exchange file. + + + + + The file is not an WCS connections exchange file. + + + + + + + The file is not an PostGIS connections exchange file. + + + + + The file is not an MSSQL connections exchange file. + + + + + The file is not an %1 connections exchange file. + + + + + + + + Connection with name '%1' already exists. Overwrite? + + + + + QgsManageConnectionsDialogBase + + + Manage connections + + + + + Select connections to export + + + + + QgsMapCanvas + + + Could not draw %1 because: +%2 + COMMENTED OUT + + + + + Could not draw %1 because: +%2 + + + + + QgsMapCoordsDialog + + + From map canvas + + + + + QgsMapCoordsDialogBase + + + Enter map coordinates + + + + + Enter X and Y coordinates (DMS (dd mm ss.ss), DD (dd.dd) or projected coordinates (mmmm.mm)) which correspond with the selected point on the image. Alternatively, click the button with icon of a pencil and then click a corresponding point on map canvas of QGIS to fill in coordinates of that point. + + + + + X / East: + + + + + Y / North: + + + + + Snap to background layers + + + + + QgsMapLayer + + + + Specify CRS for layer %1 + + + + + + + %1 at line %2 column %3 + + + + + style not found in database + + + + + Error: qgis element could not be found in %1 + + + + + + Loading style file %1 failed because: +%2 + + + + + + + Could not save symbology because: +%1 + + + + + + The directory containing your dataset needs to be writable! + + + + + + Created default style file as %1 + + + + + ERROR: Failed to created default style file as %1. Check file permissions and retry. + + + + + User database could not be opened. + + + + + The style table could not be created. + + + + + The style %1 was saved to database + + + + + The style %1 was updated in the database. + + + + + The style %1 could not be updated in the database. + + + + + The style %1 could not be inserted into database. + + + + + ERROR: Failed to created SLD style file as %1. Check file permissions and retry. + + + + + Unable to open file %1 + + + + + QgsMapRenderer + + + + Transform error caught: %1 + + + + + + CRS + + + + + QgsMapToolAddFeature + + + add feature + + + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer cannot be added to + + + + + The data provider for this layer does not support the addition of features. + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + + + Wrong editing tool + + + + + Cannot apply the 'capture point' tool on this vector layer + + + + + + Coordinate transform error + + + + + + Cannot transform the point to the layers coordinate system + + + + + + Feature added + + + + + Cannot apply the 'capture line' tool on this vector layer + + + + + Cannot apply the 'capture polygon' tool on this vector layer + + + + + + + + Error + + + + + + Cannot add feature. Unknown WKB type + + + + + The feature could not be added because removing the polygon intersections would change the geometry type + + + + + An error was reported during intersection removal + + + + + QgsMapToolAddPart + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + + No feature selected. Please select a feature with the selection tool or in the attribute table + + + + + Several features are selected. Please select only one feature to which an part should be added. + + + + + Error. Could not add part. + + + + + + Part added + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Selected feature is not multi part. + + + + + New part's geometry is not valid. + + + + + New polygon ring not disjoint with existing polygons. + + + + + Several features are selected. Please select only one feature to which an island should be added. + + + + + Selected geometry could not be found + + + + + Error, could not add part + + + + + QgsMapToolAddRing + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Ring added + + + + + A problem with geometry type occured + + + + + The inserted Ring is not closed + + + + + The inserted Ring is not a valid geometry + + + + + The inserted Ring crosses existing rings + + + + + The inserted Ring is not contained in a feature + + + + + An unknown error occured + + + + + Error, could not add ring + + + + + QgsMapToolAddVertex + + + Added vertex + + + + + QgsMapToolCapture + + + Validation started. + + + + + Validation finished. + + + + + QgsMapToolChangeLabelProperties + + + Label properties changed + + + + + QgsMapToolDeletePart + + + + Delete part + + + + + This isn't a multipart geometry. + + + + + Part of multipart feature deleted + + + + + Couldn't remove the selected part. + + + + + QgsMapToolDeleteRing + + + Ring deleted + + + + + QgsMapToolDeleteVertex + + + Vertex deleted + + + + + QgsMapToolFeatureAction + + + No active vector layer + + + + + To run an action, you must choose a vector layer by clicking on its name in the legend + + + + + No actions available + + + + + The active vector layer has no defined actions + + + + + No features at this position found. + + + + + QgsMapToolIdentify + + + No active layer + + + + + To identify features, you must choose an active layer by clicking on its name in the legend + + + + + Identifying on %1... + + + + + Identifying done. + + + + + No features at this position found. + + + + + + (clicked coordinate) + + + + + Length + + + + + firstX + attributes get sorted; translation for lastX should be lexically larger than this one + + + + + firstY + + + + + lastX + attributes get sorted; translation for firstX should be lexically smaller than this one + + + + + lastY + + + + + Area + + + + + Perimeter + + + + + feature id + + + + + new feature + + + + + Raster + + + + + QgsMapToolMoveFeature + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Feature moved + + + + + QgsMapToolMoveLabel + + + Label moved + + + + + QgsMapToolMoveVertex + + + Vertex moved + + + + + QgsMapToolNodeTool + + + Inserted vertex + + + + + QgsMapToolOffsetCurve + + + Offset curve + + + + + Offset: + + + + + Geometry error + + + + + Creating offset geometry failed + + + + + QgsMapToolPinLabels + + + Label pinned + + + + + Label unpinned + + + + + QgsMapToolReshape + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Reshape + + + + + QgsMapToolRotateLabel + + + Label rotated + + + + + QgsMapToolRotatePointSymbols + + + No point feature + + + + + No point feature was detected at the clicked position. Please click closer to the feature or enhance the search tolerance under Settings->Options->Digitizing->Serch radius for vertex edits + + + + + No rotation Attributes + + + + + The active point layer does not have a rotation attribute + + + + + Rotate symbol + + + + + QgsMapToolShowHideLabels + + + Label hidden + + + + + Label shown + + + + + QgsMapToolSimplify + + + Geometry simplified + + + + + + Unsupported operation + + + + + Multipart features are not supported for simplification. + + + + + This feature cannot be simplified. Check if feature has enough vertices to be simplified. + + + + + QgsMapToolSplitFeatures + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Features split + + + + + + + No feature split done + + + + + If there are selected features, the split tool only applies to the selected ones. If you like to split all features under the split line, clear the selection + + + + + Cut edges detected. Make sure the line splits features into multiple parts. + + + + + The geometry is invalid. Please repair before trying to split it. + + + + + Split error + + + + + An error occured during feature splitting + + + + + QgsMapToolVertexEdit + + + Snap tolerance + + + + + Don't show this message again + + + + + Could not snap segment. + + + + + Have you set the tolerance in Settings > Project Properties > General? + + + + + QgsMapserverExportBase + + + MapServer Export: Save project to MapFile + + + + + Use current project + + + + + Full path to the QGIS project file to export to MapServer map format + + + + + + + + Browse... + + + + + + Map file + + + + + Name for the map file to be created from the QGIS project file + + + + + Save As... + + + + + If checked, only the layer information will be processed + + + + + LAYER information only + + + + + Map + + + + + Name + + + + + Prefix attached to map, scalebar and legend GIF filenames created using this MapFile + + + + + Image type + + + + + Rendering + + + + + Width + + + + + Height + + + + + Units + + + + + MapServer url + + + + + The URL to the mapserver executable. + +For example: +http://my.host.com/cgi-bin/mapserv.exe + + + + + Paths + + + + + Inline + + + + + Symbolset + + + + + Use templates + + + + + Path to the MapServer template file + + + + + The file name of the fonts file. + + + + + Fontset + + + + + The file name of the symbols file. + + + + + Template + + + + + Header + + + + + Footer + + + + + Layer/label options + + + + + Forces labels on, regardless of collisions. Available only for cached labels. + + + + + Force + + + + + Should text be antialiased? Note that this requires more available colors, decreases drawing performance, and results in slightly larger output images. + + + + + Anti-alias + + + + + Can text run off the edge of the map? + + + + + Partials + + + + + Check to allow MapServer to return data in GML format. Useful when used with WMS GetFeatureInfo operations. + + + + + Dump + + + + meters + + + + dd + + + + feet + + + + miles + + + + inches + + + + kilometers + + + + + QgsMeasureBase + + + Measure + + + + + Total + + + + + Segments + + + + + QgsMeasureDialog + + + &New + + + + + The calculations are based on: + + + + + Project CRS transformation is turned off. + + + + + Canvas units setting is taken from project properties setting (%1). + + + + + Ellipsoidal calculation is not possible, as project CRS is undefined. + + + + + Project CRS transformation is turned on and ellipsoidal calculation is selected. + + + + + The coordinates are transformed to the chosen ellipsoid (%1), and the result is in meters + + + + + Project CRS transformation is turned on but ellipsoidal calculation is not selected. + + + + + The canvas units setting is taken from the project CRS (%1). + + + + + Finally, the value is converted from %2 to %3. + + + + + Segments [%1] + + + + + QgsMeasureTool + + + Incorrect measure results + + + + + <p>This map is defined with a geographic coordinate system (latitude/longitude) but the map extents suggests that it is actually a projected coordinate system (e.g., Mercator). If so, the results from line or area measurements will be incorrect.</p><p>To fix this, explicitly set an appropriate map coordinate system using the <tt>Settings:Project Properties</tt> menu. + + + + + QgsMemoryProvider + + + Whole number (integer) + + + + + Decimal number (real) + + + + + Text (string) + + + + + QgsMergeAttributesDialog + + + Id + + + + + Merge + + + + + + + feature %1 + + + + + + Minimum + + + + + + Maximum + + + + + + Median + + + + + + Sum + + + + + + Concatenation + + + + + + Mean + + + + + + + Skip attribute + + + + + Skipped + + + + + QgsMergeAttributesDialogBase + + + Merge feature attributes + + + + + Take attributes from selected feature + + + + + Remove feature from selection + + + + + QgsMessageBar + + + Remaining messages + + + + + Close all + + + + + Close + + + + + more + + + + + QgsMessageLogViewer + + + QGIS Log + + + + + No messages. + + + + + + %1 message(s) logged. + + + + + General + + + + + Timestamp + + + + + Message + + + + + Level + + + + + QgsMessageViewer + + + QGIS Message + + + + + Don't show this message again + + + + + QgsMssqlConnectionItem + + + Edit... + + + + + Delete + + + + + %1: Not a vector layer! + + + + + + %1: OK! + + + + + + Import to MSSQL database + + + + + Failed to import some layers! + + + + + + + Import was successful. + + + + + QgsMssqlNewConnection + + + Saving passwords + + + + + WARNING: You have opted to save your password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. + + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + + + + Test connection + + + + + Connection failed - Host name hasn't been specified. + + + + + + + Connection failed - Database name hasn't been specified. + + + + + + + Connection to %1 was successful + + + + + QgsMssqlNewConnectionBase + + + Create a New MSSQL connection + + + + + Connection Information + + + + + Name + + + + + Provider/DSN + + + + + Host + + + + + Database + + + + + Username + + + + + Password + + + + + Name of the new connection + + + + + Trusted Connection + + + + + Save Username + + + + + &Test Connect + + + + + Save Password + + + + + Only look in the geometry_columns metadata table + + + + + Also list tables with no geometry + + + + + Use estimated table parameters + + + + + QgsMssqlProvider + + + 8 Bytes integer + + + + + 4 Bytes integer + + + + + 2 Bytes integer + + + + + 1 Bytes integer + + + + + Decimal number (numeric) + + + + + Decimal number (decimal) + + + + + Decimal number (real) + + + + + Decimal number (double) + + + + + Text, fixed length (char) + + + + + Text, limited variable length (varchar) + + + + + Text, fixed length unicode (nchar) + + + + + Text, limited variable length unicode (nvarchar) + + + + + Text, unlimited length (text) + + + + + Text, unlimited length unicode (ntext) + + + + + QgsMssqlRootItem + + + New Connection... + + + + + QgsMssqlSchemaItem + + + %1 as %2 in %3 + + + + + as geometryless table + + + + + QgsMssqlSourceSelect + + + Add MSSQL Table(s) + + + + + &Add + + + + + &Build query + + + + + Build query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Schema + + + + + + Table + + + + + + Type + + + + + + Geometry column + + + + + + Primary key column + + + + + + SRID + + + + + + Sql + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + Select Table + + + + + You must select a table in order to add a layer. + + + + + + + + MSSQL Provider + + + + + Stop + + + + + Connect + + + + + QgsMssqlSourceSelectDelegate + + + Select... + + + + + QgsMssqlTableModel + + + Schema + + + + + Table + + + + + Type + + + + + Geometry column + + + + + SRID + + + + + Primary key column + + + + + Select at id + + + + + Sql + + + + + Detecting... + + + + + + + + Select... + + + + + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). + + + + + Enter... + + + + + Point + + + + + Multipoint + + + + + Line + + + + + Multiline + + + + + Polygon + + + + + Multipolygon + + + + + No Geometry + + + + + Unknown Geometry + + + + + QgsMultiBandColorRendererWidget + + + + + Not set + + + + + No enhancement + + + + + Stretch to MinMax + + + + + Stretch and clip to MinMax + + + + + Clip to MinMax + + + + + Red + + + + + Green + + + + + Blue + + + + + QgsMultiBandColorRendererWidgetBase + + + Form + + + + + Red band + + + + + Green band + + + + + Blue band + + + + + Min + + + + + Max + + + + + Contrast enhancement + + + + + QgsNetworkAccessManager + + + Network request %1 timed out + + + + + Network + + + + + QgsNewHttpConnection + + + Create a new %1 connection + + + + + Ignore GetCoverage URI reported in capabilities + + + + + Ignore axis orientation + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + Saving passwords + + + + + WARNING: You have entered a password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. +Note: giving the password is optional. It will be requested interactivly, when needed. + + + + + QgsNewHttpConnectionBase + + + Create a new WMS connection + + + + + Connection details + + + + + URL + + + + + If the service requires basic authentication, enter a user name and optional password + + + + + Password + + + + + &User name + + + + + Name + + + + + Name of the new connection + + + + + HTTP address of the Web Map Server + + + + + Ignore GetFeatureInfo URI reported in capabilities + + + + + Ignore GetMap URI reported in capabilities + + + + + Ignore axis orientation (WMS 1.3/WMTS) + + + + + Invert axis orientation + + + + + QgsNewOgrConnection + + + + Test connection + + + + + Connection failed - Check settings and try again. + +Extended error information: +%1 + + + + + Connection to %1 was successful + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + QgsNewOgrConnectionBase + + + Create a New OGR Database connection + + + + + Connection Information + + + + + Type + + + + + Name + + + + + Name of the new connection + + + + + Host + + + + + Database + + + + + Port + + + + + Username + + + + + Password + + + + + Save Password + + + + + &Test Connect + + + + + QgsNewSpatialiteLayerDialog + + + Text data + + + + + Whole number + + + + + Decimal number + + + + + New SpatiaLite Database File + + + + + SpatiaLite + + + + + + + + SpatiaLite Database + + + + + Unable to open the database + + + + + Error + + + + + Failed to load SRIDS: %1 + + + + + @ + + + + + Registered new database! + + + + + Unable to open the database: %1 + + + + + Error Creating SpatiaLite Table + + + + + Failed to create the SpatiaLite table %1. The database returned: +%2 + + + + + Error Creating Geometry Column + + + + + Failed to create the geometry column. The database returned: +%1 + + + + + Error Creating Spatial Index + + + + + Failed to create the spatial index. The database returned: +%1 + + + + + Invalid Layer + + + + + %1 is an invalid layer and cannot be loaded. + + + + + QgsNewSpatialiteLayerDialogBase + + + New Spatialite Layer + + + + + Database + + + + + Create a new Spatialite database + + + + + ... + + + + + Layer name + + + + + + Name for the new layer + + + + + Geometry column + + + + + geometry + + + + + + + Type + + + + + Point + + + + + Line + + + + + Polygon + + + + + MultiPoint + + + + + Multiline + + + + + Multipolygon + + + + + Spatial Reference Id + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify CRS + + + + + Add an integer id field as the primary key for the new layer + + + + + Create an autoincrementing primary key + + + + + New attribute + + + + + + Name + + + + + An attribute name + + + + + Add attribute to list + + + + + Add to attributes list + + + + + Attributes list + + + + + Delete selected attribute + + + + + Remove attribute + + + + + QgsNewVectorLayerDialog + + + Text data + + + + + Whole number + + + + + Decimal number + + + + + ESRI Shapefile + + + + + Save As + + + + + QgsNewVectorLayerDialogBase + + + New Vector Layer + + + + + File format + + + + + + + Type + + + + + Point + + + + + Line + + + + + Polygon + + + + + New attribute + + + + + + Name + + + + + + Width + + + + + + Precision + + + + + Add attribute to list + + + + + Add to attributes list + + + + + Attributes list + + + + + Delete selected attribute + + + + + Remove attribute + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify CRS + + + + + QgsOGRSublayersDialog + + + Layer ID + + + + + Layer name + + + + + Nb of features + + + + + Geometry type + + + + + QgsOGRSublayersDialogBase + + + Select layers to load + + + + + 1 + + + + + QgsOSMDataProvider + + + Open Street Map format + + + + + QgsOWSConnection + + + WMS Password for %1 + + + + + QgsOWSConnectionItem + + + Edit... + + + + + Delete + + + + + QgsOWSSourceSelect + + + &Add + + + + + Add selected layers to map + + + + + Always cache + + + + + Prefer cache + + + + + Prefer network + + + + + Always network + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + Coordinate Reference System (%n available) + crs count + + + + + + + + Coordinate Reference System + + + + + Could not understand the response: +%1 + + + + + WMS proxies + + + + + Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. + + + + + parse error at row %1, column %2: %3 + + + + + network error: %1 + + + + + The %1 connection already exists. Do you want to overwrite it? + + + + + Confirm Overwrite + + + + + QgsOWSSourceSelectBase + + + Add Layer(s) from a Server + + + + + Ready + + + + + + Layers + + + + + C&onnect + + + + + &New + + + + + Edit + + + + + Delete + + + + + Load connections from file + + + + + Load + + + + + Save connections to file + + + + + Save + + + + + Adds a few example WMS servers + + + + + Add default servers + + + + + ID + + + + + Name + + + + + + Title + + + + + Abstract + + + + + Time + + + + + Coordinate Reference System: + + + + + Selected Coordinate Reference System + + + + + Change ... + + + + + + Format + + + + + Options + + + + + Layer name + + + + + Tile size + + + + + Feature limit for GetFeatureInfo + + + + + Cache + + + + + Cache preference + +Always cache: load from cache, even if it expired + +Prefer cache: load from cache if available, otherwise load from network. Note that this can return possibly stale (but not expired) items from cache + +Prefer network: default value; load from the network if the cached entry is older than the network entry + +Always network: always load from network and do not check if the cache has a valid entry (similar to the "Reload" feature in browsers) + + + + + + Layer Order + + + + + Move selected layer UP + + + + + Up + + + + + Move selected layer DOWN + + + + + Down + + + + + Layer + + + + + Style + + + + + Tilesets + + + + + Styles + + + + + Size + + + + + CRS + + + + + Server Search + + + + + Search + + + + + Description + + + + + URL + + + + + Add selected row to WMS list + + + + + QgsOfflineEditing + + + Could not open the spatialite database + + + + + Unable to initialize SpatialMetadata: + + + + + + Could not create a new database + + + + + + Unable to activate FOREIGN_KEY constraints + + + + + Unknown data type %1 + + + + + QGIS wkbType %1 not supported + + + + + %v / %m features copied + + + + + + %v / %m features processed + + + + + %v / %m fields added + + + + + %v / %m features added + + + + + %v / %m features removed + + + + + %v / %m feature updates + + + + + %v / %m feature geometry updates + + + + + Offline Editing Plugin + + + + + Could not open the spatialite logging database + + + + + QgsOfflineEditingPlugin + + + Convert to offline project + + + + + Create offline copies of selected layers and save as offline project + + + + + + + + &Offline Editing + + + + + Synchronize + + + + + Synchronize offline project with remote layers + + + + + QgsOfflineEditingPluginGui + + + Select target database for offline data + + + + + SpatiaLite DB + + + + + All files + + + + + Offline Editing Plugin + + + + + Converting to offline project. + + + + + Offline database file '%1' exists. Overwrite? + + + + + QgsOfflineEditingPluginGuiBase + + + Create offline project + + + + + Offline data + + + + + Browse... + + + + + Select remote layers + + + + + Show only editable layers + + + + + QgsOfflineEditingProgressDialog + + + Layer %1 of %2.. + + + + + QgsOfflineEditingProgressDialogBase + + + Dialog + + + + + TextLabel + + + + + QgsOgrLayerItem + + + Couldn't open file %1.prj + + + + + + OGR + + + + + Couldn't open file %1.qpj + + + + + QgsOgrProvider + + + Data source is invalid, no layer found (%1) + + + + + + + + + OGR + + + + + Data source is invalid (%1) + + + + + Whole number (integer) + + + + + Decimal number (real) + + + + + Text (string) + + + + + OGR[%1] error %2: %3 + + + + + Unknown + + + + + Read attempt on an invalid OGR data source + + + + + OGR error creating wkb for feature %1: %2 + + + + + type %1 for attribute %2 not found + + + + + OGR error creating feature %1: %2 + + + + + type %1 for field %2 not found + + + + + OGR error creating field %1: %2 + + + + + OGR error deleting field %1: %2 + + + + + Deleting fields is not supported prior to GDAL 1.9.0 + + + + + + + OGR error on feature %1: id too large + + + + + Feature %1 for attribute update not found. + + + + + Field %1 of feature %2 doesn't exist. + + + + + Type %1 of attribute %2 of feature %3 unknown. + + + + + + OGR error setting feature %1: %2 + + + + + OGR error changing geometry: feature %1 not found + + + + + OGR error creating geometry for feature %1: %2 + + + + + OGR error in feature %1: geometry is null + + + + + OGR error setting geometry of feature %1: %2 + + + + + OGR error deleting feature %1: %2 + + + + + Shapefiles without attribute are considered read-only. + + + + + QgsOpenRasterDialog + + + Open raster + + + + + Raster file: + + + + + + ... + + + + + Save raster as: + + + + + Choose a name of the raster + + + + + + Error + + + + + + The selected file is not a valid raster file. + + + + + Choose a name for the modified raster + + + + + -modified + Georeferencer:QgsOpenRasterDialog.cpp - used to modify a user given file name + + + + + QgsOpenVectorLayerDialog + + + Open an OGR Supported Vector Layer + + + + + Open Directory + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + + + + Add vector layer + + + + + No database selected. + + + + + Password for + + + + + Please enter your password: + + + + + No protocol URI entered. + + + + + No layers selected. + + + + + No directory selected. + + + + + QgsOpenVectorLayerDialogBase + + + Add vector layer + + + + + Source type + + + + + File + + + + + Directory + + + + + + Database + + + + + + Protocol + + + + + Encoding + + + + + + + Type + + + + + URI + + + + + Source + + + + + Dataset + + + + + Browse + + + + + Connections + + + + + New + + + + + Edit + + + + + Delete + + + + + QgsOptions + + + None / Planimetric + + + + + Current layer + + + + + Top down, stop at first + + + + + Top down + + + + + Show all features + + + + + Show selected features + + + + + Show features in current canvas + + + + + Always + + + + + If needed + + + + + Never + + + + + Load all + + + + + Check file contents + + + + + Check extension + + + + + No + + + + + Basic scan + + + + + Full scan + + + + + + Cumulative pixel count cut + + + + + Minimum / maximum + + + + + Mean +/- standard deviation + + + + + Detected active locale on your system: %1 + + + + + To vertex + + + + + To segment + + + + + To vertex and segment + + + + + + map units + + + + + + pixels + + + + + + + Semi transparent circle + + + + + + + Cross + + + + + + + None + + + + + Off + + + + + QGIS + + + + + GEOS + + + + + Round + + + + + Mitre + + + + + Bevel + + + + + Central point (fastest) + + + + + Chain (fast) + + + + + Popmusic tabu chain (slow) + + + + + Popmusic tabu (slow) + + + + + Popmusic chain (very slow) + + + + + + + Save default project + + + + + You must set a default project + + + + + Current project saved as default + + + + + Error saving current project as default + + + + + Choose a directory to store project template files + + + + + Selection color + + + + + Create Options - %1 Driver + + + + + Create Options - pyramids + + + + + + + Choose a directory + + + + + Enter scale + + + + + Scale denominator + + + + + Load scales + + + + + + XML files (*.xml *.XML) + + + + + Save scales + + + + + No Stretch + + + + + Stretch To MinMax + + + + + Stretch And Clip To MinMax + + + + + Clip To MinMax + + + + + QgsOptionsBase + + + Options + + + + + General + + + + + Project files + + + + + Prompt to save project changes when required + + + + + Warn when opening a project file saved with an older version of QGIS + + + + + Create new project from default project + + + + + Set current project as default + + + + + Reset default + + + + + Template folder + + + + + Browse + + + + + Reset + + + + + Enable macros + + + + + Never + + + + + Ask + + + + + For this session only + + + + + Always (not recommended) + + + + + Default Map Appearance (overridden by project properties) + + + + + Selection color + + + + + Background color + + + + + Application + + + + + Style <i>(QGIS restart required)</i> + + + + + Icon theme + + + + + Icon size + + + + + 16 + + + + + 24 + + + + + 32 + + + + + Font + + + + + Qt default + + + + + + Size + + + + + Double click action in legend + + + + + Open layer properties + + + + + Open attribute table + + + + + Capitalise layer names in legend + + + + + Display classification attribute names in legend + + + + + Create raster icons in legend + + + + + Hide splash screen at startup + + + + + Show tips at start up + + + + + Open identify results in a dock window (QGIS restart required) + + + + + Open snapping options in a dock window (QGIS restart required) + + + + + Open attribute table in a dock window (QGIS restart required) + + + + + Add PostGIS layers with double click and select in extended mode + + + + + Add new layers to selected or current group + + + + + Copy geometry in WKT representation from attribute table + + + + + Ignore shapefile encoding + + + + + Attribute table behaviour + + + + + Attribute table row cache + + + + + Representation for NULL values + + + + + Prompt for raster sublayers + + + + + Scan for valid items in the browser dock + + + + + Scan for contents of compressed files (.zip) in browser dock + + + + + GDAL + + + + + GDAL Drivers + + + + + In some cases more than one GDAL driver can be used to load the same raster format. Use the list below to specify which to use. + + + + + Name + + + + + ext + + + + + Flags + + + + + Description + + + + + GDAL Driver Options + + + + + Edit Pyramids Options + + + + + Edit Create Options + + + + + Plugins + + + + + Plugin paths + + + + + Path(s) to search for additional C++ plugins libraries + + + + + + + Add + + + + + + + Remove + + + + + Rendering + + + + + Rendering behavior + + + + + By default new la&yers added to the map should be displayed + + + + + <b>Note:</b> Use zero to prevent display updates until all features have been rendered + + + + + Use render caching where possible to speed up redraws + + + + + Enable back buffer (Better graphics performance at the cost of loosing the possibility to cancel rendering and incremental feature drawing) + + + + + Number of features to draw before updating the display + + + + + Map display will be updated (drawn) after this many features have been read from the data source + + + + + Rendering quality + + + + + Make lines appear less jagged at the expense of some drawing performance + + + + + Fix problems with incorrectly filled polygons + + + + + Compatibility + + + + + Use new generation symbology for rendering + + + + + SVG paths + + + + + Path(s) to search for Scalable Vector Graphic (SVG) symbols + + + + + Rasters + + + + + RGB band selection + + + + + Red band + + + + + Green band + + + + + Blue band + + + + + Contrast enhancement + + + + + Single band gray + + + + + Multi band color (byte / band) + + + + + Multi band color (> byte / band) + + + + + Limits (minimum/maximum) + + + + + Cumulative pixel count cut limits + + + + + - + + + + + + % + + + + + Standard deviation multiplier + + + + + Map tools + + + + + Identify + + + + + <b>Note:</b> Specify the search radius as a percentage of the map width + + + + + Search radius for identifying features and displaying map tips + + + + + Mode + + + + + Open feature form, if a single feature is identified + + + + + Panning and zooming + + + + + Zoom factor + + + + + Mouse wheel action + + + + + Zoom + + + + + Zoom and recenter + + + + + Zoom to mouse cursor + + + + + Nothing + + + + + Predefined scales + + + + + + + + + + ... + + + + + Measure tool + + + + + Rubberband color + + + + + Preferred measurements units + + + + + Meters + + + + + Feet + + + + + Preferred angle units + + + + + Degrees + + + + + Radians + + + + + Decimal places + + + + + Keep base unit + + + + + Gon + + + + + Overlays + + + + + Position + + + + + Placement algorithm + + + + + Digitizing + + + + + Rubberband + + + + + Line width + + + + + Line width in pixels + + + + + Line color + + + + + Snapping + + + + + Default snap mode + + + + + Default snapping tolerance + + + + + Search radius for vertex edits + + + + + + map units + + + + + + pixels + + + + + Vertex markers + + + + + Show markers only for selected features + + + + + Marker style + + + + + Marker size + + + + + Other settings + + + + + Suppress attributes pop-up windows after each created feature + + + + + Reuse last entered attribute values + + + + + Validate geometries + + + + + Join style for curve offset + + + + + Quadrantsegments for curve offset + + + + + Miter limit for curve offset + + + + + CRS + + + + + Default Coordinate Reference System for new projects + + + + + + Select... + + + + + Always start new projects with this CRS + + + + + Automatically enable 'on the fly' reprojection if CRS of a new added layer differ from CRS of layer(s) already present. CRS of present layer(s) will be used. + + + + + Automatically enable 'on the fly' reprojection if layers have different CRS + + + + + Enable 'on the &fly' reprojection by default + + + + + Coordinate Reference System for new layers + + + + + When a new layer is created, or when a layer is loaded that has no Coordinate Reference System (CRS) + + + + + Prompt for &CRS + + + + + Use &project CRS + + + + + Use default CRS displa&yed below + + + + + Locale + + + + + Override system locale + + + + + Locale to use instead + + + + + <b>Note:</b> Enabling / changing overide on local requires an application restart + + + + + Additional Info + + + + + Detected active locale on your system: + + + + + Network + + + + + Use proxy for web access + + + + + Host + + + + + Port + + + + + User + + + + + + Leave this blank if no proxy username / password are required + + + + + Password + + + + + Proxy type + + + + + Exclude URLs (starting with) + + + + + Cache settings + + + + + Directory + + + + + Clear + + + + + WMS search address + + + + + Timeout for network requests (ms) + + + + + Default expiration period for WMS-C/WMTS tiles (hours) + + + + + QgsOraclePlugin + + + Add Oracle GeoRaster Layer... + + + + + Add a Oracle Spatial GeoRaster... + + + + + QgsOracleSelectGeoraster + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Password for %1/<password>@%2 + + + + + Please enter your password: + + + + + Open failed + + + + + The connection to %1 failed. Please verify your connection parameters. Make sure you have the GDAL GeoRaster plugin installed. + + + + + QgsPGConnectionItem + + + Failed to retrieve layers + + + + + No layers found. + + + + + Edit... + + + + + Delete + + + + + %1: Not a vector layer! + + + + + + %1: OK! + + + + + + Import to PostGIS database + + + + + Failed to import some layers! + + + + + + + Import was successful. + + + + + QgsPGLayerItem + + + + + Delete layer + + + + + Layer deleted successfully. + + + + + QgsPGRootItem + + + New Connection... + + + + + QgsPGSchemaItem + + + %1 as %2 in %3 + + + + + as geometryless table + + + + + QgsPalettedRendererWidgetBase + + + Form + + + + + Band + + + + + Value + + + + + Color + + + + + QgsPasteTransformations + + + &Add New Transfer + + + + + QgsPasteTransformationsBase + + + Paste Transformations + + + + + <b>Note: This function is not useful yet!</b> + + + + + Source + + + + + Destination + + + + + QgsPenCapStyleComboBox + + + Square + + + + + Flat + + + + + Round + + + + + QgsPenJoinStyleComboBox + + + Bevel + + + + + Miter + + + + + Round + + + + + QgsPenStyleComboBox + + + Solid Line + + + + + No Pen + + + + + Dash Line + + + + + Dot Line + + + + + Dash Dot Line + + + + + Dash Dot Dot Line + + + + + QgsPgNewConnection + + + disable + + + + + allow + + + + + prefer + + + + + require + + + + + Saving passwords + + + + + WARNING: You have opted to save your password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. + + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + + Test connection + + + + + Connection to %1 was successful + + + + + Connection failed - Check settings and try again. + + + + + + + QgsPgNewConnectionBase + + + Create a New PostGIS connection + + + + + Connection Information + + + + + Name + + + + + Service + + + + + Host + + + + + Port + + + + + Database + + + + + SSL mode + + + + + Username + + + + + Password + + + + + Name of the new connection + + + + + 5432 + + + + + Restrict the displayed tables to those that are in the layer registries. + + + + + Restricts the displayed tables to those that are found in the layer registries (geometry_columns, geography_columns, topology.layer). This can speed up the initial display of spatial tables. + + + + + Only look in the layer registries + + + + + Restrict the search to the public schema for spatial tables not in the geometry_columns table + + + + + When searching for spatial tables that are not in the geometry_columns tables, restrict the search to tables that are in the public schema (for some databases this can save lots of time) + + + + + Only look in the 'public' schema + + + + + Save Username + + + + + &Test Connect + + + + + Save Password + + + + + Use estimated table statistics for the layer metadata. + + + + + <html> +<body> +<p>When the layer is setup various metadata is required for the PostGIS table. This includes information such as the table row count, geometry type and spatial extents of the data in the geometry column. If the table contains a large number of rows determining this metadata is time consuming.</p> +<p>By activating this option the following fast table metadata operations are done:</p> +<p>1) Row count is determined from table statistics obtained from running the PostgreSQL table analyse function.</p> +<p>2) Table extents are always determined with the estimated_extent PostGIS function even if a layer filter is applied.</p> +<p>3) If the table geometry type is unknown and is not exclusively taken from the geometry_columns table, then it is determined from the first 100 non-null geometry rows in the table.</p> +</body> +</html> + + + + + Use estimated table metadata + + + + + Also list tables with no geometry + + + + + QgsPgSourceSelect + + + &Add + + + + + &Build query + + + + + Build query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Schema + + + + + + Table + + + + + + Type + + + + + + Geometry column + + + + + + Primary key column + + + + + + SRID + + + + + + Sql + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + Select Table + + + + + You must select a table in order to add a layer. + + + + + Stop + + + + + + Postgres/PostGIS Provider + + + + + Could not open the Postgres/PostGIS Provider + + + + + No accessible tables or views found. Check the message log for possible errors. + + + + + Connect + + + + + QgsPgSourceSelectDelegate + + + Select... + + + + + QgsPgTableModel + + + Schema + + + + + Table + + + + + Column + + + + + Data Type + + + + + Spatial Type + + + + + SRID + + + + + Primary Key + + + + + Select at id + + + + + Sql + + + + + Detecting... + + + + + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). + + + + + Select... + + + + + Enter... + + + + + QgsPluginInstaller + + Nothing to remove! Plugin directory doesn't exist: + + + + Failed to remove the directory: + + + + Check permissions or remove it manually + + + + Fetch Python Plugins... + + + + Install more plugins from remote repositories + + + + Looking for new plugins... + + + + QGIS Plugin Installer update + + + + The Plugin Installer has been updated. Please restart QGIS prior to using it + + + + QGIS Plugin Conflict: + + + + The Plugin Installer has detected an obsolete plugin which masks a newer version shipped with this QGIS version. This is likely due to files associated with a previous installation of QGIS. Please use the Plugin Installer to remove that older plugin in order to unmask the newer version shipped with this copy of QGIS. + + + + There is a new plugin available + + + + There is a plugin update available + + + + QGIS Python Plugin Installer + + + + Error reading repository: + + + + Couldn't open the local plugin directory + + + + + QgsPluginInstallerDialog + + QGIS Python Plugin Installer + + + + Error reading repository: + + + + all repositories + + + + connected + + + + This repository is connected + + + + unavailable + + + + This repository is enabled, but unavailable + + + + disabled + + + + This repository is disabled + + + + This repository is blocked due to incompatibility with your Quantum GIS version + + + + orphans + + + + any status + + + + not installed + + + + installed + + + + upgradeable and news + + + + This plugin is not installed + + + + This plugin is installed + + + + This plugin is installed, but there is an updated version available + + + + This plugin is installed, but I can't find it in any enabled repository + + + + This plugin is not installed and is seen for the first time + + + + This plugin is installed and is newer than its version available in a repository + + + + This plugin is incompatible with your Quantum GIS version and probably won't work. + + + + The required Python module is not installed. +For more information, please visit its homepage and Quantum GIS wiki. + + + + This plugin seems to be broken. +It has been installed but can't be loaded. +Here is the error message: + + + + upgradeable + + + + new! + + + + invalid + + + + Note that it's an uninstallable core plugin + + + + installed version + + + + available version + + + + That's the newest available version + + + + There is no version available for download + + + + This plugin is broken + + + + This plugin requires a newer version of Quantum GIS + + + + at least + + + + This plugin requires a missing module + + + + only locally available + + + + Experimental plugin. Use at own risk + + + + - %d plugins available + + + + Install plugin + + + + Reinstall plugin + + + + Upgrade plugin + + + + Install/upgrade plugin + + + + Downgrade plugin + + + + Are you sure you want to downgrade the plugin to the latest available version? The installed one is newer! + + + + Plugin installation failed + + + + Plugin has disappeared + + + + The plugin seems to have been installed but I don't know where. Probably the plugin package contained a wrong named directory. +Please search the list of installed plugins. I'm nearly sure you'll find the plugin there, but I just can't determine which of them it is. It also means that I won't be able to determine if this plugin is installed and inform you about available updates. However the plugin may work. Please contact the plugin author and submit this issue. + + + + Plugin installed successfully + + + + Python plugin installed. +Now you need to enable it in Plugin Manager. + + + + Plugin reinstalled successfully + + + + Python plugin reinstalled. +You need to restart Quantum GIS in order to reload it. + + + + The plugin is designed for a newer version of Quantum GIS. The minimum required version is: + + + + The plugin depends on some components missing on your system. You need to install the following Python module in order to enable it: + + + + The plugin is broken. Python said: + + + + Plugin uninstall failed + + + + Are you sure you want to uninstall the following plugin? + + + + Warning: this plugin isn't available in any accessible repository! + + + + Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation. + + + + Plugin Installer update uninstalled. Please restart QGIS in order to load its primary version. + + + + Plugin uninstalled successfully + + + + Python plugin uninstalled. Note that you may need to restart Quantum GIS in order to remove it completely. + + + + Unable to add another repository with the same URL! + + + + Are you sure you want to remove the following repository? + + + + + QgsPluginInstallerDialogBase + + + + QGIS Python Plugin Installer + + + + + Help + + + + + The plugins will be installed to ~/.qgis/python/plugins + + + + + + Close the Installer window + + + + + Close + + + + + Plugins + + + + + List of available and installed plugins + + + + + Filter: + + + + + + Display only plugins containing this word in their metadata + + + + + + Display only plugins from given repository + + + + + all repositories + + + + + + Display only plugins with matching status + + + + + State + + + + + + Status + + + + + + Name + + + + + Version + + + + + Description + + + + + Author + + + + + Repository + + + + + Upgrade all + + + + + + Install, reinstall or upgrade the selected plugin + + + + + Install/upgrade plugin + + + + + + Uninstall the selected plugin + + + + + Uninstall plugin + + + + + Repositories + + + + + List of plugin repositories + + + + + URL + + + + + + Add a new plugin repository + + + + + Add... + + + + + + Edit the selected repository + + + + + Edit... + + + + + + Remove the selected repository + + + + + Delete + + + + + + Add the contributed repository to the list + + + + + Add the contributed repository + + + + + + Remove depreciated repositories from the list + + + + + Delete depreciated repositories + + + + + Options + + + + + Configuration of the plugin installer + + + + + Check for updates on startup + + + + + every time QGIS starts + + + + + once a day + + + + + every 3 days + + + + + every week + + + + + every 2 weeks + + + + + every month + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> If this function is enabled, Quantum GIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Installer window.</p></body></html> + + + + + Allowed plugins + + + + + Only show plugins from the official repository + + + + + Show all plugins except those marked as experimental + + + + + Show all plugins, even those marked as experimental + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> Experimental plugins are generally unsuitable for production use. These plugins are in early stages of development, and should be considered 'incomplete' or 'proof of concept' tools. QGIS does not recommend installing these plugins unless you intend to use them for testing purposes.</p></body></html> + + + + + QgsPluginInstallerFetchingDialog + + Success + + + + Resolving host name... + + + + Connecting... + + + + Host connected. Sending request... + + + + Downloading data... + + + + Idle + + + + Closing connection... + + + + Error + + + + + QgsPluginInstallerFetchingDialogBase + + + Fetching repositories + + + + + Overall progress: + + + + + Abort fetching + + + + + Repository + + + + + State + + + + + QgsPluginInstallerInstallingDialog + + Installing... + + + + Resolving host name... + + + + Connecting... + + + + Host connected. Sending request... + + + + Downloading data... + + + + Idle + + + + Closing connection... + + + + Error + + + + Failed to unzip the plugin package. Probably it's broken or missing from the repository. You may also want to make sure that you have write permission to the plugin directory: + + + + Aborted by user + + + + + QgsPluginInstallerInstallingDialogBase + + + QGIS Python Plugin Installer + + + + + Installing plugin: + + + + + Connecting... + + + + + QgsPluginInstallerOldReposBase + + + Plugin Installer + + + + + The Plugin Installer has detected that your copy of QGIS is configured to use a number of plugin repositories around the world. It was a typical situation in older versions of the program, but from the version 1.5, external plugins are collected in one central Contributed Repository, and all the old repositories are not necessary any more. Do you want to drop them now? If you're unsure what to do, probably you don't need them. However, if you choose to keep them in use, you will be able to remove them manually later. + + + + + Remove + + + + + Disable + + + + + Keep + + + + + Ask me later + + + + + QgsPluginInstallerPluginErrorDialog + + no error message received + + + + + QgsPluginInstallerPluginErrorDialogBase + + + Error loading plugin + + + + + The plugin seems to be invalid or have unfulfilled dependencies. It has been installed, but can't be loaded. If you really need this plugin, you can contact its author or <a href="http://lists.osgeo.org/mailman/listinfo/qgis-user">QGIS users group</a> and try to solve the problem. If not, you can just uninstall it. Here is the error message below: + + + + + Do you want to uninstall this plugin now? If you're unsure, probably you would like to do this. + + + + + QgsPluginInstallerRepositoryDetailsDialogBase + + + Repository details + + + + + Name: + + + + + + Enter a name for the repository + + + + + URL: + + + + + + Enter the repository URL, beginning with "http://" + + + + + + Enable or disable the repository (disabled repositories will be omitted) + + + + + Enabled + + + + + QgsPluginManager + + + &Select All + + + + + &Clear All + + + + + + Plugins + + + + + [ incompatible ] + + + + + + Installed in %1 menu/toolbar + + + + + No Plugins + + + + + No QGIS plugins found in %1 + + + + + Error + + + + + Failed to open plugin installer! + + + + + QgsPluginManagerBase + + + QGIS Plugin Manager + + + + + To enable / disable a plugin, click its checkbox or description + + + + + &Filter + + + + + Plugin Directory: + + + + + Directory + + + + + Plugin Installer + + + + + QgsPointDisplacementRendererWidget + + + + + None + + + + + + Label Font + + + + + Circle color + + + + + Label color + + + + + The point displacement renderer only applies to (single) point layers. +'%1' is not a point layer and cannot be displayed by the point displacement renderer + + + + + QgsPointDisplacementRendererWidgetBase + + + Form + + + + + Center symbol: + + + + + Renderer: + + + + + Renderer settings... + + + + + Displacement circles + + + + + Circle pen width: + + + + + Circle color: + + + + + Circle radius modification: + + + + + Point distance tolerance: + + + + + Labels + + + + + Label attribute: + + + + + Label font... + + + + + Label color: + + + + + Use scale dependent labelling + + + + + max scale denominator: + + + + + QgsPostgresConn + + + Connection to database failed + + + + + + + + + + + + + + + + + + + + + + + + + + + + PostGIS + + + + + error in setting encoding + + + + + undefined return value from encoding setting + + + + + Your database has no working PostGIS support. + + + + + Your PostGIS installation has no GEOS support. Feature selection and identification will not work properly. Please install PostGIS with GEOS support (http://geos.refractions.net) + + + + + SQL:%1 +result:%2 +error:%3 + + + + + + Database connection was successful, but the accessible tables could not be determined. + + + + + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: +%1 + + + + + + Database connection was successful, but the accessible tables could not be determined. +The error message from the database was: +%1 + + + + + Database connection was successful, but no accessible tables were found. Please verify that you have SELECT privilege on a table carrying PostGIS geometry. + + + + + Unable to get list of spatially enabled tables from the database + + + + + Retrieval of postgis version failed + + + + + Could not parse postgis version string '%1' + + + + + Connection error: %1 returned %2 [%3] + + + + + Erroneous query: %1 returned %2 [%3] + + + + + Query failed: %1 +Error: no result buffer + + + + + Not logged query failed: %1 +Error: no result buffer + + + + + Query: %1 returned %2 [%3] + + + + + %1 cursor states lost. +SQL: %2 +Result: %3 (%4) + + + + + resetting bad connection. + + + + + retry after reset succeeded. + + + + + retry after reset failed again. + + + + + connection still bad after reset. + + + + + bad connection, not retrying. + + + + + Point + + + + + Multipoint + + + + + Line + + + + + Multiline + + + + + Polygon + + + + + Multipolygon + + + + + No Geometry + + + + + Unknown Geometry + + + + + None + + + + + Geometry + + + + + Geography + + + + + TopoGeometry + + + + + + Query could not be canceled [%1] + + + + + PQgetCancel failed + + + + + QgsPostgresProvider + + + invalid PostgreSQL layer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PostGIS + + + + + Whole number (smallint - 16bit) + + + + + Whole number (integer - 32bit) + + + + + Whole number (integer - 64bit) + + + + + Decimal number (numeric) + + + + + Decimal number (decimal) + + + + + Decimal number (real) + + + + + Decimal number (double) + + + + + Text, fixed length (char) + + + + + Text, limited variable length (varchar) + + + + + Text, unlimited length (text) + + + + + Couldn't get the feature geometry in binary form + + + + + Read attempt on an invalid postgresql data source + + + + + nextFeature() without select() + + + + + + Fetching from cursor %1 failed +Database error: %2 + + + + + feature %1 not found + + + + + found %1 features instead of just one. + + + + + FAILURE: Field %1 not found. + + + + + + unexpected formatted field type '%1' for field %2 + + + + + Field %1 ignored, because of unsupported type %2 + + + + + Field %1 ignored, because of unsupported type type %2 + + + + + Duplicate field %1 found + + + + + + Unable to access the %1 relation. +The error message from the database was: +%2. +SQL: %3 + + + + + PostgreSQL is still in recovery after a database crash +(or you are connected to a (read-only) slave). +Write accesses will be denied. + + + + + Unable to determine table access privileges for the %1 relation. +The error message from the database was: +%2. +SQL: %3 + + + + + The custom query is not a select query. + + + + + Unable to execute the query. +The error message from the database was: +%1. +SQL: %2 + + + + + The table has no column suitable for use as a key. Quantum GIS requires a primary key, a PostgreSQL oid column or a ctid for tables. + + + + + Primary key field '%1' for view not unique. + + + + + Type '%1' of primary key field '%2' for view invalid. + + + + + Key field '%1' for view not found. + + + + + No key field for view given. + + + + + Unexpected relation type '%1'. + + + + + No key field for query given. + + + + + Could not find topology of layer %1.%2.%3 + + + + + PostGIS error while adding features: %1 + + + + + PostGIS error while deleting features: %1 + + + + + PostGIS error while adding attributes: %1 + + + + + PostGIS error while deleting attributes: %1 + + + + + PostGIS error while changing attributes: %1 + + + + + PostGIS error while changing geometry values: %1 + + + + + result of extents query invalid: %1 + + + + + Geometry type and srid for empty column %1 of %2 undefined. + + + + + Feature type or srid for %1 of %2 could not be determined or was not requested. + + + + + Editing and adding disabled for 2D+ layer (%1; %2) + + + + + QgsProject + + + Unable to open %1 + + + + + Project File Read Error + + + + + %1 at line %2 column %3 + + + + + Project file read error: %1 at line %2 column %3 + + + + + %1 for file %2 + + + + + Unable to save to file %1 + + + + + %1 is not writable. Please adjust permissions (if possible) and try again. + + + + + Unable to save to file %1. Your project may be corrupted on disk. Try clearing some space on the volume and check file permissions before pressing save again. + + + + + QgsProjectBadLayerGuiHandler + + + Ignore + + + + + QGIS Project Read Error + + + + + Unable to open one or more project layers. +Choose ignore to continue loading without the missing layers. Choose cancel to return to your pre-project load state. Choose OK to try to find the missing layers. + + + + + QgsProjectLayerGroupDialog + + + Select project file + + + + + QGis files + + + + + Recursive embedding not possible + + + + + It is not possible to embed layers / groups from the current project. + + + + + QgsProjectLayerGroupDialogBase + + + Select layers and groups to embed + + + + + Project file + + + + + ... + + + + + QgsProjectProperties + + + Layer + + + + + Type + + + + + Identifiable + + + + + Vector + + + + + WMS + + + + + Raster + + + + + + Coordinate System Restriction + + + + + No coordinate systems selected. Disabling restriction. + + + + + Selection color + + + + + CRS %1 was already selected + + + + + Coordinate System Restrictions + + + + + The current selection of coordinate systems will be lost. +Proceed? + + + + + Select print composer + + + + + Composer Title + + + + + Select restricted layers and groups + + + + + Enter scale + + + + + Scale denominator + + + + + Load scales + + + + + + XML files (*.xml *.XML) + + + + + Save scales + + + + + Transparency %1% + + + + + Select a valid symbol + + + + + Invalid symbol : + + + + + Parameters : + + + + + + Parameters: + + + + + Can only use ellipsoidal calculations when CRS transformation is enabled + + + + + QgsProjectPropertiesBase + + + Project Properties + + + + + General + + + + + General settings + + + + + Project title + + + + + Descriptive project name + + + + + Default project title + + + + + Selection color + + + + + Background color + + + + + absolute + + + + + relative + + + + + Save paths + + + + + Measure tool + + + + + Ellipsoid for distance calculations + + + + + Semi-minor + + + + + Semi-major + + + + + Used when CRS transformation is turned off + + + + + Canvas units + + + + + Meters + + + + + Feet + + + + + Degree + + + + + Degree display + + + + + Decimal degrees + + + + + Degrees, Minutes + + + + + Degrees, Minutes, Seconds + + + + + Precision + + + + + Automatically sets the number of decimal places in the mouse position display + + + + + The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display + + + + + Automatic + + + + + + Sets the number of decimal places to use for the mouse position display + + + + + Manual + + + + + + The number of decimal places for the manual option + + + + + decimal places + + + + + Project scales + + + + + + + + + + + + ... + + + + + Coordinate Reference System (CRS) + + + + + Enable 'on the fly' CRS transformation + + + + + Identifiable layers + + + + + + Layer + + + + + Type + + + + + Identifiable + + + + + Default Styles + + + + + Default Symbols + + + + + Marker + + + + + Line + + + + + Fill + + + + + Color Ramp + + + + + Style Manager + + + + + Options + + + + + Assign random colors to symbols + + + + + Opacity + + + + + OWS Server + + + + + Service Capabilitities + + + + + Person + + + + + Title + + + + + Organization + + + + + Online resource + + + + + E-Mail + + + + + Phone + + + + + Abstract + + + + + Fees + + + + + Access constraints + + + + + Keyword list + + + + + WMS Capabilitities + + + + + Advertised Extent + + + + + Min. X + + + + + Min. Y + + + + + Max. X + + + + + Max. Y + + + + + Use Current Canvas Extent + + + + + Coordinate Systems Restrictions + + + + + Add + + + + + Remove + + + + + Used + + + + + Exclude composers + + + + + Exclude layers + + + + + Add WKT geometry to feature info response + + + + + Advertised WMS url + + + + + Maximum width + + + + + Maximum height + + + + + WFS Capabilitities + + + + + Published + + + + + Update + + + + + Insert + + + + + Delete + + + + + Unselect all + + + + + Select all + + + + + Macros + + + + + Python macros + + + + + QgsProjectionSelector + + + User Defined Coordinate Systems + + + + + Geographic Coordinate Systems + + + + + Projected Coordinate Systems + + + + + Resource Location Error + + + + + Error reading database file from: + %1 +Because of this the projection selector will not work... + + + + + QgsProjectionSelectorBase + + + Coordinate Reference System Selector + + + + + Filter + + + + + Recently used coordinate reference systems + + + + + + Coordinate Reference System + + + + + + Authority ID + + + + + + ID + + + + + Coordinate reference systems of the world + + + + + Hide deprecated CRSs + + + + + QgsQueryBuilder + + + &Test + + + + + &Clear + + + + + Query Result + + + + + The where clause returned %n row(s). + returned test rows + + + + + + + + + + Query Failed + + + + + + + An error occurred when executing the query. + + + + + + +The data provider said: +%1 + + + + + Error in Query + + + + + The subset string could not be set + + + + + QgsQueryBuilderBase + + + Query Builder + + + + + Datasource + + + + + Fields + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of fields in this vector file</p></body></html> + + + + + Values + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of values for the current field.</p></body></html> + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Take a <span style=" font-weight:600;">sample</span> of records in the vector file</p></body></html> + + + + + Sample + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Retrieve <span style=" font-weight:600;">all</span> the record in the vector file (<span style=" font-style:italic;">if the table is big, the operation can consume some time</span>)</p></body></html> + + + + + All + + + + + Use unfiltered layer + + + + + Operators + + + + + = + + + + + < + + + + + NOT + + + + + OR + + + + + AND + + + + + % + + + + + IN + + + + + NOT IN + + + + + != + + + + + > + + + + + LIKE + + + + + ILIKE + + + + + >= + + + + + <= + + + + + SQL where clause + + + + + QgsQuickPrint + + + Please wait while your report is generated + COMMENTED OUT + + + + + km + + + + + mm + + + + + cm + + + + + m + + + + + miles + + + + + mile + + + + + inches + + + + + foot + + + + + feet + + + + + degree + + + + + degrees + + + + + unknown + + + + + QgsRasterCalcDialog + + + Enter result file + + + + + Expression valid + + + + + Expression invalid + + + + + QgsRasterCalcDialogBase + + + Raster calculator + + + + + Raster bands + + + + + Result layer + + + + + Output layer + + + + + ... + + + + + Current layer extent + + + + + X min + + + + + XMax + + + + + Y min + + + + + Y max + + + + + Columns + + + + + Rows + + + + + Output format + + + + + Add result to project + + + + + Operators + + + + + + + + + + + * + + + + + sqrt + + + + + sin + + + + + ^ + + + + + acos + + + + + ( + + + + + - + + + + + / + + + + + cos + + + + + asin + + + + + tan + + + + + atan + + + + + ) + + + + + < + + + + + > + + + + + = + + + + + OR + + + + + AND + + + + + <= + + + + + >= + + + + + Raster calculator expression + + + + + QgsRasterDataProvider + + + Identify + + + + + Build Pyramids + + + + + Create Datasources + + + + + Remove Datasources + + + + + no data + + + + + Feature info + + + + + Band + + + + + Average + + + + + Nearest Neighbour + + + + + Gauss + + + + + Cubic + + + + + Mode + + + + + None + + + + + QgsRasterFormatSaveOptionsWidget + + + Default + + + + + + No compression + + + + + + Low compression + + + + + + High compression + + + + + + Lossy compression + + + + + Cannot get create options for driver %1 + + + + + No help available + + + + + Create Options: + +%1 + + + + + Valid + + + + + Invalid creation option : + +%1 + +Click on help button to get valid creation options for this format + + + + + Cannot validate + + + + + Profile name: + + + + + Use simple interface + + + + + Use table interface + + + + + QgsRasterFormatSaveOptionsWidgetBase + + + Form + + + + + New + + + + + Remove + + + + + Reset + + + + + Profile + + + + + Name + + + + + Value + + + + + + + + + + + Validate + + + + + Help + + + + + - + + + + + Insert KEY=VALUE pairs separated by spaces + + + + + QgsRasterHistogramWidget + + + Visibility + + + + + Show min/max markers + + + + + Show all bands + + + + + Show RGB/Gray band(s) + + + + + Show selected band + + + + + Reset + + + + + Load min/max + + + + + Estimate (faster) + + + + + Actual (slower) + + + + + Current extent + + + + + Use stddev (1.0) + + + + + Use stddev (custom) + + + + + Load for each band + + + + + Recompute Histogram + + + + + Band %1 + + + + + Choose a file name to save the map image as + + + + + QgsRasterHistogramWidgetBase + + + Form + + + + + Band + + + + + Min + + + + + Pick Min value on graph + + + + + + ... + + + + + Max + + + + + Pick Max value on graph + + + + + Prefs/Actions + + + + + Save plot + + + + + Save as image... + + + + + Compute Histogram + + + + + QgsRasterLayer + + + + + + + Not Set + + + + + QgsRasterLayer created + + + + + Retrieving stats for %1 + + + + + Could not reproject view extent: %1 + + + + + + + + Raster + + + + + Could not reproject layer extent: %1 + + + + + Cannot read data + + + + + null (no data) + + + + + Driver: + + + + + No Data Value + + + + + NoDataValue not set + + + + + Data Type: + + + + + GDT_Byte - Eight bit unsigned integer + + + + + GDT_UInt16 - Sixteen bit unsigned integer + + + + + GDT_Int16 - Sixteen bit signed integer + + + + + GDT_UInt32 - Thirty two bit unsigned integer + + + + + GDT_Int32 - Thirty two bit signed integer + + + + + GDT_Float32 - Thirty two bit floating point + + + + + GDT_Float64 - Sixty four bit floating point + + + + + GDT_CInt16 - Complex Int16 + + + + + GDT_CInt32 - Complex Int32 + + + + + GDT_CFloat32 - Complex Float32 + + + + + GDT_CFloat64 - Complex Float64 + + + + + Could not determine raster data type. + + + + + Pyramid overviews: + + + + + Layer Spatial Reference System: + + + + + Layer Extent (layer original source projection): + + + + + Project Spatial Reference System: + + + + + + Band + + + + + Band No + + + + + No Stats + + + + + No stats collected yet + + + + + Min Val + + + + + Max Val + + + + + Range + + + + + Mean + + + + + Sum of squares + + + + + Standard Deviation + + + + + Sum of all cells + + + + + Cell Count + + + + + Cannot instantiate the '%1' data provider + + + + + Provider is not valid (provider: %1, URI: %2 + + + + + <maplayer> not found. + + + + + GDAL data type %1 is not supported + + + + + QgsRasterLayerProperties + + + Not Set + + + + + Description + + + + + Large resolution raster layers can slow navigation in QGIS. + + + + + By creating lower resolution copies of the data (pyramids) performance can be considerably improved as QGIS selects the most suitable resolution to use depending on the level of zoom. + + + + + You must have write access in the directory where the original data is stored to build pyramids. + + + + + Please note that building internal pyramids may alter the original data file and once created they cannot be removed! + + + + + Please note that building internal pyramids could corrupt your image - always make a backup of your data first! + + + + + Layer Properties - %1 + + + + + + Nearest neighbour + + + + + + Bilinear + + + + + + Cubic + + + + + + Average + + + + + None + + + + + + Red + + + + + + Green + + + + + + Blue + + + + + + + + + Percent Transparent + + + + + + Gray + + + + + + Indexed Value + + + + + From + + + + + To + + + + + not defined + + + + + Columns: %1 + + + + + Rows: %1 + + + + + Columns: + + + + + + + + n/a + + + + + Rows: + + + + + + No-Data Value: + + + + + No-Data Value: %1 + + + + + + Write access denied + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + + Building pyramids failed. + + + + + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. + + + + + + Building pyramid overviews is not supported on this type of raster. + + + + + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. + + + + + Save file + + + + + + Textfile + + + + + QGIS Generated Transparent Pixel Value Export File + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + Open file + + + + + Import Error + + + + + The following lines contained errors + +%1 + + + + + Read access denied + + + + + Read access denied. Adjust the file permissions and try again. + + + + + + + + Default Style + + + + + Load layer properties from style file + + + + + + QGIS Layer Style File + + + + + + Saved Style + + + + + Save layer properties as style file + + + + + Filter + + + + + Bands + + + + + QgsRasterLayerPropertiesBase + + + Raster Layer Properties + + + + + Save Style ... + + + + + Load Style ... + + + + + Save As Default + + + + + Restore Default Style + + + + + Style + mRendererTab + + + + + Render type + + + + + Resampling + + + + + Zoomed in + + + + + Zoomed out + + + + + Oversampling + + + + + Transparency + + + + + Global transparency + + + + + None + + + + + 00% + + + + + <p align="right">Full</p> + + + + + No data value + + + + + Use original source no data value. + + + + + No data value: + + + + + Original data source no data value, if exists. + + + + + <src no data value> + + + + + + Additional user defined no data value. + + + + + Additional no data value + + + + + Custom transparency options + + + + + Transparency band + + + + + Transparent pixel list + + + + + Add values manually + + + + + + + + + + ... + + + + + Add Values from display + + + + + Remove selected row + + + + + Default values + + + + + Import from file + + + + + Export to file + + + + + General + + + + + Display name + + + + + Layer source + + + + + Columns + + + + + Rows + + + + + No Data + + + + + Scale dependent visibility + + + + + + Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inclusive)</p></body></html> + + + + + + Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exclusive)</p></body></html> + + + + + + Current + + + + + Coordinate reference system + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify... + + + + + Thumbnail + + + + + Legend + + + + + Palette + + + + + Metadata + + + + + Title + + + + + Abstract + + + + + Pyramids + + + + + Average + + + + + Nearest Neighbour + + + + + Build pyramids + + + + + Notes + + + + + Pyramid resolutions + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> + + + + + Resampling method + + + + + Overview format + + + + + External + + + + + Internal (if possible) + + + + + External (Erdas Imagine) + + + + + Histogram + + + + + Pipe + + + + + QgsRasterLayerSaveAsDialog + + + From + + + + + To + + + + + Select output directory + + + + + Select output file + + + + + + layer + + + + + + user defined + + + + + Resolution (current: %1) + + + + + map view + + + + + Extent (current: %1) + + + + + Layer (%1, %2) + + + + + Project (%1, %2) + + + + + Selected (%1, %2) + + + + + QgsRasterLayerSaveAsDialogBase + + + Save raster layer as... + + + + + Output mode + + + + + Write out raw raster layer data. Optionally user defined no data values may be applied. + + + + + Raw data + + + + + Write out 3 bands RGB image rendered using current layer style. + + + + + Rendered image + + + + + Format + + + + + Save as + + + + + Browse... + + + + + CRS + + + + + Change ... + + + + + Extent + + + + + West + + + + + East + + + + + North + + + + + South + + + + + Layer extent + + + + + Map view extent + + + + + Resolution + + + + + Horizontal + + + + + Columns + + + + + Rows + + + + + Layer resolution + + + + + Layer size + + + + + Vertical + + + + + Create Options + + + + + Tiles + + + + + + Maximum number of columns in one tile. + + + + + Max columns + + + + + + Maximum number of rows in one tile. + + + + + Max rows + + + + + Create VRT + + + + + Additional no data values. The specified values will be set to no data in output raster. + + + + + No data values + + + + + Add values manually + + + + + + + + ... + + + + + Load user defined fully transparent (100%) values + + + + + Remove selected row + + + + + Clear all + + + + + Pyramids + + + + + Resolutions + + + + + Pyramid resolutions corresponding to levels given + + + + + Use existing + + + + + QgsRasterMinMaxWidgetBase + + + Form + + + + + Load min/max values + + + + + Cumulative count cut + + + + + - + + + + + % + + + + + Min / max + + + + + Mean +/- standard deviation × + + + + + Extent + + + + + Full + + + + + Current + + + + + Accuracy + + + + + Actual (slower) + + + + + Estimate (faster) + + + + + Load + + + + + QgsRasterPyramidsOptionsWidgetBase + + + Form + + + + + Custom levels + + + + + External + + + + + Internal (if possible) + + + + + External (Erdas Imagine) + + + + + Insert positive integer values separated by spaces + + + + + Average + + + + + Nearest Neighbour + + + + + Overview format + + + + + Create Options + + + + + Levels + + + + + Resampling method + + + + + QgsRasterRenderer + + + Unknown + + + + + User defined + + + + + Estimated + + + + + Exact + + + + + min / max + + + + + of + + + + + QgsRasterTerrainAnalysisDialog + + + Export Frequency distribution as csv + + + + + Export Colors and elevations as xml + + + + + Import Colors and elevations from xml + + + + + Error opening file + + + + + The relief color file could not be opened + + + + + Error parsing xml + + + + + The xml file could not be loaded + + + + + Enter result file + + + + + Enter lower elevation class bound + + + + + + Elevation + + + + + Enter upper elevation class bound + + + + + Select color for relief class + + + + + QgsRasterTerrainAnalysisDialogBase + + + Dialog + + + + + Elevation layer + + + + + Output layer + + + + + ... + + + + + Output format + + + + + Z factor + + + + + Add result to project + + + + + Illumination + + + + + Azimuth (horizontal angle) + + + + + Vertical angle + + + + + Relief colors + + + + + Create automatically + + + + + Export distribution... + + + + + Up + + + + + Down + + + + + + + + + + + - + + + + + Lower bound + + + + + Upper bound + + + + + Color + + + + + Export colors... + + + + + Import colors... + + + + + QgsRasterTerrainAnalysisPlugin + + + Terrain analysis + + + + + + Slope + + + + + + Aspect + + + + + + Hillshade + + + + + + Relief + + + + + Ruggedness index + + + + + Calculating hillshade... + + + + + + + + + Abort + + + + + Calculating relief... + + + + + Calculating slope... + + + + + Calculating aspect... + + + + + Ruggedness + + + + + Calculating ruggedness... + + + + + QgsRendererRulePropsDialog + + + Rule properties + + + + + Label + + + + + + Filter + + + + + ... + + + + + Test + + + + + Description + + + + + Scale range + + + + + Min. scale + + + + + + 1 : + + + + + Max. scale + + + + + Symbol + + + + + Error + + + + + Filter expression parsing error: + + + + + + Evaluation error + + + + + Filter returned %n feature(s) + number of filtered features + + + + + + + + QgsRendererV2DataDefinedMenus + + + Rotation field + + + + + Size scale field + + + + + + Scale area + + + + + + Scale diameter + + + + + + + - no field - + + + + + QgsRendererV2PropertiesDialog + + + Symbology + + + + + Do you wish to use the original symbology implementation for this layer? + + + + + QgsRendererV2PropsDialogBase + + + Renderer settings + + + + + Old symbology + + + + + This renderer doesn't implement a graphical interface. + + + + + QgsRendererV2Widget + + + Change color + + + + + Change transparency + + + + + Change output unit + + + + + Change width + + + + + Change size + + + + + Transparency + + + + + Change symbol transparency [%] + + + + + Symbol unit + + + + + Select symbol unit + + + + + + Millimeter + + + + + Map unit + + + + + Width + + + + + Change symbol width + + + + + Size + + + + + Change symbol size + + + + + QgsRuleBasedRendererV2Model + + + (no filter) + + + + + <li><nobr>%1 features also in rule %2</nobr></li> + + + + + Label + + + + + Rule + + + + + Min. scale + + + + + Max.scale + + + + + Count + + + + + Duplicate count + + + + + Number of features in this rule. + + + + + Number of features in this rule which are also present in other rule(s). + + + + + QgsRuleBasedRendererV2Widget + + + Add + + + + + Edit + + + + + Remove + + + + + Refine current rules + + + + + Count features + + + + + Rendering order... + + + + + Add scales to rule + + + + + Add categories to rule + + + + + Add ranges to rule + + + + + Refine a rule to categories + + + + + Refine a rule to ranges + + + + + + Scale refinement + + + + + Parent rule %1 must have a symbol for this operation. + + + + + Please enter scale denominators at which will split the rule, separate them by commas (e.g. 1000,5000): + + + + + Error + + + + + "%1" is not valid scale denominator, ignoring it. + + + + + Calculating feature count. + + + + + Abort + + + + + QgsRunProcess + + + <b>Starting %1...</b> + + + + + Action + + + + + Unable to run command +%1 + + + + + Done + + + + + Unable to run command %1 + + + + + QgsSLConnectionItem + + + Database does not exist + + + + + Failed to open database + + + + + Failed to check metadata + + + + + Failed to get list of tables + + + + + Unknown error + + + + + Delete + + + + + %1: Not a vector layer! + + + + + + %1: OK! + + + + + + Import to SpatiaLite database + + + + + Failed to import some layers! + + + + + + + Import was successful. + + + + + QgsSLLayerItem + + + + + Delete layer + + + + + Layer deleted successfully. + + + + + QgsSLRootItem + + + New Connection... + + + + + Create database... + + + + + New SpatiaLite Database File + + + + + SpatiaLite + + + + + + Create SpatiaLite database + + + + + The database has been created + + + + + Failed to create the database: + + + + + + QgsSVGFillSymbolLayerWidget + + + Select svg texture file + + + + + QgsSearchQueryBuilder + + + Search query builder + + + + + &Test + + + + + &Clear + + + + + &Save... + + + + + Save query to an xml file + + + + + &Load... + + + + + Load query from xml file + + + + + Search results + + + + + Found %n matching feature(s). + test result + + + + + + + + + Search string parsing error + + + + + Evaluation error + + + + + Error during search + + + + + No Records + + + + + The query you specified results in zero records being returned. + + + + + Save query to file + + + + + + + + Error + + + + + Could not open file for writing + + + + + Load query from file + + + + + Query files + + + + + All files + + + + + Could not open file for reading + + + + + File is not a valid xml document + + + + + File is not a valid query document + + + + + Select attribute + + + + + There is no attribute '%1' in the current vector layer. Please select an existing attribute + + + + + QgsSelectedFeature + + + Validation started. + + + + + Validation finished (%n error(s) found). + number of geometry errors + + + + + + + + ring %1, vertex %2 + + + + + polygon %1, ring %2, vertex %3 + + + + + polyline %1, vertex %2 + + + + + vertex %1 + + + + + point %1 + + + + + single point + + + + + QgsShapeFile + + + Scanning + + + + + + + The database gave an error while executing this SQL: +%1 +The error was: +%2 + + + + + + The database gave an error while executing this SQL: + + + + + ... (rest of SQL trimmed) + is appended to a truncated SQL statement + + + + + The error was: +%1 + + + + + + QgsSingleBandGrayRendererWidget + + + Black to white + + + + + White to black + + + + + No enhancement + + + + + Stretch to MinMax + + + + + Stretch and clip to MinMax + + + + + Clip to MinMax + + + + + QgsSingleBandGrayRendererWidgetBase + + + Form + + + + + Contrast enhancement + + + + + Gray band + + + + + Min + + + + + Max + + + + + Color gradient + + + + + QgsSingleBandPseudoColorRendererWidget + + + + + + + Discrete + + + + + + + + + + Linear + + + + + + + Exact + + + + + + Equal interval + + + + + Custom color map entry + + + + + Load Color Map + + + + + The color map for band %1 failed to load + + + + + Open file + + + + + + Textfile (*.txt) + + + + + Import Error + + + + + The following lines contained errors + + + + + + + Read access denied + + + + + Read access denied. Adjust the file permissions and try again. + + + + + + + Save file + + + + + QGIS Generated Color Map Export File + + + + + Write access denied + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + QgsSingleBandPseudoColorRendererWidgetBase + + + Form + + + + + Band + + + + + Color interpolation + + + + + Add values manually + + + + + + + + + + ... + + + + + Remove selected row + + + + + Load color map from band + + + + + Load color map from file + + + + + Export color map to file + + + + + Value + + + + + Color + + + + + Label + + + + + Generate new color map + + + + + Classes + + + + + Colors + + + + + Classify + + + + + Min + + + + + Max + + + + + Mode + + + + + Min / max origin: + + + + + Min / Max origin + + + + + Invert colors order + + + + + QgsSingleSymbolDialog + + + Refresh markers + + + + + + None + + + + + Texture + + + + + Open File + + + + + Images + + + + + QgsSingleSymbolDialogBase + + + Single Symbol + + + + + Point Symbol + + + + + Size + + + + + In map units + + + + + Label + + + + + Fill options + + + + + ... + + + + + Outline options + + + + + Width + + + + + Drawing by field + + + + + Rotation + + + + + Area scale + + + + + Symbol + + + + + QgsSingleSymbolRendererV2Widget + + + Symbol levels... + + + + + QgsSmartGroupConditionWidget + + + Form + + + + + The Symbol + + + + + QgsSmartGroupEditorDialog + + + Invalid name + + + + + The smart group name field is empty. Kindly provide a name + + + + + QgsSmartGroupEditorDialogBase + + + Smart Group Editor + + + + + Smart Group Name + + + + + Condition matches + + + + + Add Condition + + + + + Conditions + + + + + QgsSnappingDialog + + + Snapping and Digitizing Options + + + + + + to vertex + + + + + + to segment + + + + + to vertex and segment + + + + + map units + + + + + pixels + + + + + QgsSnappingDialogBase + + + Snapping options + + + + + Layer + + + + + Mode + + + + + Tolerance + + + + + Units + + + + + Avoid Int. + + + + + Avoid intersections of new polygons + + + + + Enable topological editing + + + + + Enable snapping on intersection + + + + + QgsSpatiaLiteConnection + + + obsolete libspatialite: connecting to this DB requires using v.4.0 (or any subsequent) + + + + + + + + unknown error cause + + + + + obsolete libspatialite: AbstractInterface is unsupported + + + + + UNKNOWN + + + + + GEOMETRY + + + + + POINT + + + + + LINESTRING + + + + + POLYGON + + + + + MULTIPOINT + + + + + MULTILINESTRING + + + + + MULTIPOLYGON + + + + + GEOMETRYCOLLECTION + + + + + QgsSpatiaLiteProvider + + + Binary object (BLOB) + + + + + Text + + + + + Decimal number (double) + + + + + Whole number (integer) + + + + + Retrieval of spatialite version failed + + + + + Could not parse spatialite version string '%1' + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SQLite error: %2 +SQL: %1 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SpatiaLite + + + + + + + + + + + + + unknown cause + + + + + SQLite error getting feature: %1 + + + + + FAILURE: Field %1 not found. + + + + + QgsSpatiaLiteSourceSelect + + + Add SpatiaLite Table(s) + + + + + Databases + + + + + &Update statistics + + + + + &Add + + + + + &Build Query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Table + + + + + + Type + + + + + + Geometry column + + + + + + Sql + + + + + Are you sure you want to update the internal statistics for DB: %1? + +This could take a long time (depending on the DB size), +but implies better performance thereafter. + + + + + Confirm Update Statistics + + + + + + Update Statistics + + + + + Internal statistics successfully updated for: %1 + + + + + Error while updating internal statistics for: %1 + + + + + @ + + + + + Choose a SpatiaLite/SQLite DB to open + + + + + SpatiaLite DB + + + + + All files + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Select Table + + + + + You must select a table in order to add a Layer. + + + + + + SpatiaLite DB Open Error + + + + + Database does not exist: %1 + + + + + Failure while connecting to: %1 + +%2 + + + + + SpatiaLite getTableInfo Error + + + + + Failure exploring tables from: %1 + +%2 + + + + + SpatiaLite Error + + + + + Unexpected error when working with: %1 + +%2 + + + + + QgsSpatiaLiteTableModel + + + Table + + + + + Type + + + + + Geometry column + + + + + Sql + + + + + Point + + + + + Multipoint + + + + + Line + + + + + Multiline + + + + + Polygon + + + + + Multipolygon + + + + + QgsSpatialQueryDialog + + + The spatial query requires at least two vector layers + + + + + %n selected geometries + selected geometries + + + + + + + + Selected geometries + + + + + %1)Query + + + + + Begin at %L1 + + + + + < %1 > + + + + + Total of features = %1 + + + + + Total of invalid features: + + + + + Finish at %L1 (processing time %L2 minutes) + + + + + Using the field "%1" for subset + + + + + Sorry! Only this providers are enable: OGR, POSTGRES and SPATIALITE. + + + + + + %1 of %2 + + + + + all = %1 + + + + + %1 of %2(selected features) + + + + + Create new selection + + + + + Add to current selection + + + + + Remove from current selection + + + + + Result query + + + + + Invalid source + + + + + Invalid reference + + + + + %1 of %2 selected by "%3" + + + + + user + + + + + Map "%1" "on the fly" transformation. + + + + + enable + + + + + disable + + + + + Coordinate reference system(CRS) of +"%1" is invalid(see CRS of provider). + + + + + + +CRS of map is %1. +%2. + + + + + Zoom to feature + + + + + Missing reference layer + + + + + Select reference layer! + + + + + Missing target layer + + + + + Select target layer! + + + + + Create new layer from items + + + + + + The query from "%1" using "%2" in field not possible. + + + + + Create new layer from selected + + + + + %1 of %2 identified + + + + + DEBUG + + + + + QgsSpatialQueryDialogBase + + + Spatial Query + + + + + Layer on which the topological operation will select geometries + + + + + Select source features from + + + + + Select the target layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will only consider selected geometries of the target layer</span></p></body></html> + + + + + + Selected feature(s) only + + + + + Where the feature + + + + + Select the topological operation + + + + + Layer whose geometries will be used as reference by the topological operation + + + + + Reference features of + + + + + Select the reference layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will be only consider selected geometries of the reference layer</span></p></body></html> + + + + + And use the result to + + + + + Selected features + + + + + + Number of selected features in map + + + + + Create layer with selected + + + + + Result feature ID's + + + + + Select one FID to identify geometry of feature + + + + + Create layer with list of items + + + + + Zoom to item + + + + + Check to show log processing of query + + + + + Log messages + + + + + Run query or close the window + + + + + QgsSpatialQueryPlugin + + + + + &Spatial Query + + + + + Query not executed + + + + + DEBUG + + + + + QgsSpatialiteSridsDialogBase + + + Select a Spatialite Spatial Reference System + + + + + + SRID + + + + + Authority + + + + + Reference Name + + + + + Search + + + + + Filter + + + + + Name + + + + + QgsSpit + + + File Name + + + + + Feature Class + + + + + Features + + + + + DB Relation Name + + + + + Schema + + + + + Are you sure you want to remove the [%1] connection and all associated settings? + + + + + Confirm Delete + + + + + Add Shapefiles + + + + + Shapefiles + + + + + All files + + + + + The following Shapefile(s) could not be loaded: + + + + + + + REASON: File cannot be opened + + + + + REASON: One or both of the Shapefile files (*.dbf, *.shx) missing + + + + + General Interface Help: + + + + + PostgreSQL Connections: + + + + + [New ...] - create a new connection + + + + + [Edit ...] - edit the currently selected connection + + + + + [Remove] - remove the currently selected connection + + + + + -you need to select a connection that works (connects properly) in order to import files + + + + + -when changing connections Global Schema also changes accordingly + + + + + Shapefile List: + + + + + [Add ...] - open a File dialog and browse to the desired file(s) to import + + + + + [Remove] - remove the currently selected file(s) from the list + + + + + [Remove All] - remove all the files in the list + + + + + [SRID] - Reference ID for the shapefiles to be imported + + + + + [Use Default (SRID)] - set SRID to -1 + + + + + [Geometry Column Name] - name of the geometry column in the database + + + + + [Use Default (Geometry Column Name)] - set column name to 'the_geom' + + + + + [Global Schema] - set the schema for all files to be imported into + + + + + [Import] - import the current shapefiles in the list + + + + + [Quit] - quit the program + + + + + + [Help] - display this help dialog + + + + + + + + + + + + + + + + + + + + + + Import Shapefiles + + + + + + You need to specify a Connection first + + + + + Password for %1 + + + + + Please enter your password: + + + + + Connection failed - Check settings and try again + + + + + PostGIS not available + + + + + <p>The chosen database does not have PostGIS installed, but this is required for storage of spatial data.</p> + + + + + You need to add shapefiles to the list first + + + + + Importing files + + + + + Cancel + + + + + Progress + + + + + Problem inserting features from file: + + + + + %1 +Invalid table name. + + + + + %1 +No fields detected. + + + + + %1 +The following fields are duplicates: +%2 + + + + + Importing files +%1 + + + + + + + + + + + + + %1 +<p>Error while executing the SQL:</p><p>%2</p><p>The database said:%3</p> + + + + + Import Shapefiles - Relation Exists + + + + + The Shapefile: +%1 +will use [%2] relation for its data, +which already exists and possibly contains data. +To avoid data loss change the "DB Relation Name" +for this Shapefile in the main dialog file list. + +Do you want to overwrite the [%2] relation? + + + + + %1 of %2 shapefiles could not be imported. + + + + + QgsSpitBase + + + SPIT - Shapefile to PostGIS Import Tool + + + + + PostgreSQL connections + + + + + + Connect to PostGIS + + + + + Connect + + + + + + Create a new PostGIS connection + + + + + New + + + + + + Edit the current PostGIS connection + + + + + Edit + + + + + + Remove the current PostGIS connection + + + + + + Remove + + + + + Import options and shapefile list + + + + + Geometry column name + + + + + + Set the geometry column name to the default value + + + + + Use default geometry column name + + + + + SRID + + + + + + Set the SRID to the default value + + + + + Use default SRID + + + + + Primary key column name + + + + + Global schema + + + + + + Add a shapefile to the list of files to be imported + + + + + Add + + + + + + Remove the selected shapefile from the import list + + + + + + Remove all the shapefiles from the import list + + + + + Remove All + + + + + QgsSpitPlugin + + + &Import Shapefiles to PostgreSQL + + + + + Import shapefiles into a PostGIS-enabled PostgreSQL database. The schema and field names can be customized on import + + + + + + &Spit + + + + + QgsSponsorsBase + + + QGIS Sponsors + + + + + TextLabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">We work really hard to make this nice software for you. See all the cool features it has? Get a warm fuzzy feeling when you use it? Quantum GIS is a labour of love by a dedicated team of developers. We want you to copy &amp; share it and put it in the hands of as many people as possible. If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of Quantum GIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project. Please see the </span><a href="http://qgis.org/en/sponsorship.html"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">QGIS Sponsorship Web Page</span></a><span style=" font-size:10pt;"> for more details. In the list below you can see the fine people and companies that are helping us financially - a great big 'thank you' to you all!</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">2011 Sponsors</span></p> +<hr /> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">SILVER SPONSORS</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.vorarlberg.at"><span style=" font-family:'Courier New,courier'; font-size:10pt; text-decoration: underline; color:#0000ff;">State of Vorarlberg</span></a><span style=" font-family:'Courier New,courier'; font-size:10pt;"> </span><span style=" font-family:'Courier New,courier'; font-size:10pt; color:#333333;">, Austria (11.2011)</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.agi.so.ch"><span style=" font-family:'Courier New,courier'; font-size:10pt; text-decoration: underline; color:#0000ff;">Kanton Solothurn</span></a><span style=" font-family:'Courier New,courier'; font-size:10pt; color:#333333;">, Switzerland (4.2011)</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">BRONZE SPONSORS</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gis.uster.ch/"><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; text-decoration: underline; color:#0000ff;">City of Uster</span></a><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; color:#0000ff;"> </span><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; color:#000000;">, Switzerland</span><span style=" font-family:'Helvetica,Arial,sans-serif'; color:#000000;"> (11.2011)</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.municipia.pt"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Municípia, SA</span></a></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">2010 Sponsors</span></p> +<hr /> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">BRONZE SPONSORS</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.gfosservices.com"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Studio Associato Gfosservices</span></a></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://nextgis.org"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">NEXTGIS</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;"></p></body></html> + + + + + QgsSqlAnywhereProvider + + + Failed to load interface + + + + + Failed to connect to database + + + + + A connection to the SQL Anywhere database cannot be established. + + + + + No suitable key column + + + + + The source relation %1 has no column suitable for use as a unique key. + +Quantum GIS requires that the relation has an integer column no larger than 32 bits containing unique values. + + + + + Error loading attributes + + + + + Ambiguous field! + + + + + Duplicate field %1 found + + + + + + Error describing bind parameters + + + + + Error binding parameters + + + + + Error inserting features + + + + + Error deleting features + + + + + Error adding attributes + + + + + Error deleting attributes + + + + + Attribute not found + + + + + Error updating attributes + + + + + Error updating features + + + + + Error verifying geometry column %1 + + + + + Unknown geometry type + + + + + Column %1 has a geometry type of %2, which Quantum GIS does not currently support. + + + + + Mixed Spatial Reference Systems + + + + + Column %1 is not restricted to a single SRID, which Quantum GIS requires. + + + + + Error checking database ReadOnly property + + + + + Error loading SRS definition + + + + + Because Quantum GIS supports only planar data, the SQL Anywhere data provider will transform the data to the compatible planar projection (SRID=%1). + + + + + Because Quantum GIS supports only planar data and no compatible planar projection was found, the SQL Anywhere data provider will attempt to transform the data to planar WGS 84 (SRID=%1). + + + + + Limited Support of Round Earth SRS + + + + + Column %1 (%2) contains geometries belonging to a round earth spatial reference system (SRID=%3). %4 + +Updates to geometry values will be disabled, and query performance may be poor because spatial indexes will not be utilized. To improve performance, consider creating a spatial index on a new (possibly computed) column containing a planar projection of these geometries. For help, refer to the descriptions of the ST_SRID(INT) and ST_Transform(INT) methods in the SQL Anywhere documentation. + + + + + QgsStyleV2ExportImportDialog + + + Select all + + + + + Clear selection + + + + + Import style(s) + + + + + Select symbols to import + + + + + Import + + + + + Export style(s) + + + + + Export + + + + + + Export/import error + + + + + You should select at least one symbol/color ramp. + + + + + Save styles + + + + + XML files (*.xml *.XML) + + + + + Error when saving selected symbols to file: +%1 + + + + + Import error + + + + + An error occured during import: +%1 + + + + + Group Name + + + + + Please enter a name for new group: + + + + + imported + + + + + New Group + + + + + New group cannot be created without a name. Kindly enter a name. + + + + + New group + + + + + Cannot create a group without name. Enter a name. + + + + + + Duplicate names + + + + + Symbol with name '%1' already exists. +Overwrite? + + + + + Color ramp with name '%1' already exists. +Overwrite? + + + + + Load styles + + + + + XML files (*.xml *XML) + + + + + Downloading style ... + + + + + HTTP Error! + + + + + Download failed: %1. + + + + + QgsStyleV2ExportImportDialogBase + + + Styles import/export + + + + + Import from + + + + + Location + + + + + Save to group + + + + + Select symbols to export + + + + + QgsStyleV2ManagerDialog + + + + Type here to filter symbols ... + + + + + Marker symbol (%1) + + + + + Line symbol (%1) + + + + + Fill symbol (%1) + + + + + Color ramp (%1) + + + + + + + Gradient + + + + + + + Random + + + + + + + ColorBrewer + + + + + + + cpt-city + + + + + new symbol + + + + + new marker + + + + + new line + + + + + new fill symbol + + + + + Symbol Name + + + + + Please enter a name for new symbol: + + + + + + Save symbol + + + + + Cannot save symbol without name. Enter a name. + + + + + Symbol with name '%1' already exists. Overwrite? + + + + + Color ramp type + + + + + Please select color ramp type: + + + + + new ramp + + + + + new gradient ramp + + + + + new random ramp + + + + + Color Ramp Name + + + + + Please enter a name for new color ramp: + + + + + Save Color Ramp + + + + + Cannot save color ramp without name. Enter a name. + + + + + Save color ramp + + + + + Color ramp with name '%1' already exists. Overwrite? + + + + + + Invalid Selection + + + + + The parent group you have selected is not user editable. +Kindly select a user defined group. + + + + + Operation Not Allowed + + + + + Creation of nested smart groups are not allowed +Select the 'Smart Group' to create a new group. + + + + + Invalid selection + + + + + Cannot delete system defined categories. +Kindly select a group or smart group you might want to delete. + + + + + Error! + + + + + New group could not be created. +There was a problem with your symbol database. + + + + + Database Error + + + + + There was a problem with the Symbols database while regrouping. + + + + + You have not selected a Smart Group. Kindly select a Smart Group to edit. + + + + + Database Error! + + + + + There was some error while editing the smart group. + + + + + QgsStyleV2ManagerDialogBase + + + Style Manager + + + + + Marker + + + + + Line + + + + + Fill + + + + + Color ramp + + + + + Tags + + + + + Add item + + + + + Edit item + + + + + Edit + + + + + Remove item + + + + + Share + + + + + QgsSvgAnnotationDialog + + + SVG annotation + + + + + Delete + + + + + Select SVG file + + + + + SVG files + + + + + QgsSvgCache + + + SVG request failed [error: %1 - url: %2] + + + + + + SVG + + + + + SVG request error [status: %1 - reason phrase: %2] + + + + + %1 of %2 bytes of svg image downloaded. + + + + + QgsSvgMarkerSymbolLayerV2Widget + + + Select SVG file + + + + + SVG files + + + + + QgsSymbolLevelsV2Dialog + + + Layer %1 + + + + + QgsSymbolLevelsV2DialogBase + + + Symbol Levels + + + + + Enable symbol levels + + + + + Define the order in which the symbol layers are rendered. The numbers in the cells define in which rendering pass the layer will be drawn. + + + + + QgsSymbolV2SelectorDialog + + + Invalid Selection! + + + + + Kindly select a symbol to add layer. + + + + + QgsSymbolV2SelectorDialogBase + + + Symbol selector + + + + + Symbol layers + + + + + Add symbol layer + + + + + Remove symbol layer + + + + + Lock layer's color + + + + + Move up + + + + + Move down + + + + + QgsSymbolsListWidget + + + Symbol name + + + + + Please enter name for the symbol: + + + + + New symbol + + + + + Save symbol + + + + + Symbol with name '%1' already exists. Overwrite? + + + + + Transparency %1% + + + + + QgsTINInterpolatorDialog + + + Linear + + + + + + Clough-Toucher (cubic) + + + + + Save triangulation to file + + + + + QgsTINInterpolatorDialogBase + + + Triangle based interpolation + + + + + Interpolation method + + + + + Export triangulation to shapefile after interpolation + + + + + Output file + + + + + ... + + + + + QgsTextAnnotationDialog + + + Delete + + + + + Select font color + + + + + QgsTextAnnotationDialogBase + + + Annotation text + + + + + B + + + + + I + + + + + QgsTileScaleWidget + + + Form + + + + + Tile scale + + + + + QgsTipFactory + + + Quantum GIS is open source + + + + + Quantum GIS is open source software. This means that the software source code can be freely viewed and modified. The GPL places a restriction that any modifications you make must be made available in source form to whoever you give modified versions to, and that you can not create a new version of Quantum GIS under a 'closed source' license. Visit <a href="http://qgis.org"> the QGIS home page (http://qgis.org)</a> for more information. + + + + + QGIS Publications + + + + + If you write a scientific paper or any other article that refers to QGIS we would love to include your work in the <a href="http://www.qgis.org/en/community/qgis-case-studies.html">case studies section</a> of the Quantum GIS home page (http://http://www.qgis.org/en/community/qgis-case-studies.html). + + + + + Become an QGIS translator + + + + + Would you like to see QGIS in your native language? We are looking for more translators and would appreciate your help! The translation process is fairly straight forward - instructions are available in the QGIS wiki <a href="http://www.qgis.org/wiki/GUI_Translation">translator's page (http://www.qgis.org/wiki/GUI_Translation).</a> + + + + + QGIS Mailing lists + + + + + If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our sofware. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://www.qgis.org/en/community/mailing-lists.html">community section</a> of the QGIS home page (http://www.qgis.org/en/community/mailing-lists.html). + + + + + Is it 'QGIS' or 'Quantum GIS'? + + + + + Both are correct. For articles we suggest you write 'Quantum GIS (QGIS) is ....' and then refer to it as QGIS thereafter. + + + + + How do I refer to Quantum GIS? + + + + + QGIS is spelled in all caps. We have various subprojects of the QGIS project and it will help to avoid confusion if you refer to each by its name:<ul><li>QGIS Library - this is the C++ library that contains the core logic that is used to build the QGIS user interface and other applications.</li><li>QGIS Application - this is the desktop application that you know and love so much :-).</li><li>QGIS Mapserver - this is a server-side application based on the QGIS Library that will serve up your .qgs projects using the WMS protocol.</li></ul> + + + + + Add the current date to a map layout + + + + + You can add a current date variable to your map layout. Create a regular text label and add the string $CURRENT_DATE(yyyy-MM-dd) to the text box. See the <a href="http://doc.qt.nokia.com/latest/qdate.html#toString">QDate::toString format documentation</a> for the possible date formats. + + + + + Moving Elements and Maps in the Print Composer + + + + + In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the <strong>Position and Size</strong> dialogue, which can be found in the tab <strong>Item &rarr; General Options &rarr; Position and Size</strong>. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame. + + + + + Lock an element in the layout view + + + + + By left clicking an element in the layout view you can select it, by right clicking an element you can lock it. A lock symbol will appear in the upper left corner of the selected element. This prevents the element from accidentally being moved with the mouse. While in a locked state, you cannot move an element with the mouse but you can still move it with the arrow keys or by absolutely positioning it by setting its <strong>Position and Size</strong>. + + + + + Rotating a map and linking a north arrow + + + + + You can rotate a map by setting its rotation value in the <strong>Item tab &rarr; Map</strong> section. To place a north arrow in your layout you can use the <strong>Add Image</strong> tool, the button with the little camera icon. QGIS comes with a selection of north arrows. After the placement of the north arrow in the layout you can link it with a specific map frame by activating the <strong>Sync with map</strong> checkbox and selecting a map frame. Whenever you change the rotation value of a linked map, the north arrow will now automatically adjust its rotation. + + + + + Numeric scale value in map layout linked to map frame + + + + + If you want to place a text label as a placeholder for the current scale, linked to a map frame, you need to place a scalebar and set the style to 'Numeric'. You also need to select the map frame, if there is more than one. + + + + + Using the mouse scroll wheel + + + + + You can use the scroll wheel on your mouse to zoom in, out and pan the map. Scroll forwards to zoom in, scroll backwards to zoom out and press and hold the scroll wheel down to pan the map. You can configure options for scroll wheel behaviour in the Options panel. + + + + + Stopping rendering + + + + + Sometimes you have a very large dataset which takes ages to draw. You can press 'esc' (the escape key), or click the small red 'X' icon in the status bar to the bottom right of the window at any time to halt rendering. If you are going to be performing several actions (e.g. modifying symbology options) and wish to temporarily disable map rendering while you do so, you can uncheck the 'Render' checkbox in the bottom right of the status bar. Don't forget to check it on again when you are ready to have the map draw itself again! + + + + + Join intersected polylines when rendering + + + + + When applying layered styles to a polyline layer, you can join intersecting lines together simply by enabling symbol levels. The image below shows a before (left) and after (right) view of an intersection when symbol levels are enabled. + + + + + Auto-enable on the fly projection + + + + + In the options dialog, under the CRS tab, you can set QGIS so that whenever you create a new project, 'on the fly projection' is enabled automatically and a pre-selected Coordinate Reference System of your choice is used. + + + + + Sponsor QGIS + + + + + If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of Quantum GIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project. Please see the <a href="http://qgis.org/en/sponsorship.html">QGIS Sponsorship Web Page</a> for more details. + + + + + Quantum GIS has Plugins! + + + + + Quantum GIS has plugins that extend its functionality. QGIS ships with some core plugins you can explore from the Plugins->Manage Plugins menu. In addition there are over 150 Python plugins contributed by the user community that can be installed from the Plugins->Fetch Python Plugins menu. Don't miss out on all QGIS has to offer---check out the plugins and see what they can do for you. + + + + + QgsTipGui + + + &Previous + + + + + &Next + + + + + QgsTipGuiBase + + + QGIS Tips! + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">A nice tip goes here...</span></p></body></html> + + + + + I've had enough tips, don't show this on start up any more! + + + + + QgsTransformOptionsDialog + + + Dialog + + + + + Select transformation type: + + + + + Linear + + + + + Polynomial 1 + + + + + Polynomial 2 + + + + + Polynomial 3 + + + + + Thin plate spline (TPS) + + + + + Generate ESRI world file (.tfw) + + + + + QgsTransformSettingsDialog + + + Transformation settings + + + + + Transformation type: + + + + + Resampling method: + + + + + Nearest neighbour + + + + + + + Linear + + + + + Cubic + + + + + Cubic Spline + + + + + Lanczos + + + + + Compression: + + + + + Output raster: + + + + + + + + ... + + + + + Target SRS: + + + + + Generate pdf report: + + + + + Set Target Resolution + + + + + Horizontal + + + + + Vertical + + + + + Create world file + + + + + Generate pdf map: + + + + + Use 0 for transparency when needed + + + + + Load in QGIS when done + + + + + Helmert + + + + + Polynomial 1 + + + + + Polynomial 2 + + + + + Polynomial 3 + + + + + Thin Plate Spline + + + + + Projective + + + + + + + Info + + + + + Please set output name + + + + + %1 requires at least %2 GCPs. Please define more + + + + + Invalid output file name + + + + + Save raster + + + + + + Select save PDF file + + + + + + PDF Format + + + + + _modified + Georeferencer:QgsOpenRasterDialog.cpp - used to modify a user given file name + + + + + QgsUniqueValueDialog + + + default + + + + + Confirm Delete + + + + + The classification field was changed from '%1' to '%2'. +Should the existing classes be deleted before classification? + + + + + QgsUniqueValueDialogBase + + + Form1 + + + + + Classification field + + + + + Classify + + + + + Add class + + + + + Delete classes + + + + + Randomize Colors + + + + + Reset Colors + + + + + Restrict changes to common properties + + + + + QgsVectorColorBrewerColorRampV2DialogBase + + + ColorBrewer ramp + + + + + Scheme name + + + + + Colors + + + + + Preview + + + + + QgsVectorDataProvider + + + Codec %1 not found. Falling back to system locale + + + + + Add Features + + + + + Delete Features + + + + + Change Attribute Values + + + + + Add Attributes + + + + + Delete Attributes + + + + + Create Spatial Index + + + + + Fast Access to Features at ID + + + + + Change Geometries + + + + + QgsVectorFieldSymbolLayerWidget + + + X attribute + + + + + Y attribute + + + + + Length attribute + + + + + Angle attribute + + + + + Height attribute + + + + + QgsVectorGradientColorRampV2Dialog + + + Discrete + + + + + Continous + + + + + Gradient file : %1 + + + + + License file : %1 + + + + + + + + Offset of the stop + + + + + + + + Please enter offset in percents (%) of the new stop + + + + + QgsVectorGradientColorRampV2DialogBase + + + Gradient color ramp + + + + + Color 1 + + + + + + Change + + + + + Color 2 + + + + + Type + + + + + Multiple stops + + + + + Add stop + + + + + Remove stop + + + + + Color + + + + + Offset (%) + + + + + Preview + + + + + Information + + + + + QgsVectorLayer + + + Updating feature count for layer %1 + + + + + Abort + + + + + Unknown renderer + + + + + No renderer object + + + + + Classification field not found + + + + + renderer failed to save + + + + + no renderer + + + + + ERROR: no provider + + + + + ERROR: layer not editable + + + + + SUCCESS: %n attribute(s) deleted. + deleted attributes count + + + + + + + + ERROR: %n attribute(s) not deleted. + not deleted attributes count + + + + + + + + SUCCESS: %n attribute(s) added. + added attributes count + + + + + + + + ERROR: %n new attribute(s) not added + not added attributes count + + + + + + + + SUCCESS: attribute %1 was added. + + + + + ERROR: attribute %1 not added + + + + + SUCCESS: %n attribute value(s) changed. + changed attribute values count + + + + + + + + ERROR: %n attribute value change(s) not applied. + not changed attribute values count + + + + + + + + SUCCESS: %n feature(s) added. + added features count + + + + + + + + ERROR: %n feature(s) not added. + not added features count + + + + + + + + ERROR: %n feature(s) not added - provider doesn't support adding features. + not added features count + + + + + + + + SUCCESS: %n geometries were changed. + changed geometries count + + + + + + + + ERROR: %n geometries not changed. + not changed geometries count + + + + + + + + SUCCESS: %n feature(s) deleted. + deleted features count + + + + + + + + ERROR: %n feature(s) not deleted. + not deleted features count + + + + + + + + + Provider errors: + + + + + Commit errors: + %1 + + + + + General: + + + + + Layer comment: %1 + + + + + Storage type of this layer: %1 + + + + + Source for this layer: %1 + + + + + Geometry type of the features in this layer: %1 + + + + + The number of features in this layer: %1 + + + + + Editing capabilities of this layer: %1 + + + + + Extents: + + + + + In layer spatial reference system units : + + + + + + xMin,yMin %1,%2 : xMax,yMax %3,%4 + + + + + unknown extent + + + + + + In project spatial reference system units : + + + + + Layer Spatial Reference System: + + + + + Project (Output) Spatial Reference System: + + + + + (Invalid transformation of layer extents) + + + + + Attribute field info: + + + + + Field + + + + + Type + + + + + Length + + + + + Precision + + + + + Comment + + + + + QgsVectorLayerProperties + + + + + QGIS Layer Style File + + + + + + + SLD File + + + + + Layer Properties - %1 + + + + + + Stop editing mode to enable this. + + + + + Transparency: %1% + + + + + + Single Symbol + + + + + + Graduated Symbol + + + + + + Continuous Color + + + + + + Unique Value + + + + + Insert expression + + + + + This button opens the query builder and allows you to create a subset of features to display on the map canvas rather than displaying all features in the layer + + + + + The query used to limit the features in the layer is shown here. To enter or modify the query, click on the Query Builder button + + + + + + Spatial Index + + + + + Creation of spatial index successful + + + + + Creation of spatial index failed + + + + + + Default Style + + + + + Load layer properties from style file + + + + + Load Style + + + + + Save layer properties as style file + + + + + Saved Style + + + + + Symbology + + + + + Do you wish to use the new symbology implementation for this layer? + + + + + Save Style + + + + + Save Style... + + + + + QgsVectorLayerPropertiesBase + + + Layer Properties + + + + + Restore Default Style + + + + + Save As Default + + + + + Load Style ... + + + + + Save Style ... + + + + + Style + + + + + Legend type + + + + + Transparency + + + + + New symbology + + + + + Labels + + + + + Labels (deprecated) + + + + + Display labels + + + + + Fields + + + + + General + + + + + Options + + + + + CRS + + + + + Create Spatial Index + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify CRS + + + + + Update Extents + + + + + Use scale dependent rendering + + + + + + Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exclusive)</p></body></html> + + + + + + Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inclusive)</p></body></html> + + + + + + Current + + + + + Subset + + + + + Query Builder + + + + + Provider-specific options + + + + + Encoding + + + + + Display + + + + + Legend display text + + + + + Map Tip display text + + + + + Inserts an expression into the action + + + + + Insert expression... + + + + + The valid attribute names for this layer + + + + + Inserts the selected field into the action + + + + + Insert field + + + + + HTML + + + + + Field + + + + + Metadata + + + + + Title + + + + + Abstract + + + + + Actions + + + + + Joins + + + + + Join layer + + + + + Join field + + + + + Target field + + + + + Diagrams + + + + + QgsVectorLayerSaveAsDialog + + + Layer CRS + + + + + Project CRS + + + + + Selected CRS + + + + + Save layer as... + + + + + Select the coordinate reference system for the vector file. The data points will be transformed from the layer coordinate reference system. + + + + + QgsVectorLayerSaveAsDialogBase + + + Save vector layer as... + + + + + Save as + + + + + + Browse + + + + + Encoding + + + + + Format + + + + + OGR creation options + + + + + Data source + + + + + Layer + + + + + This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don't support it. + + + + + Skip attribute creation + + + + + Add saved file to map + + + + + CRS + + + + + QgsVectorRandomColorRampV2DialogBase + + + Random color ramp + + + + + Hue + + + + + + + from + + + + + + + to + + + + + Saturation + + + + + Value + + + + + Classes + + + + + Preview + + + + + QgsWCSConnectionItem + + + Edit... + + + + + Delete + + + + + QgsWCSRootItem + + + New Connection... + + + + + QgsWCSSourceSelect + + + Select a layer + + + + + No CRS selected + + + + + QgsWFSConnectionItem + + + Edit... + + + + + Delete + + + + + Modify WFS connection + + + + + QgsWFSData + + + Loading WFS data +%1 + + + + + Abort + + + + + QgsWFSProvider + + + unknown + + + + + received %1 bytes from %2 + + + + + Error + + + + + QgsWFSRootItem + + + New Connection... + + + + + Create a new WFS connection + + + + + QgsWFSSourceSelect + + + Network Error + + + + + Capabilities document is not valid + + + + + Server Exception + + + + + Error + + + + + No Layers + + + + + capabilities document contained no layers. + + + + + Create a new WFS connection + + + + + Modify WFS connection + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + QgsWFSSourceSelectBase + + + Add WFS Layer from a Server + + + + + Server connections + + + + + C&onnect + + + + + &New + + + + + Edit + + + + + Delete + + + + + Load connections from file + + + + + Load + + + + + Save connections to file + + + + + Save + + + + + Title + + + + + Name + + + + + Abstract + + + + + Cache +Features + + + + + Filter + + + + + Coordinate reference system + + + + + Change ... + + + + + QgsWMSConnection + + + WMS Password for %1 + + + + + QgsWMSConnectionItem + + + Edit... + + + + + Delete + + + + + QgsWMSRootItem + + + New Connection... + + + + + QgsWMSSourceSelect + + + &Add + + + + + Add selected layers to map + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + encoding %1 not supported. + + + + + WMS Provider + + + + + Could not open the WMS Provider + + + + + Options (%n coordinate reference systems available) + crs count + + + + + + + + Select layer(s) + + + + + Select layer(s) or a tileset + + + + + Select either layer(s) or a tileset + + + + + Coordinate Reference System (%n available) + crs count + + + + + + + + No common CRS for selected layers. + + + + + No CRS selected + + + + + No image encoding selected + + + + + %n Layer(s) selected + selected layer count + + + + + + + + Tileset selected + + + + + Could not understand the response. The %1 provider said: +%2 + + + + + WMS proxies + + + + + Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. + + + + + parse error at row %1, column %2: %3 + + + + + network error: %1 + + + + + The %1 connection already exists. Do you want to overwrite it? + + + + + Confirm Overwrite + + + + + QgsWMSSourceSelectBase + + + Add Layer(s) from a Server + + + + + Ready + + + + + Layers + + + + + C&onnect + + + + + &New + + + + + Edit + + + + + Delete + + + + + Adds a few example WMS servers + + + + + Add default servers + + + + + ID + + + + + Name + + + + + + + Title + + + + + Abstract + + + + + Image encoding + + + + + Save connections to file + + + + + Save + + + + + Load connections from file + + + + + Load + + + + + Options + + + + + Layer name + + + + + Coordinate Reference System + + + + + Change ... + + + + + Tile size + + + + + Feature limit for GetFeatureInfo + + + + + 10 + + + + + Layer Order + + + + + Move selected layer UP + + + + + Up + + + + + Move selected layer DOWN + + + + + Down + + + + + + Layer + + + + + + Style + + + + + Tilesets + + + + + Format + + + + + Tileset + + + + + CRS + + + + + Server Search + + + + + Search + + + + + Description + + + + + URL + + + + + Add selected row to WMS list + + + + + QgsWcsCapabilities + + + empty capabilities document + + + + + + +Tried URL: %1 + + + + + Capabilities request redirected. + + + + + empty of capabilities: %1 + + + + + Download of capabilities failed: %1 + + + + + WCS + + + + + %1 of %2 bytes of capabilities downloaded. + + + + + Exception + + + + + Could not get WCS capabilities: %1 + + + + + + + + Dom Exception + + + + + + + Could not get WCS capabilities in the expected format (DTD): no %1 found. +This might be due to an incorrect WCS Server URL. +Tag:%3 +Response was: +%4 + + + + + Version not supported + + + + + WCS server version %1 is not supported by Quantum GIS (supported versions: 1.0.0, 1.1.0, 1.1.2) + + + + + Could not get WCS capabilities: %1 at line %2 column %3 +This is probably due to an incorrect WCS Server URL. +Response was: + +%4 + + + + + QgsWcsProvider + + + Cannot describe coverage + + + + + Coverage not found + + + + + Cannot calculate extent + + + + + Cannot get test dataset. + + + + + Received coverage has wrong extent %1 (expected %2) + + + + + + + + + + + + + + + + + + + + WCS + + + + + Rotating raster + + + + + Block read OK + + + + + Received coverage has wrong size %1 x %2 (expected %3 x %4) + + + + + Getting map via WCS. + + + + + Map request error (Status: %1; Reason phrase: %2; URL:%3) + + + + + Map request error:<br>Title: %1<br>Error: %2<br>URL: <a href='%3'>%3</a>) + + + + + Map request error (Status: %1; Response: %2; URL:%3) + + + + + Cannot find boundary in multipart content type + + + + + Expected 2 parts, %1 received + + + + + More than 2 parts (%1) received + + + + + Map request error (Title:%1; Error:%2; URL: %3) + + + + + Map request error (Response: %1; URL:%2) + + + + + Content-Transfer-Encoding %1 not supported + + + + + No data received + + + + + Cannot create memory file + + + + + Map request failed [error:%1 url:%2] + + + + + Not logging more than 100 request errors. + + + + + %1 of %2 bytes of map downloaded. + + + + + Dom Exception + + + + + Could not get WCS Service Exception at %1: %2 at line %3 column %4 + +Response was: + +%5 + + + + + Request contains a format not offered by the server. + + + + + Request is for a Coverage not offered by the service instance. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. + + + + + Request does not include a parameter value, and the server instance did not declare a default value for that dimension. + + + + + Request contains an invalid parameter value. + + + + + No other exceptionCode specified by this service and server applies to this exception. + + + + + Operation request contains an output CRS that can not be used within the output format. + + + + + Operation request specifies to "store" the result, but not enough storage is available to do this. + + + + + (No error code was reported) + + + + + (Unknown error code) + + + + + The WCS vendor also reported: + + + + + composed error message '%1'. + + + + + + Property + + + + + + Value + + + + + Name (identifier) + + + + + + Title + + + + + + Abstract + + + + + Fixed Width + + + + + Fixed Height + + + + + Native CRS + + + + + Native Bounding Box + + + + + WGS 84 Bounding Box + + + + + + Available in CRS + + + + + + (and %n more) + crs + + + + + + + + + Available in format + + + + + + Coverages + + + + + Cache Stats + + + + + Server Properties + + + + + Keywords + + + + + Online Resource + + + + + Contact Person + + + + + Fees + + + + + Access Constraints + + + + + Image Formats + + + + + GetCapabilitiesUrl + + + + + Get Coverage Url + + + + + &nbsp;<font color="red">(advertised but ignored)</font> + + + + + And %1 more coverages + + + + + QgsWmsProvider + + + Cannot parse URI + + + + + Cannot calculate extent + + + + + Cannot set CRS + + + + + Number of layers and styles don't match + + + + + + + + + + + + + + + + + + + + + WMS + + + + + Number of tile layers must be one + + + + + Tile layer not found + + + + + Tile layer or tile matrix set not found + + + + + Getting map via WMS. + + + + + Getting tiles. + + + + + + %n tile requests in background + tile request count + + + + + + + + + , %n cache hits + tile cache hits + + + + + + + + + , %n cache misses. + tile cache missed + + + + + + + + + , %n errors. + errors + + + + + + + + image is NULL + + + + + unexpected image size + + + + + Tile request error + + + + + Status: %1 +Reason phrase: %2 + + + + + Tile request error (Title:%1; Error:%2; URL: %3) + + + + + Tile request error (Status:%1; Content-Type:%2; Length:%3; URL: %4) + + + + + + Returned image is flawed [%1] + + + + + Tile request failed [error:%1 url:%2] + + + + + + Not logging more than 100 request errors. + + + + + Map request error (Status: %1; Reason phrase: %2; URL:%3) + + + + + Map request error (Title:%1; Error:%2; URL: %3) + + + + + Map request error (Status: %1; Response: %2; URL:%3) + + + + + Map request failed [error:%1 url:%2] + + + + + empty capabilities document + + + + + +Tried URL: %1 + + + + + Capabilities request redirected. + + + + + empty of capabilities: %1 + + + + + Download of capabilities failed: %1 + + + + + %1 of %2 bytes of capabilities downloaded. + + + + + %1 of %2 bytes of map downloaded. + + + + + + + Dom Exception + + + + + Could not get WMS capabilities: %1 at line %2 column %3 +This is probably due to an incorrect WMS Server URL. +Response was: + +%4 + + + + + Could not get WMS capabilities in the expected format (DTD): no %1 or %2 found. +This might be due to an incorrect WMS Server URL. +Tag:%3 +Response was: +%4 + + + + + Could not get WMS Service Exception at %1: %2 at line %3 column %4 + +Response was: + +%5 + + + + + Request contains a format not offered by the server. + + + + + Request contains a CRS not offered by the server for one or more of the Layers in the request. + + + + + Request contains a SRS not offered by the server for one or more of the Layers in the request. + + + + + GetMap request is for a Layer not offered by the server, or GetFeatureInfo request is for a Layer not shown on the map. + + + + + Request is for a Layer in a Style not offered by the server. + + + + + GetFeatureInfo request is applied to a Layer which is not declared queryable. + + + + + GetFeatureInfo request contains invalid X or Y value. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. + + + + + Request does not include a sample dimension value, and the server did not declare a default value for that dimension. + + + + + Request contains an invalid sample dimension value. + + + + + Request is for an optional operation that is not supported by the server. + + + + + (No error code was reported) + + + + + (Unknown error code) + + + + + The WMS vendor also reported: + + + + + composed error message '%1'. + + + + + Extent for layer %1 not found in capabilities + + + + + + + + Property + + + + + + + + Value + + + + + + Name + + + + + Visibility + + + + + Visible + + + + + Hidden + + + + + + + Title + + + + + + + Abstract + + + + + Can Identify + + + + + + + + Yes + + + + + + + + No + + + + + Can be Transparent + + + + + Can Zoom In + + + + + Cascade Count + + + + + Fixed Width + + + + + Fixed Height + + + + + WGS 84 Bounding Box + + + + + + Available in CRS + + + + + (and %n more) + crs + + + + + + + + Available in style + + + + + + Server Properties + + + + + + Selected Layers + + + + + + Other Layers + + + + + Tile Layer Properties + + + + + Cache Stats + + + + + WMS Version + + + + + Keywords + + + + + Online Resource + + + + + Contact Person + + + + + Fees + + + + + Access Constraints + + + + + Image Formats + + + + + Identify Formats + + + + + Layer Count + + + + + Tile Layer Count + + + + + GetCapabilitiesUrl + + + + + GetMapUrl + + + + + + &nbsp;<font color="red">(advertised but ignored)</font> + + + + + GetFeatureInfoUrl + + + + + GetTileUrl + + + + + Tile templates + + + + + FeatureInfo templates + + + + + Tileset Properties + + + + + WMTS + + + + + WMS-C + + + + + Selected + + + + + Available Styles + + + + + CRS + + + + + Bounding Box + + + + + Available Tilesets + + + + + Cache stats + + + + + Hits + + + + + Misses + + + + + Errors + + + + + identify request redirected. + + + + + Map getfeatureinfo error %1: %2 + + + + + ERROR: GetFeatureInfo failed + + + + + Map getfeatureinfo error: %1 [%2] + + + + + QgsWmtsDimensionsBase + + + Dialog + + + + + Dimension + + + + + + Value + + + + + Abstract + + + + + Default + + + + + QgsZonalStatisticsDialogBase + + + Dialog + + + + + Raster layer: + + + + + Polygon layer containing the zones: + + + + + Output column prefix: + + + + + QgsZonalStatisticsPlugin + + + + + &Zonal statistics + + + + + Calculating zonal statistics... + + + + + Abort... + + + + + RgExportDlg + + + Export feature + + + + + Select destination layer + + + + + New temporary layer + + + + + RgLineVectorLayerSettingsWidget + + + Transportation layer + + + + + Layer + + + + + Direction field + + + + + Value for forward direction + + + + + Value for reverse direction + + + + + Value two-way direction + + + + + Speed field + + + + + km/h + + + + + m/s + + + + + Default settings + + + + + Direction + + + + + Two-way direction + + + + + Forward direction + + + + + Reverse direction + + + + + Cost + + + + + Line lengths + + + + + Speed + + + + + + Always use default + + + + + RgSettingsDlg + + + Road graph plugin settings + + + + + Time unit + + + + + Distance unit + + + + + Topology tolerance + + + + + second + + + + + hour + + + + + meter + + + + + kilometer + + + + + RgShortestPathWidget + + + Shortest path + + + + + Start + + + + + Stop + + + + + Criterion + + + + + + Length + + + + + + Time + + + + + Calculate + + + + + Export + + + + + Clear + + + + + Help + + + + + Point not selected + + + + + First, select start and stop points. + + + + + Plugin isn't configured + + + + + Plugin isn't configured! + + + + + + Tie point failed + + + + + Start point doesn't tie to the road! + + + + + Stop point doesn't tie to the road! + + + + + Path not found + + + + + RoadGraphPlugin + + + Settings + + + + + Road graph plugin settings + + + + + + Road graph + + + + + SEXTANTE + + Analysis + + + + &SEXTANTE toolbox + + + + &SEXTANTE modeler + + + + &SEXTANTE history and log + + + + &SEXTANTE options and configuration + + + + &SEXTANTE results viewer + + + + + SaDbTableModel + + + Schema + + + + + Table + + + + + Type + + + + + SRID + + + + + Line Interpretation + + + + + Geometry column + + + + + Sql + + + + + SaNewConnection + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + Failed to load interface + + + + + + Test connection + + + + + Connection to %1 was successful + + + + + Connection failed. Check settings and try again. + +SQL Anywhere error code: %1 +Description: %2 + + + + + SaNewConnectionBase + + + Create a new SQL Anywhere connection + + + + + Connection Information + + + + + Name + + + + + Host + + + + + Port + + + + + Server + + + + + Database + + + + + Connection Parameters + + + + + Username + + + + + Password + + + + + Name of the new connection + + + + + Name or IP address of computer hosting the database server (leave blank for local connections) + + + + + Port number used by the database server (leave blank for default 2638) + + + + + Name of the database server (leave blank for default server on host) + + + + + Name of the database (leave blank for default database on server) + + + + + Additional connection parameters + + + + + Database username + + + + + Database password + + + + + Save the connection username in the registry + + + + + Save Username + + + + + &Test Connect + + + + + Save the connection password in the registry (WARNING: NOT SECURE) + + + + + Save Password + + + + + Encrypt packets using simple encryption + + + + + Simple Encryption + + + + + Use estimates for certain layer properties such as cardinality, extent, etc. (improves performance) + + + + + Estimate table metadata + + + + + Search for geometry columns in tables owned by other users + + + + + Search other users' tables + + + + + SaSourceSelect + + + &Add + + + + + &Build Query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Schema + + + + + + Table + + + + + + Type + + + + + + SRID + + + + + + Line Interpretation + + + + + + Geometry column + + + + + + Sql + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Select Table + + + + + You must select a table in order to add a layer. + + + + + Failed to load interface + + + + + Connection failed + + + + + Connection to database %1 failed. Check settings and try again. + +SQL Anywhere error code: %2 +Description: %3 + + + + + No accessible tables found + + + + + Database connection was successful, but no tables containing geometry columns were %1. + + + + + found + + + + + found in your schema + + + + + SaSourceSelectBase + + + Add SQL Anywhere layer + + + + + SQL Anywhere Connections + + + + + Delete + + + + + Edit + + + + + New + + + + + Connect + + + + + Search options + + + + + Search + + + + + Search mode + + + + + Search in columns + + + + + SelectGeoRasterBase + + + Select Oracle Spatial GeoRaster + + + + + Server Connections + + + + + Edit + + + + + Delete + + + + + &New + + + + + C&onnect + + + + + Subdatasets + + + + + Selection + + + + + Update + + + + + Ready + + + + + SettingsDialog + + + Font + + + + + Size + + + + + API file + + + + + Browse + + + + + Use preloaded API file + + + + + SextanteToolbox + + + SEXTANTE Toolbox + + + + + Click here to configure +additional algorithm providers + + + + + Enter algorithm name to filter list + + + + Search... + + + + Execute + + + + Execute as batch process + + + + Edit rendering styles for outputs + + + + Warning + + + + Recently used algorithms + + + + + SimplifyLineDialog + + + Simplify line tolerance + + + + + Set tolerance + + + + + OK + + + + + SqlAnywhere + + + Add SQL Anywhere Layer... + + + + + Store vector layers within a SQL Anywhere database + + + + + Invalid Layer + + + + + %1 is an invalid layer and cannot be loaded. + + + + + SymbolsListWidget + + + Form + + + + + Unit + + + + + Millimeter + + + + + Map unit + + + + + Opacity + + + + + Color + + + + + Change + + + + + Size + + + + + Rotation + + + + + ° + + + + + Width + + + + + Saved styles + + + + + Symbol Name + + + + + Style + + + + + Advanced + + + + + UndoWidget + + + Undo/Redo + + + + + Undo + + + + + Redo + + + + + ValidateDialog + + Check geometry validity + + + + Geometry errors + + + + Total encountered errors + + + + Error! + + + + Please specify input vector layer + + + + Please specify input field + + + + Please specify output shapefile + + + + Cancel + + + + Geometry + + + + Created output shapefile: +%1 +%2 + +Would you like to add the new layer to the TOC? + + + + Error loading output shapefile: +%1 + + + + Feature + + + + Error(s) + + + + + VisualDialog + + Error! + + + + Please specify input vector layer + + + + Please specify input field + + + + List unique values + + + + Unique values + + + + Total unique values + + + + Basics statistics + + + + Statistics output + + + + Nearest neighbour analysis + + + + Nearest neighbour statistics + + + + Cancel + + + + Parameter + + + + Value + + + + + WidgetCentroidFill + + + Form + + + + + WidgetEllipseBase + + + Form + + + + + Settings + + + + + Border color + + + + + + Change + + + + + + Fill color + + + + + + Symbol width + + + + + + Outline width + + + + + + Symbol height + + + + + + Rotation + + + + + Data defined settings + + + + + Outline color + + + + + Shape + + + + + WidgetFontMarker + + + Form + + + + + Size + + + + + Change + + + + + Font family + + + + + ° + + + + + Offset X,Y + + + + + Color + + + + + Rotation + + + + + WidgetLineDecoration + + + Form + + + + + Change + + + + + Pen width + + + + + Color + + + + + WidgetLinePatternFill + + + Form + + + + + Line width + + + + + Color + + + + + Angle + + + + + Change + + + + + Distance + + + + + Offset + + + + + WidgetMarkerLine + + + Form + + + + + Marker placement + + + + + with interval + + + + + on every vertex + + + + + on last vertex only + + + + + on first vertex only + + + + + Rotate marker + + + + + Line offset + + + + + on central point + + + + + WidgetPointPatternFill + + + Form + + + + + Horizontal distance + + + + + Vertical distance + + + + + Horizontal displacement + + + + + Vertical displacement + + + + + WidgetSVGFill + + + Form + + + + + Border color + + + + + Color + + + + + + Change + + + + + Texture width + + + + + Rotation + + + + + Border width + + + + + SVG Groups + + + + + SVG Symbols + + + + + ... + + + + + WidgetSimpleFill + + + Form + + + + + Border color + + + + + Fill style + + + + + Color + + + + + Offset X,Y + + + + + + Change + + + + + Border style + + + + + Border width + + + + + WidgetSimpleLine + + + Form + + + + + Color + + + + + + Change + + + + + Pen width + + + + + Offset + + + + + Pen style + + + + + Use custom dash pattern + + + + + Join style + + + + + Cap style + + + + + WidgetSimpleMarker + + + Form + + + + + Angle + + + + + + Change + + + + + Border color + + + + + Size + + + + + Fill color + + + + + Offset X,Y + + + + + WidgetSvgMarker + + + Form + + + + + Size + + + + + + Change + + + + + Offset X,Y + + + + + Angle + + + + + Border color + + + + + Border width + + + + + Color + + + + + SVG Groups + + + + + SVG Image + + + + + ... + + + + + WidgetVectorFieldBase + + + Form + + + + + X attribute + + + + + Y attribute + + + + + Scale + + + + + Vector field type + + + + + Height only + + + + + Polar + + + + + Cartesian + + + + + Angle units + + + + + Degrees + + + + + Radians + + + + + Angle orientation + + + + + Counterclockwise from east + + + + + Clockwise from north + + + + + [pluginname]GuiBase + + + QGIS Plugin Template + + + + + Plugin Template + + + + + dxf2shpConverter + + + Converts DXF files in Shapefile format + + + + + + &Dxf2Shp + + + + + dxf2shpConverterGui + + + Dxf Importer + + + + + Input and output + + + + + Input DXF file + + + + + + ... + + + + + Output file + + + + + Export text labels + + + + + Output file type + + + + + Polyline + + + + + Polygon + + + + + Point + + + + + + Warning + + + + + Please specify a file to convert. + + + + + Please specify an output file + + + + + Fields description: +* Input DXF file: path to the DXF file to be converted +* Output Shp file: desired name of the shape file to be created +* Shp output file type: specifies the type of the output shape file +* Export text labels checkbox: if checked, an additional shp points layer will be created, and the associated dbf table will contain information about the "TEXT" fields found in the dxf file, and the text strings themselves + +--- +Developed by Paolo L. Scala, Barbara Rita Barricelli, Marco Padula +CNR, Milan Unit (Information Technology), Construction Technologies Institute. +For support send a mail to scala@itc.cnr.it + + + + + + Choose a DXF file to open + + + + + DXF files + + + + + Choose a file name to save to + + + + + Shapefile + + + + + eVis + + + eVis Database Connection + + + + + eVis Event Id Tool + + + + + eVis Event Browser + + + + + Create layer from a database query + + + + + Open an Event Browers and display the selected feature + + + + + Open an Event Browser to explore the current layer's features + + + + + eVisDatabaseConnectionGui + + + + Undefined + + + + + No predefined queries loaded + + + + + + + + + Open File + + + + + New Database connection requested... + + + + + Error: You must select a database type + + + + + Error: No host name entered + + + + + Error: No database name entered + + + + + Connection to [%1.%2] established + + + + + connected + + + + + Tables + + + + + Connection to [%1.%2] failed: %3 + + + + + Error: Parse error at line %1, column %2: %3 + + + + + Error: Unabled to open file [%1] + + + + + Error: Query failed: %1 + + + + + Error: Could not create temporary file, process halted + + + + + Error: A database connection is not currently established + + + + + eVisDatabaseConnectionGuiBase + + + + Database Connection + + + + + Predefined Queries + + + + + Load predefined queries + + + + + Loads an XML file with predefined queries. Use the Open File window to locate the XML file that contains one or more predefined queries using the format described in the user guide. + + + + + The description of the selected query. + + + + + Select the predefined query you want to use from the drop-down list containing queries identified from the file loaded using the Open File icon above. To run the query you need to click on the SQL Query tab. The query will be automatically entered in the query window. + + + + + not connected + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Connection Status: </span></p></body></html> + + + + + Database Host + + + + + Enter the database host. If the database resides on your desktop you should enter ¨localhost¨. If you selected ¨MSAccess¨ as the database type this option will not be available. + + + + + Password to access the database. + + + + + Enter the name of the database. + + + + + Username + + + + + Enter the port through which the database must be accessed if a MYSQL database is used. + + + + + Connect to the database using the parameters selected above. If the connection was successful a message will be displayed in the Output Console below saying the connection was established. + + + + + Connect + + + + + User name to access the database. + + + + + Select the type of database from the list of supported databases in the drop-down menu. + + + + + Database Name + + + + + Password + + + + + Database Type + + + + + Port + + + + + SQL Query + + + + + Run the query entered above. The status of the query will be displayed in the Output Console below. + + + + + Run Query + + + + + Enter the query you want to run in this window. + + + + + A window for status messages to be displayed. + + + + + Output Console + + + + + eVisDatabaseLayerFieldSelectionGuiBase + + + Database File Selection + + + + + The name of the field that contains the Y coordinate of the points. + + + + + The name of the field that contains the X coordinate of the points. + + + + + Enter the name for the new layer that will be created and displayed in QGIS. + + + + + Y Coordinate + + + + + X Coordinate + + + + + Name of New Layer + + + + + eVisGenericEventBrowserGui + + + Generic Event Browser + + + + + Field + + + + + Value + + + + + + + + Warning + + + + + + This tool only supports vector data + + + + + + No active layers found + + + + + + Error + + + + + Unable to connect to either the map canvas or application interface + + + + + An invalid feature was received during initialization + + + + + Event Browser - Displaying records 01 of %1 + + + + + Attribute Contents + + + + + + Event Browser - Displaying records %1 of %2 + + + + + Select Application + + + + + All ( * ) + + + + + eVisGenericEventBrowserGuiBase + + + Display + + + + + Use the Previous button to display the previous photo when more than one photo is available for display. + + + + + Previous + + + + + Use the Next button to display the next photo when more than one photo is available for display. + + + + + Next + + + + + All of the attribute information for the point associated with the photo being viewed is displayed here. If the file type being referenced in the displayed record is not an image but is of a file type defined in the “Configure External Applications” tab then when you double-click on the value of the field containing the path to the file the application to open the file will be launched to view or hear the contents of the file. If the file extension is recognized the attribute data will be displayed in green. + + + + + 1 + + + + + Image display area + + + + + Display area for the image. + + + + + Options + + + + + File path + + + + + Attribute containing path to file + + + + + Use the drop-down list to select the field containing a directory path to the image. This can be an absolute or relative path. + + + + + If checked the path to the image will be defined appending the attribute in the field selected from the “Attribute Containing Path to Image” drop-down list to the “Base Path” defined below. + + + + + Path is relative + + + + + If checked, the relative path values will be saved for the next session. + + + + + + + + + + Remember this + + + + + + + + + + Reset to default + + + + + + Resets the values on this line to the default setting. + + + + + + + + + + Reset + + + + + Compass bearing + + + + + Attribute containing compass bearing + + + + + Use the drop-down list to select the field containing the compass bearing for the image. This bearing usually references the direction the camera was pointing when the image was acquired. + + + + + If checked an arrow pointing in the direction defined by the attribute in the field selected from the drop-down list to the right will be displayed in the QGIS window on top of the point for this image. + + + + + Display compass bearing + + + + + If checked, the Display Compass Bearing values will be saved for the next session. + + + + + Compass offset + + + + + Define the compass offset manually. + + + + + Manual + + + + + A value to be added to the compass bearing. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. + + + + + Define the compass offset using a field from the vector layer attribute table. + + + + + From Attribute + + + + + Use the drop-down list to select the field containing the compass bearing offset. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. + + + + + If checked, the compass offset values will be saved for the next session. + + + + + Resets the compass offset values to the default settings. + + + + + Relative paths + + + + + The base path or url from which images and documents can be “relative” + + + + + + Base Path + + + + + The Base Path onto which the relative path defined above will be appended. + + + + + If checked, the Base Path will be saved for the next session. + + + + + Enters the default “Base Path” which is the path to the directory of the vector layer containing the image information. + + + + + If checked, the Base Path will append only the file name instead of the entire relative path (defined above) to create the full directory path to the file. + + + + + Replace entire path/url stored in image path attribute with user defined +Base Path (i.e. keep only filename from attribute) + + + + + + If checked, the current check-box setting will be saved for the next session. + + + + + + Clears the check-box on this line. + + + + + If checked, the same path rules that are defined for images will be used for non-image documents such as movies, text documents, and sound files. If not checked the path rules will only apply to images and other documents will ignore the Base Path parameter. + + + + + Apply Path to Image rules when loading docs in external applications + + + + + Clicking on Save will save the settings without closing the Options pane. Clicking on Restore Defaults will reset all of the fields to their default settings. It has the same effect as clicking all of the “Reset to default” buttons. + + + + + Configure External Applications + + + + + File extension and external application in which to load a document of that type + + + + + A table containing file types that can be opened using eVis. Each file type needs a file extension and the path to an application that can open that type of file. This provides the capability of opening a broad range of files such as movies, sound recording, and text documents instead of only images. + + + + + Extension + + + + + Application + + + + + Add new file type + + + + + Add a new file type with a unique extension and the path for the application that can open the file. + + + + + Delete current row + + + + + Delete the file type highlighted in the table and defined by a file extension and a path to an associated application. + + + + + eVisImageDisplayWidget + + + Zoom in + + + + + Zoom in to see more detail. + + + + + Zoom out + + + + + Zoom out to see more area. + + + + + Zoom to full extent + + + + + Zoom to display the entire image. + + + + + fTools + + Quantum GIS version detected: + + + + This version of fTools requires at least QGIS version 1.0.0 +Plugin will not be enabled. + + + + &Analysis Tools + + + + Distance matrix + + + + Sum line lengths + + + + Points in polygon + + + + Basic statistics + + + + List unique values + + + + Nearest neighbour analysis + + + + Mean coordinate(s) + + + + Line intersections + + + + &Research Tools + + + + Random selection + + + + Random selection within subsets + + + + Random points + + + + Regular points + + + + Vector grid + + + + Select by location + + + + Polygon from layer extent + + + + &Geoprocessing Tools + + + + Convex hull(s) + + + + Buffer(s) + + + + Intersect + + + + Union + + + + Symetrical difference + + + + Clip + + + + Dissolve + + + + Difference + + + + Eliminate sliver polygons + + + + G&eometry Tools + + + + Export/Add geometry columns + + + + Check geometry validity + + + + Polygon centroids + + + + Delaunay triangulation + + + + Voronoi Polygons + + + + Extract nodes + + + + Simplify geometries + + + + Densify geometries + + + + Multipart to singleparts + + + + Singleparts to multipart + + + + Polygons to lines + + + + Lines to polygons + + + + &Data Management Tools + + + + Define current projection + + + + Join attributes by location + + + + Split vector layer + + + + Merge shapefiles to one + + + + Create spatial index + + + + + geometryThread + + Merge all + + + + Polygon area + + + + Polygon perimeter + + + + Line length + + + + Point x coordinate + + + + Point y coordinate + + + + + grasslabel + + + (1-256) + + + + + (Optional) column to read labels + + + + + 3D-Viewer (NVIZ) + + + + + 3d Visualization + + + + + Add a value to the current category values + + + + + Add elements to layer (ALL elements of the selected layer type!) + + + + + Add missing centroids to closed boundaries + + + + + Add one or more columns to attribute table + + + + + Allocate network + + + + + Assign constant value to column + + + + + Assign new constant value to column only if the result of query is TRUE + + + + + Assign new value as result of operation on columns to column in attribute table + + + + + Assign new value to column as result of operation on columns only if the result of query is TRUE + + + + + Attribute field + + + + + Attribute field (interpolated values) + + + + + Attribute field to (over)write + + + + + Attribute field to join + + + + + Auto-balancing of colors for LANDSAT-TM raster + + + + + Bicubic or bilinear spline interpolation with Tykhonov regularization + + + + + Bilinear interpolation utility for raster maps + + + + + Blend color components for two rasters by given ratio + + + + + Blend red, green, raster layers to obtain one color raster + + + + + Break (topologically clean) polygons (imported from non topological format, like ShapeFile). Boundaries are broken on each point shared between 2 and more polygons where angles of segments are different + + + + + Break lines at each intersection of vector + + + + + Brovey transform to merge multispectral and high-res panchromatic channels + + + + + Buffer + + + + + Build polylines from lines + + + + + Calculate average of raster within areas with the same category in a user-defined base map + + + + + Calculate covariance/correlation matrix for user-defined rasters + + + + + Calculate error matrix and kappa parameter for accuracy assessment of classification result + + + + + Calculate geometry statistics for vectors + + + + + Calculate linear regression from two rasters: y = a + b*x + + + + + Calculate median of raster within areas with the same category in a user-defined base map + + + + + Calculate mode of raster within areas with the same category in a user-defined base map + + + + + Calculate optimal index factor table for LANDSAT-TM raster + + + + + Calculate raster surface area + + + + + Calculate shadow maps from exact sun position + + + + + Calculate shadow maps from sun position determinated by date/time + + + + + Calculate statistics for raster + + + + + Calculate univariate statistics for numeric attributes in a data table + + + + + Calculate univariate statistics from raster based on vector objects + + + + + Calculate univariate statistics from the non-null cells of raster + + + + + Calculate univariate statistics of vector map features + + + + + Calculate volume of data clumps, and create vector with centroids of clumps + + + + + Category or object oriented statistics + + + + + Cats + + + + + Cats (select from the map or using their id) + + + + + Change category values and labels + + + + + Change field + + + + + Change layer number + + + + + Change resolution + + + + + Change the type of boundary dangle to line + + + + + Change the type of bridges connecting area and island or 2 islands from boundary to line + + + + + Change the type of geometry elements + + + + + Choose appropriate format + + + + + Columns management + + + + + Compares bit patterns with raster + + + + + Compress and decompress raster + + + + + Compress raster + + + + + Computes a coordinate transformation based on the control points + + + + + Concentric circles + + + + + Connect nodes by shortest route (traveling salesman) + + + + + Connect selected nodes by shortest tree (Steiner tree) + + + + + Connect vector to database + + + + + Convert 2D vector to 3D by sampling raster + + + + + Convert 2D vector to 3D vector by sampling of elevation raster. Default sampling by nearest neighbour + + + + + Convert GRASS binary vector to GRASS ASCII vector + + + + + Convert a raster to vector within GRASS + + + + + Convert a vector to raster within GRASS + + + + + Convert bearing and distance measurements to coordinates and vice versa + + + + + Convert boundaries to lines + + + + + Convert centroids to points + + + + + Convert coordinates + + + + + Convert coordinates from one projection to another (cs2cs frontend) + + + + + Convert lines to boundaries + + + + + Convert points to centroids + + + + + Convert raster to vector areas + + + + + Convert raster to vector lines + + + + + Convert raster to vector points + + + + + Convert vector to raster using attribute values + + + + + Convert vector to raster using constant + + + + + Convex hull + + + + + Copy a table + + + + + Copy also attribute table (only the table of layer 1 is currently supported) + + + + + Count of neighbouring points + + + + + Create 3D volume map based on 2D elevation and value rasters + + + + + Create a MASK for limiting raster operation + + + + + Create a map containing concentric rings + + + + + Create a raster plane + + + + + Create and add new table to vector + + + + + Create and/or modify raster support files + + + + + Create aspect raster from DEM (digital elevation model) + + + + + Create cross product of category values from multiple rasters + + + + + Create fractal surface of given fractal dimension + + + + + Create grid in current region + + + + + Create new GRASS location and transfer data into it + + + + + Create new GRASS location from metadata file + + + + + Create new GRASS location from raster data + + + + + Create new GRASS location from vector data + + + + + Create new layer with category values based upon user's reclassification of categories in existing raster + + + + + Create new location from .prj (WKT) file + + + + + Create new raster by combining other rasters + + + + + Create new vector by combining other vectors + + + + + Create new vector with current region extent + + + + + Create nodes on network + + + + + Create parallel line to input lines + + + + + Create points + + + + + Create points along input lines + + + + + Create points/segments from input vector lines and positions + + + + + Create quantization file for floating-point raster + + + + + Create random 2D/3D vector points + + + + + Create random cell values with spatial dependence + + + + + Create random points + + + + + Create random vector point contained in raster + + + + + Create raster images with textural features from raster (first serie of indices) + + + + + Create raster of distance to features in input layer + + + + + Create raster of gaussian deviates with user-defined mean and standard deviation + + + + + Create raster of uniform random deviates with user-defined range + + + + + Create raster with contiguous areas grown by one cell + + + + + Create raster with textural features from raster (second serie of indices) + + + + + Create red, green and blue rasters combining hue, intensity, and saturation (his) values from rasters + + + + + Create shaded map + + + + + Create slope raster from DEM (digital elevation model) + + + + + Create standard vectors + + + + + Create surface from rasterized contours + + + + + Create vector contour from raster at specified levels + + + + + Create vector contour from raster at specified steps + + + + + Create watershed basin + + + + + Create watershed subbasins raster + + + + + Cut network by cost isolines + + + + + DXF vector layer + + + + + Database + + + + + Database connection + + + + + Database file + + + + + Database management + + + + + Delaunay triangulation (areas) + + + + + Delaunay triangulation (lines) + + + + + Delaunay triangulation, Voronoi diagram and convex hull + + + + + Delete category values + + + + + Develop images and group + + + + + Develop map + + + + + Directory of rasters to be linked + + + + + Disconnect vector from database + + + + + Display general DB connection + + + + + Display list of category values found in raster + + + + + Display projection information from PROJ.4 projection description file + + + + + Display projection information from PROJ.4 projection description file and create a new location based on it + + + + + Display projection information from a georeferenced file (raster, vector or image) and create a new location based on it + + + + + Display projection information from georeferenced ASCII file containing WKT projection description + + + + + Display projection information from georeferenced ASCII file containing WKT projection description and create a new location based on it + + + + + Display projection information from georeferenced file (raster, vector or image) + + + + + Display projection information of the current location + + + + + Display raster category values and labels + + + + + Display results of SQL selection from database + + + + + Display the HTML manual pages of GRASS + + + + + Display vector attributes + + + + + Display vector map attributes with SQL + + + + + Dissolves boundaries between adjacent areas sharing a common category number or attribute + + + + + Download and import data from WMS server + + + + + Drop column from attribute table + + + + + E00 vector layer + + + + + Elevation raster for height extraction (optional) + + + + + Execute any SQL statement + + + + + Export 3 GRASS rasters (R,G,B) to PPM image at the resolution of the current region + + + + + Export from GRASS + + + + + Export raster as non-georeferenced PNG image format + + + + + Export raster from GRASS + + + + + Export raster series to MPEG movie + + + + + Export raster to 8/24bit TIFF image at the resolution of the current region + + + + + Export raster to ASCII text file + + + + + Export raster to ESRI ARCGRID + + + + + Export raster to GRIDATB.FOR map file (TOPMODEL) + + + + + Export raster to Geo TIFF + + + + + Export raster to POVRAY height-field file + + + + + Export raster to PPM image at the resolution of the current region + + + + + Export raster to VTK-ASCII + + + + + Export raster to Virtual Reality Modeling Language (VRML) + + + + + Export raster to binary MAT-File + + + + + Export raster to binary array + + + + + Export raster to text file as x,y,z values based on cell centers + + + + + Export raster to various formats (GDAL library) + + + + + Export vector from GRASS + + + + + Export vector table from GRASS to database format + + + + + Export vector to DXF + + + + + Export vector to GML + + + + + Export vector to Mapinfo + + + + + Export vector to POV-Ray + + + + + Export vector to PostGIS (PostgreSQL) database table + + + + + Export vector to SVG + + + + + Export vector to Shapefile + + + + + Export vector to VTK-ASCII + + + + + Export vector to various formats (OGR library) + + + + + Exports attribute tables into various format + + + + + Extract features from vector + + + + + Extract selected features + + + + + Extracts terrain parameters from DEM + + + + + Extrudes flat vector object to 3D with fixed height + + + + + Extrudes flat vector object to 3D with height based on attribute + + + + + Fast fourier transform for image processing + + + + + Feature type (for polygons, choose Boundary) + + + + + File management + + + + + Fill lake from seed at given level + + + + + Fill lake from seed point at given level + + + + + Fill no-data areas in raster using v.surf.rst splines interpolation + + + + + Filter and create depressionless elevation map and flow direction map from elevation raster + + + + + Filter image + + + + + Find nearest element in vector 'to' for elements in vector 'from'. Various information about this relation may be uploaded to attribute table of input vector 'from' + + + + + Find shortest path on vector network + + + + + GRASS MODULES + + + + + GRASS shell + + + + + Gaussian kernel density + + + + + Generalization + + + + + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) coordinates + + + + + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) raster + + + + + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) vector + + + + + Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) coordinates + + + + + Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) vector + + + + + Generate surface + + + + + Generate vector contour lines + + + + + Generates area statistics for rasters + + + + + Georeferencing, rectification, and import Terra-ASTER imagery and DEM using gdalwarp + + + + + Graphical raster map calculator + + + + + Help + + + + + Hue Intensity Saturation (HIS) to Red Green Blue (RGB) raster color transform function + + + + + Hydrologic modelling + + + + + Imagery + + + + + Import ASCII raster + + + + + Import DXF vector + + + + + Import ESRI ARC/INFO ASCII GRID + + + + + Import ESRI E00 vector + + + + + Import GDAL supported raster + + + + + Import GDAL supported raster and create a fitted location + + + + + Import GRIDATB.FOR (TOPMODEL) + + + + + Import MapGen or MatLab vector + + + + + Import OGR vector + + + + + Import OGR vector and create a fitted location + + + + + Import OGR vectors in a given data source combining them in a GRASS vector + + + + + Import SPOT VGT NDVI + + + + + Import SRTM HGT + + + + + Import US-NGA GEOnet Names Server (GNS) country file + + + + + Import all OGR/PostGIS vectors in a given data source and create a fitted location + + + + + Import attribute tables in various formats + + + + + Import binary MAT-File(v4) + + + + + Import binary raster + + + + + Import from database into GRASS + + + + + Import geonames.org country files + + + + + Import into GRASS + + + + + Import loaded raster + + + + + Import loaded raster and create a fitted location + + + + + Import loaded vector + + + + + Import loaded vector and create a fitted location + + + + + Import only some layers of a DXF vector + + + + + Import raster from ASCII polygon/line + + + + + Import raster from coordinates using univariate statistics + + + + + Import raster into GRASS + + + + + Import raster into GRASS from QGIS view + + + + + Import raster into GRASS from external data sources in GRASS + + + + + Import text file + + + + + Import vector from gps using gpsbabel + + + + + Import vector from gps using gpstrans + + + + + Import vector into GRASS + + + + + Import vector points from database table containing coordinates + + + + + Input nodes + + + + + Input table + + + + + Interpolate surface + + + + + Inverse distance squared weighting raster interpolation + + + + + Inverse distance squared weighting raster interpolation based on vector points + + + + + Inverse fast fourier transform for image processing + + + + + Join table to existing vector table + + + + + Layers categories management + + + + + Line-of-sight raster analysis + + + + + Link GDAL supported raster as GRASS raster + + + + + Link GDAL supported raster loaded in QGIS as GRASS raster + + + + + Link all GDAL supported rasters in a directory as GRASS rasters + + + + + Loaded layer + + + + + Locate the closest points between objects in two raster maps + + + + + Make each output cell function of the values assigned to the corresponding cells in the input rasters + + + + + Manage features + + + + + Manage image colors + + + + + Manage map colors + + + + + Manage raster cells value + + + + + Manage training dataset + + + + + Map algebra + + + + + Map type conversion + + + + + MapGen or MatLab vector layer + + + + + Mask + + + + + Maximal tolerance value (higher value=more simplification) + + + + + Metadata support + + + + + Minimum size for each basin (number of cells) + + + + + Mosaic up to 4 images + + + + + Name for new raster file (specify file extension) + + + + + Name for new vector file (specify file extension) + + + + + Name for output vector map (optional) + + + + + Name for the output raster map (optional) + + + + + Neighborhood analysis + + + + + Network analysis + + + + + Network maintenance + + + + + Number of rows to be skipped + + + + + Others + + + + + Output GML file + + + + + Output Shapefile + + + + + Output layer name (used in GML file) + + + + + Output raster values along user-defined transect line(s) + + + + + Overlay + + + + + Overlay maps + + + + + Path to GRASS database of input location (optional) + + + + + Path to the OGR data source + + + + + Percentage of first layer (0-99) + + + + + Perform affine transformation (shift, scale and rotate, or GPCs) on vector + + + + + Print projection information from a georeferenced file + + + + + Print projection information from a georeferenced file and create a new location based on it + + + + + Print projection information of the current location + + + + + Projection conversion of vector + + + + + Projection management + + + + + Put geometry variables in database + + + + + Query rasters on their category values and labels + + + + + Random location perturbations of vector points + + + + + Randomly partition points into test/train sets + + + + + Raster + + + + + Raster buffer + + + + + Raster file matrix filter + + + + + Raster neighbours analysis + + + + + Raster support + + + + + Re-project raster from a location to the current location + + + + + Rebuild topology of a vector in mapset + + + + + Rebuild topology of all vectors in mapset + + + + + Recategorize contiguous cells to unique categories + + + + + Reclass category values + + + + + Reclass category values using a column attribute (integer positive) + + + + + Reclass category values using a rules file + + + + + Reclass raster using reclassification rules + + + + + Reclass raster with patches larger than user-defined area size (in hectares) + + + + + Reclass raster with patches smaller than user-defined area size (in hectares) + + + + + Reclassify raster greater or less than user-defined area size (in hectares) + + + + + Recode categorical raster using reclassification rules + + + + + Recode raster + + + + + Reconnect vector to a new database + + + + + Red Green Blue (RGB) to Hue Intensity Saturation (HIS) raster color transformation function + + + + + Region settings + + + + + Register external data sources in GRASS + + + + + Regularized spline with tension raster interpolation based on vector points + + + + + Reinterpolate and compute topographic analysis using regularized spline with tension and smoothing + + + + + Remove all lines or boundaries of zero length + + + + + Remove bridges connecting area and island or 2 islands + + + + + Remove dangles + + + + + Remove duplicate area centroids + + + + + Remove duplicate lines (pay attention to categories!) + + + + + Remove existing attribute table of vector + + + + + Remove outliers from vector point data + + + + + Remove small angles between lines at nodes + + + + + Remove small areas, the longest boundary with adjacent area is removed + + + + + Remove vertices in threshold from lines and boundaries, boundary is pruned only if topology is not damaged (new intersection, changed attachement of centroid), first and last segment of the boundary is never changed + + + + + Rename column in attribute table + + + + + Reports + + + + + Reports and statistics + + + + + Reproject raster from another Location + + + + + Reproject vector from another Location + + + + + Resample raster using aggregation + + + + + Resample raster using interpolation + + + + + Resample raster. Set new resolution first + + + + + Rescale the range of category values in raster + + + + + Sample raster at site locations + + + + + Save the current region as a named region + + + + + Select features by attributes + + + + + Select features overlapped by features in another map + + + + + Separator (| , etc.) + + + + + Set PostgreSQL DB connection + + + + + Set boundary definitions by edge (n-s-e-w) + + + + + Set boundary definitions for raster + + + + + Set boundary definitions from raster + + + + + Set boundary definitions from vector + + + + + Set boundary definitions to current or default region + + + + + Set color rules based on stddev from a map's mean value + + + + + Set general DB connection + + + + + Set general DB connection with a schema (PostgreSQL only) + + + + + Set raster color table + + + + + Set raster color table from existing raster + + + + + Set raster color table from setted tables + + + + + Set raster color table from user-defined rules + + + + + Set region to align to raster + + + + + Set the region to match multiple rasters + + + + + Set the region to match multiple vectors + + + + + Set user/password for driver/database + + + + + Sets the boundary definitions for a raster map + + + + + Show database connection for vector + + + + + Shrink current region until it meets non-NULL data from raster + + + + + Simple map algebra + + + + + Simplify vector + + + + + Snap lines to vertex in threshold + + + + + Solar and irradiation model + + + + + Spatial analysis + + + + + Spatial models + + + + + Split lines to shorter segments + + + + + Statistics + + + + + Sum raster cell values + + + + + Surface management + + + + + Tables management + + + + + Tabulate mutual occurrence (coincidence) of categories for two rasters + + + + + Take vector stream data, transform it to raster, and subtract depth from the output DEM + + + + + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 4 raster + + + + + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 5 raster + + + + + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 7 raster + + + + + Tassled cap vegetation index + + + + + Terrain analysis + + + + + Tests of normality on vector points + + + + + Text file + + + + + Thin no-zero cells that denote line features + + + + + Toolset for cleaning topology of vector map + + + + + Topology management + + + + + Trace a flow through an elevation model + + + + + Transform cells with value in null cells + + + + + Transform features + + + + + Transform image + + + + + Transform null cells in value cells + + + + + Transform value cells in null cells + + + + + Type in map names separated by a comma + + + + + Update raster statistics + + + + + Update vector map metadata + + + + + Upload raster values at positions of vector points to the table + + + + + Upload vector values at positions of vector points + + + + + Vector + + + + + Vector buffer + + + + + Vector geometry analysis + + + + + Vector intersection + + + + + Vector non-intersection + + + + + Vector subtraction + + + + + Vector union + + + + + Vector update by other maps + + + + + Visibility graph construction + + + + + Voronoi diagram (area) + + + + + Voronoi diagram (lines) + + + + + Watershed Analysis + + + + + Which column for the X coordinate? The first is 1 + + + + + Which column for the Y coordinate? + + + + + Which column for the Z coordinate? If 0, z coordinate is not used + + + + + Work with vector points + + + + + Write only features link to a record + + + + + Zero-crossing edge detection raster function for image processing + + + + + visualThread + + Max. len: + + + + Min. len: + + + + Mean. len: + + + + Filled: + + + + Empty: + + + + N: + + + + Mean: + + + + StdDev: + + + + Sum: + + + + Min: + + + + Max: + + + + CV: + + + + Number of unique values: + + + + Range: + + + + Median: + + + + Observed mean distance: + + + + Expected mean distance: + + + + Nearest neighbour index: + + + + Z-Score: + + + + diff --git a/i18n/qgis_fr.ts b/i18n/qgis_fr.ts index 132b92933e64..1d2cd308f8b2 100644 --- a/i18n/qgis_fr.ts +++ b/i18n/qgis_fr.ts @@ -16111,22 +16111,22 @@ Les classes existantes doivent-elles être effacées avant la classification ? Title Font... - Police du tite... + Police du titre... Group Font... - Groupe de police... + Police des groupes... Layer Font... - Police de la couche... + Police des couches... Item Font... - Police de l'objet... + Police des objets... @@ -16182,7 +16182,7 @@ Les classes existantes doivent-elles être effacées avant la classification ? Wrap text on - Retour à la ligne activé + Activer le retour à la ligne après diff --git a/i18n/qgis_gl_ES.ts b/i18n/qgis_gl_ES.ts index d88c8a434fdd..7f2100a6fc95 100644 --- a/i18n/qgis_gl_ES.ts +++ b/i18n/qgis_gl_ES.ts @@ -25,15 +25,38 @@ <p>For more information, please visit our website at <a href="http://sextantegis.com">http://sextantegis.com</a></p> - + + <img src="qrc:/sextante/images/sextante_logo.png" /> + <h2>SEXTANTE para QGIS</h2> + <p>SEXTANTE, unha plataforma de xeoprocesamento para QGIS</p> + <p>Un proxecto desarrollado por Victor Olaya (volayaf@gmail.com).</p> + <p>Partes deste software foron aportadas por: + <ul> + <li>Alexander Bruy</li> + <li>Carson Farmer (algorítmos fTools)</li> + <li>Julien Malik (conectores da caixa de ferramentas Orfeo)</li> + <li>Evgeniy Nikulin (código orixinal da calculadora de campos Python)</li> + <li>Michael Nimm (algorítmos mmqgis)</li> + <li>Camilo Polymeris (Organización do código). Desarrollado como parte do Google + Summer of Code 2012</li> + </ul> + </p> + <p>Actualmente está usando a versión de SEXTANTE v%1</p> + <p>Este software distrtibúese baixo os termos da licencia GNU GPL v2. + <p>Para máis información, visite a páxina web + <a href="http://sextantegis.com">http://sextantegis.com</a></p> CharacterWidget - <p>Character: <span style="font-size: 24pt; font-family: %1%2</span><p>Value: 0x%3"> - <p>Carácter: <span style="font-size: 24pt; font-family: %1%2</span><p>Value: 0x%3"> + <p>Carácter: <span style="font-size: 24pt; font-family: %1%2</span><p>Value: 0x%3"> + + + + <p>Character: <span style="font-size: 24pt; font-family: %1">%2</span><p>Value: 0x%3 + @@ -142,10 +165,12 @@ + Output point shapefile Saída shapefile de puntos + @@ -162,6 +187,7 @@ + Browse Buscar @@ -171,6 +197,7 @@ Xeoprocesamento + @@ -183,7 +210,7 @@ - + Use only selected features features Utilizar só as entidades seleccionadas @@ -591,11 +618,38 @@ Simplificar tolerancia + + Eliminate sliver polygons + Eliminar polígonos esgazados + + + + area + Área + + + + Selected features: + Entidades seleccionadas: + + + + common boundary + Límite en común + + + + Merge selection with the neighbouring polygon with the largest + Xunta-la selección do polígono veciño co máis longo + + + Save to new file Gardar nun novo ficheiro + Add result to canvas Engadir resultado á vista do mapa @@ -801,22 +855,27 @@ Amosar Valores Únicos - + Target field Campo obxectivo - + Unique values list Lista de valores únicos - + Unique value count Contar valores únicos - + + Save errors location + + + + Press Ctrl+C to copy results to the clipboard Pulse Ctrl+C para copia-los resultados ó portapapeis @@ -1020,6 +1079,50 @@ foron reducidos a %2 vértices logo da simplificación Please specify select layer Especificar capa de selección + + Selected features: %1 + Entidades seleccionadas: %1 + + + Eliminate + Eliminar + + + No selection in input layer + Non se seleccionou a capa de entrada + + + Error creating output file + Erro na creación do ficheiro de saída + + + Could not replace geometry of feature with id + Non se pode reemplaza-la xeometría da entidade coa id + + + Could not delete feature with id + Non se pode elimina-la entidade coa id + + + Commit error + Erro na integración + + + Commit Error + Erro na integración + + + Created output shapefile: +%1 + Creado shapefile de saída: +%1 + + + Could not eliminate features with these ids: +%1 + Non se poden elimina-las entidades coas seguintes IDs: +%1 + Join attributes by location Unir atributos por localización @@ -1066,6 +1169,14 @@ Os seguintes nomes de campo son maiores de 10 caracteres: Random selection Selección aleatoria + + Could not replace geometry of feature with id %1 + + + + Could not delete feature with id %1 + + Define current projection Definir proxección actual @@ -1319,14 +1430,12 @@ p, li { white-space: pre-wrap; } <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans'; font-size:10pt;">Para soporte, contáctenos en </span><a href="mailto:info@faunalia.com?subject=$MAIL_SUBJECT$&amp;body=$MAIL_BODY$"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">info@faunalia.com</span></a></p></body></html> - About SEXTANTE - + Acerca de SEXTANTE - about:blank - en branco + en branco @@ -2399,14 +2508,14 @@ Do you want terminate it anyway? &Cargar na vista do mapa cando finalice - + Edit Editar - + Reset Reaxustar @@ -3395,7 +3504,7 @@ cando prema no botón de ferramentas de diálogo AXUDA. cubic - + cúbico @@ -4179,28 +4288,39 @@ GEOS geoprocessing error: One or more input features have invalid geometry.Globo - + Launch Globe Comezar Globo - + Globe Settings Axustes de Globo - + + Unload Globe + Non cargar Globo + + + Overlay data on a 3D globe Sobrepoñer datos nun globo 3D - + Settings for 3D globe Axustes para globo 3D - + Unload globe + Non cargar Globo + + + + + &Globe &Globo @@ -4397,6 +4517,19 @@ GEOS geoprocessing error: One or more input features have invalid geometry.Utilice peso do campo + + Help + + + Dialog + Diálogo + + + + about:blank + en branco + + LayerPropertiesWidget @@ -4473,321 +4606,321 @@ GEOS geoprocessing error: One or more input features have invalid geometry.Novo - + &Plugins &Plugins - + &Raster &Ráster - + &Help &Axuda - + &Settings &Configuración - + File Ficheiro - + Manage Layers Administrar capas - + Digitizing Dixitalización - + Advanced Digitizing Dixitalización Avanzada - + Map Navigation Navegación no mapa - + Attributes Atributos - + Plugins Plugins - + Help Axuda - + Raster Ráster - + Label Etiqueta - + Vector Vector - + Database Base de datos - + Web Web - + &New Project &Novo Proxecto - + Ctrl+N Ctrl+N - + &Open Project... &Abrir Proxecto... - + Ctrl+O Ctrl+O - + &Save Project &Gardar Proxecto - + Ctrl+S Ctrl+S - + Save Project &As... Gardar Proxecto &como... - + Ctrl+Shift+S Ctrl+Shift+S - + Save as Image... Gardar como Imaxe... - + &New Print Composer &Novo Deseñador de Impresión - + Ctrl+P Ctrl+P - + Composer Manager... Xestión do Deseñador... - + Add Feature Engadir entidade - + Merge Selected Features Xuntar entidades seleccionadas - + Merge Attributes of Selected Features Xuntar atributos das entidades seleccionadas - + Select Single Feature Seleccione unha entidade - + Select Features by Rectangle Seleccione entidades por rectángulo - + Select Features by Polygon Seleccione entidades por polígono - + Select Features by Freehand Seleccionar Entidades a Man - + Select Features by Radius Seleccione entidades por radio - + Deselect Features from All Layers Deseleccionar entidades en tódalas capas - + Form Annotation Anotación no Formulario - + Layer Labeling Options Opcións de etiquetado da capa - + Add PostGIS Layers... Engadir Capas PostGis... - + Toggle Editing Activar/Desactivar Edición - + Save Edits Gardar o editado - + Save As... Gardar como... - + Save Selection as Vector File... Gardar Selección como ficheiro vectorial... - + Set Project CRS from Layer Fixar o SRC do proxecto dende a capa - + Remove All from Overview Eliminar Todo da Vista Xeral - + Rotate Label Ctl (Cmd) increments by 15 deg. Rotar etiqueta Crtl (Cmd) incrementa en 15 graos. - + Style Manager... Administrador de Estilo... - + Stretch Histogram to Full Dataset Despregar histograma ó conxunto dos datos - + Embed Layers and Groups... Integrar capas e grupos... - + Feature Action Acción de entidade - + Run Feature Action Executar acción de entidade - + Pan Map to Selection Ampliar mapa á selección - + Touch zoom and pan Toque zoom e ampliar - + Offset Curve Desprazamento da curva - + Copy style Copiar estilo - + Paste style Pegar estilo - + Add WCS Layer... Engadir capa WCS... - + &Grid &Grella - + Grid Grella - + Pin/Unpin Labels Clavar/Desclavar Etiquetas - + Pin/Unpin Labels Click or marquee on label to pin Shift unpins, Ctl (Cmd) toggles state @@ -4798,18 +4931,18 @@ A tecla Shift desclava, Ctrl(Cmd) alterna o estado Actúa en tódalas capas editables - + Highlight Pinned Labels Resalta-las etiquetas clavadas - + Show/Hide Labels Amosar/Agochar Etiquetas - + Show/Hide Labels Click or marquee on feature to show label Shift+click or marquee on label to hide it @@ -4820,11 +4953,33 @@ Tecla Shift+ clic ou marque na etiqueta para agochala Actúa sobre a capa editable activa actual - - + + Html Annotation Anotación HTML + + + + Duplicate Layer(s) + Duplicar Capa(s) + + + + SVG annotation + Anotación SVG + + + + + Save All Edits + + + + + Save edits to editing layers, but continue editing + + Freeze or Thaw Labels Enganchar ou desenganchar etiquetas @@ -4842,22 +4997,22 @@ Shift thaws, Alt toggles, Ctl (Cmd) hides Shift desengancha, Alt alterna, Ctrl (Cmd) agocha - + Local Cumulative Cut Stretch Despregar corte acumulativo local - + Local cumulative cut stretch using current extent, default limits and estimated values. Despregar corte acumulativo local utilizando a actual extensión, límites predefinidos e valores estimados. - + Full Dataset Cumulative Cut Stretch Despregar corte acumulativo a todo o conxunto de datos - + Cumulative cut stretch using full dataset extent, default limits and estimated values. Despregar corte acumulativo utilizando a extensión de todo o conxunto de datos, límites predefinidos e valores estimados. @@ -4880,8 +5035,8 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Amosar etiquetas enganchadas - + New Blank Project Novo Proxecto en blanco @@ -4890,62 +5045,62 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Xestión do Deseñador... - + Exit Saír - + Ctrl+Q Ctrl+Q - + &Undo &Desfacer - + Ctrl+Z Ctrl+Z - + &Redo &Refacer - + Ctrl+Shift+Z Ctrl+Shift+Z - + Cut Features Cortar Entidades - + Ctrl+X Ctrl+X - + Copy Features Copiar Entidades - + Ctrl+C Ctrl+C - + Paste Features Pegar Entidades - + Ctrl+V Ctrl+V @@ -4954,52 +5109,52 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Engadir entidade - + Ctrl+. Ctrl+. - + Move Feature(s) Mover Entidade(s) - + Reshape Features Remodelar Entidades - + Split Features Dividir Entidades - + Delete Selected Borrar o seleccionado - + Add Ring Engadir Anel - + Add Part Engadir illa - + Simplify Feature Simplificar Entidade - + Delete Ring Eliminar Anel - + Delete Part Eliminar illa @@ -5012,42 +5167,42 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Xuntar atributos das entidades seleccionadas - + Node Tool Ferramenta dos Nós - + Rotate Point Symbols Rotar Símbolos de Puntos - + Snapping Options... Opcións de Autoaxuste (Edición)... - + Pan Map Mover Mapa - + Zoom In Achegar - + Ctrl++ Ctrl++ - + Zoom Out Afastar - + Ctrl+- Ctrl+- @@ -5076,128 +5231,128 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Deseleccionar entidades en tódalas capas - + Identify Features Identificar Entidades - + Ctrl+Shift+I Ctrl+Shift+I - + Measure Line Medir Liña - - + + Ctrl+Shift+M Ctrl+Shift+M - + Measure Area Medir Área - + Ctrl+Shift+J Ctrl+Shift+J - + Measure Angle Medir Ángulo - + Zoom Full Ver Todo - + Ctrl+Shift+F Ctrl+Shift+F - + Zoom to Layer Zoom á capa - + Zoom to Selection Zoom á Selección - + Ctrl+J Ctrl+J - + Zoom Last Vista Anterior - + Zoom Next Seguinte Vista - + Zoom Actual Size Achegar a Tamaño Real - + Zoom to Native Pixel Resolution Achegar á Resolución Nativa do Pixel - + Map Tips Avisos do Mapa - + Show information about a feature when the mouse is hovered over it Amosar información da entidade cando o rato está sobre ela - + New Bookmark... Novo Marcador... - + Ctrl+B Ctrl+B - + Show Bookmarks Amosar Marcadores - + Ctrl+Shift+B Ctrl+Shift+B - + Refresh Recargar - + Ctrl+R Ctrl+R - + Text Annotation Anotación de Texto @@ -5206,57 +5361,57 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Anotación no Formulario - + Move Annotation Mover Anotación - + Labeling Etiquetado - + New Shapefile Layer... Nova capa Shapefile... - + Ctrl+Shift+N Ctrl+Shift+N - + New SpatiaLite Layer ... Nova capa SpatiaLite... - + Ctrl+Shift+A Ctrl+Shift+A - + Raster calculator ... Calculadora Ráster... - + Add Vector Layer... Engadir Capa Vectorial... - + Ctrl+Shift+V Ctrl+Shift+V - + Add Raster Layer... Engadir Capa Ráster... - + Ctrl+Shift+R Ctrl+Shift+R @@ -5265,37 +5420,37 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Engadir Capa PostGis... - + Ctrl+Shift+D Ctrl+Shift+D - + Add SpatiaLite Layer... Engadir Capa SpatiaLite... - + Ctrl+Shift+L Ctrl+Shift+L - + Add MSSQL Spatial Layer... Engadir capa MSSQL Spatial... - + Add WMS Layer... Engadir capa WMS... - + Ctrl+Shift+W Ctrl+Shift+W - + Open Attribute Table Abrir Táboa de Atributos @@ -5304,7 +5459,7 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Activar/Desactivar Edición - + Toggles the editing state of the current layer Mudar o estado de edición da presente capa @@ -5313,7 +5468,7 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Gardar o editado - + Save edits to current layer, but continue editing Gardar o editado na capa actual e seguir editando @@ -5326,22 +5481,22 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Gardar Selección como ficheiro vectorial... - + Remove Layer(s) Eliminar Capa(s) - + Ctrl+D Ctrl+D - + Set CRS of Layer(s) Fixar o SRC da Capa(s) - + Ctrl+Shift+C Ctrl+Shift+C @@ -5354,28 +5509,28 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Escala deslizante - + Properties... Propiedades... - + Query... Query... Consulta... - + Add to Overview Engadir á vista xeral - + Ctrl+Shift+O Ctrl+Shift+O - + Add All to Overview Engadir Todo á Vista Xeral @@ -5384,133 +5539,133 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Eliminar Todo da Vista Xeral - + Show All Layers Amosar Tódalas Capas - + Ctrl+Shift+U Ctrl+Shift+U - + Hide All Layers Agochar Tódalas Capas - + Ctrl+Shift+H Ctrl+Shift+H - + Manage Plugins... Administar Plugins... - + Toggle Full Screen Mode Mudar o modo Pantalla Completa - + Ctrl+F Ctrl+F - + Project Properties... Propiedades do Proxecto... - + Ctrl+Shift+P Ctrl+Shift+P - + Options... Opcións... - + Custom CRS... SRC personalizado... - + Configure shortcuts... Configure Atallos... - + Local Histogram Stretch Despregar Histograma Local - + Stretch histogram of active raster to view extents Despregar histograma do ráster activo para amosa-la súa extensión - + Help Contents Contidos da Axuda - + F1 F1 - + API documentation Documentación API - + QGIS Home Page Páxina de Inicio de QGIS - + Ctrl+H Ctrl+H - + Check QGIS Version Comprobar Versión de QGIS - + Check if your QGIS version is up to date (requires internet access) Comprobe que a súa versión de QGIS estea actualizada (require acceso a internet) - + About Acerca de - + QGIS Sponsors Patrocinadores de QGIS - + Move Label Mover Etiqueta - + Rotate Label Virar Etiqueta - + Change Label Cambiar Etiqueta @@ -5519,12 +5674,12 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Administrador de Estilo... - + Python Console Consola Python - + Full histogram stretch Despregar histograma completo @@ -5533,22 +5688,22 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Desplegar histograma ó conxunto dos datos - + Customization... Personalización... - + mActionCatchForCustomization mActionCatchForCustomization - + This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization Isto serve para evitar conflictos cos atallos, o atallo reside en QgsCustomization - + Ctrl+M Ctrl+M @@ -5557,48 +5712,48 @@ Prema na tecla ALT para alterna-las etiquetas seleccionadas entre o estado engan Engadir capas e grupos... - + Embed layers and groups from other project files Integrar capas e grupos dende outro ficheiro de proxecto - + &Copyright Label &Etiqueta de Copyright - + Creates a copyright label that is displayed on the map canvas. Crea unha etiqueta de copyright que é mostrada na vista do mapa. - + &North Arrow &Rosa dos Ventos - + "Creates a north arrow that is displayed on the map canvas" "Crea unha rosa dos ventos na vista do mapa" - + &Scale Bar &Barra de Escala - - + + Creates a scale bar that is displayed on the map canvas Crea unha barra de escala na vista do mapa - + Add WFS Layer... Engadir capa WFS... - + Add WFS Layer Engadir capa WFS @@ -6650,47 +6805,51 @@ Remedie esta situación primeiro, porque o Plugin OSM non sabe que capa será o Clear console - + Limpar consola + + + Settings + Configuración Import Class - + Importar Clase Manage Script - + Administrar Script Import Sextante class - + Importar Clase de Sextante Import QgisInterface class - + Importar Clase QgisInterface Import PyQt.QtCore class - + Importar Clase PyQt.QtCore Import PyQt.QtGui class - + Importar Clase PyQt.QtGui Open script file - + Abrir ficheiro de script Save to script file - + Gardar a un ficheiro de script Run command - + Executar comando Help - Axuda + Axuda To access Quantum GIS environment from this console @@ -6717,25 +6876,25 @@ use a ferramenta qgis.util.iface (no canto de QgisInterface.class). QGis::UnitType - + meters metros - + feet pés - - - + + + degrees Graos - + <unknown> <descoñecido> @@ -6764,7 +6923,7 @@ use a ferramenta qgis.util.iface (no canto de QgisInterface.class). Estimando desviacións normais... - + QGIS starting in non-interactive mode not supported. You are seeing this message most likely because you have no DISPLAY environment variable set. @@ -6772,17 +6931,17 @@ You are seeing this message most likely because you have no DISPLAY environment Está vendo esta mensaxe porque seguramente non estableceu o conxunto das variable do entorno. - + CRS undefined - defaulting to project CRS SRC non definido - asignado SRC por defecto ó proxecto - + CRS undefined - defaulting to default CRS: %1 SRC non definido - asignado SRC por defecto: %1 - + Reading raster Lendo ráster @@ -6827,85 +6986,85 @@ Está vendo esta mensaxe porque seguramente non estableceu o conxunto das variab A selección esténdese máis alá do sistema de coordenadas da capa. - + Python is not enabled in QGIS. Python non activado en QGIS. - - - - - - - + + + + + + + - + Plugins Plugins - + Loaded %1 (package: %2) Cargado %1 (paquete: %2) - + Library name is %1 O nome da librería é %1 - - + + Failed to load %1 (Reason: %2) Fallou a carga %1 (Razón: %2) - + Attempting to resolve the classFactory function Tentando resolver a función classFactory - + Loaded %1 (Path: %2) Cargado %1 (Ruta: %2) - + Error Loading Plugin Erro cargando o plugin - + There was an error loading a plugin.The following diagnostic information may help the QGIS developers resolve the issue: %1. Houbo un erro cargando un plugin. A seguinte información de diagnóstico pode axudas ós desarrolladores de QGIS a resolver a cuestión: %1. - + Unable to find the class factory for %1. Incapaz de atopa-la clase factoría para %1. - + Plugin %1 did not return a valid type and cannot be loaded O plugin %1 non devolveu un tipo válido e non pode ser cargado - + Python error Erro de Python - + Error when reading metadata of plugin %1 Erro lendo os metadatos do plugin %1 @@ -6929,31 +7088,31 @@ Está vendo esta mensaxe porque seguramente non estableceu o conxunto das variab Non se puido abrir a base de datos do SRC %1<br>Erro(%2): %3 - + Could not open CRS database %1 Error(%2): %3 Non se puido abrir a base de datos do SRC %1 Erro(%2): %3 - - + + CRS SRC - + Generated CRS A CRS automatically generated from layer info get this prefix for description SRC Xerado - + Saved user CRS [%1] Garda-lo SRC do usuario [%1] - + Imported from GDAL Importado dende GDAL @@ -7158,93 +7317,93 @@ Erro(%2): %3 horas - + Cannot convert '%1' to double Non se pode convertir '%1' a doble - + Cannot convert '%1' to int Non se pode convertir '%1' a int - + Cannot convert '%1' to DateTime Non se pode convertir '%1' a DataHora - + Cannot convert '%1' to Date Non se pode convertir '%1' a Data - + Cannot convert '%1' to Time Non se pode convertir '%1' a Hora - + Cannot convert '%1' to Interval Non se pode convertir '%1' a Intervalo - + Cannot convert '%1' to boolean Non se pode convertir '%1' a buleano - + Invalid regular expression '%1': %2 Expresión habitual inválida '%1': %2 - + Index is out of range Índice fóra de rango - - - - - - - - - - - - - + + + + + + + + + + + + + Math Matemática - - - - - - - + + + + + + + Conversions Conversións - + Conditionals Condicionais - - - - - - - - - + + + + + + + + + Date and Time Data e Hora @@ -7253,76 +7412,97 @@ Erro(%2): %3 Data/Hora - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + String Cadea - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + Geometry Xeometría - - - - + + + + Record Rexistro - + Special - + Especial - - + + No root node! Parsing failed? ¡Ningún nó raíz! ¿Fallou a análise? - + (no root) (non root) - + Unary minus only for numeric values. Unidade de menos só para valores numéricos. - + Can't preform /, *, or % on DateTime and Interval Non se pode preformatear /, *, ou % en DataHora e Intervalo - + [unsupported type;%1; value:%2] [Tipo insoportado;%1; valor:%2] - + Column '%1' not found Columna '%1' non atopada @@ -7555,199 +7735,213 @@ Erro(%2): %3 O valor '%1' non é numérico - + OGR driver for '%1' not found (OGR error: %2) Driver OGR para '%1' non atopado (erro OGr: %2) - + trimming attribute name '%1' to ten significant characters produces duplicate column name. Recorta-lo nome do atributo '%1' a só dez caracteres produce duplicados no nome da columna. - + creation of data source failed (OGR error:%1) Fallou a creación da fonte de datos (erro OGR:%1) - + creation of layer failed (OGR error:%1) Fallou a creación da capa (erro OGR:%1) - + unsupported type for field %1 tipo non admitido para campo %1 - + creation of field %1 failed (OGR error: %2) Fallou a creación do campo %1 (erro OGR:%2) - + created field %1 not found (OGR error: %2) non atopado o campo creado %1 (erro OGR: %2) - + Invalid variant type for field %1[%2]: received %3 with type %4 Tipo variante non válido para campo%1[%2]: recibido %3 co tipo %4 - - + + Feature geometry not imported (OGR error: %1) Xeometría da entidade non importada (erro OGR: %1) - + Feature creation error (OGR error: %1) Erro na creación da entidade (erro OGR: %1) - - + + Failed to transform a point while drawing a feature of type '%1'. Writing stopped. (Exception: %2) Fallou a transformación mentras se debuxaba unha entidade do tipo '%1'. Parada a escritura (Excepción:%2) - - + + Feature write errors: Erros na escritura da entidade: - - + + Stopping after %1 errors Detido logo de %1 erros - + Only %1 of %2 features written. Só %1 de %2 entidades escritas. - + Arc/Info ASCII Coverage Coberturas Arc/Info ASCII - + Atlas BNA Atlas BNA - + Comma Separated Value Valores Separados por Comas - + ESRI Shapefile ESRI Shapefile - + FMEObjects Gateway Entrada FMEObjects - + GeoJSON GeoJSON - + GeoRSS GeoRSS - + Geography Markup Language [GML] Geography Markup Language [GML] - + Generic Mapping Tools [GMT] Generic Mapping Tools [GMT] - + GPS eXchange Format [GPX] GPS eXchange Format [GPX] - + INTERLIS 1 INTERLIS 1 - + INTERLIS 2 INTERLIS 2 - + Keyhole Markup Language [KML] Keyhole Markup Language [KML] - + + Mapinfo TAB + Mapinfo TAB + + + + Mapinfo MIF + Mapinfo MIF + + Mapinfo File Ficheiro Mapinfo - + Microstation DGN Microstation DGN - + S-57 Base file S-57 Base file - + Spatial Data Transfer Standard [SDTS] Spatial Data Transfer Standard [SDTS] - + SQLite SQLite - + + SpatiaLite + SpatiaLite + + + AutoCAD DXF AutoCAD DXF - + Geoconcept Geoconcept @@ -7768,19 +7962,19 @@ Só %1 de %2 entidades escritas. Fallou a carga da capa - + Creation error for features from #%1 to #%2. Provider errors was: %3 Erro de creación para entidades dende #%1 a #%2. O causante dos erros foi: %3 - + Vector import Importar vector - + Only %1 of %2 features written. Só %1 de %2 entidades escritas. @@ -7919,7 +8113,7 @@ Só %1 de %2 entidades escritas. - + @@ -7963,7 +8157,7 @@ Só %1 de %2 entidades escritas. Diagram Overlay (Legacy) - + Sobrepoñer Diagrama (Legado) @@ -7973,7 +8167,7 @@ Só %1 de %2 entidades escritas. Version 0.0.1 (Legacy) - + Versión 0.0.1 (Legado) Version 0.0.1 @@ -8011,7 +8205,6 @@ Só %1 de %2 entidades escritas. - @@ -8023,12 +8216,11 @@ Só %1 de %2 entidades escritas. - - - - - - + + + + + Warning Atención @@ -8087,12 +8279,12 @@ Só %1 de %2 entidades escritas. Axustar unha transformación proxectiva require polo menos 4 puntos correspondentes. - + Globe Globo - + Overlay data on a 3D globe Suporpoñer datos nun globo 3D @@ -8551,8 +8743,7 @@ Só %1 de %2 entidades escritas. Un plugin para contar, sumar, realizar medias de ráster para cada polígono da capa vectorial - - + Cannot get GDAL raster band: %1 Non se pode obter unha banda ráster GDAL: %1 @@ -8577,18 +8768,18 @@ Só %1 de %2 entidades escritas. Non se pode ChunkAndWarpImage: %1 - + [GDAL] All files (*) [GDAL] Tódolos ficheiros (*) - + GDAL/OGR VSIFileHandler GDAL/OGR VSIFileHandler - + This raster file has no bands and is invalid as a raster layer. Este ficheiro ráster non ten bandas e non é válido como capa ráster. @@ -8746,14 +8937,13 @@ Would you like to specify path (GISBASE) to your GRASS installation? Non se pode consulta-lo ráster - Groups not yet supported - Grupos aínda non soportados + Grupos aínda non soportados - - - + + + Cannot draw raster Non se pode debuxa-lo ráster @@ -8763,11 +8953,11 @@ Would you like to specify path (GISBASE) to your GRASS installation? OGR[%1] erro %2: %3 - - - + - + + + @@ -8800,7 +8990,7 @@ Would you like to specify path (GISBASE) to your GRASS installation? DODS - + ESRI FileGDB Ficheiro GDB ESRI @@ -8926,28 +9116,28 @@ Would you like to specify path (GISBASE) to your GRASS installation? Non se pode crea-lo ficheiro %1.qpj - - + + - + Connection to database failed Fallou a conexión á base de datos - + Creation of data source %1 failed: %2 A creación da fonte de datos %1 fallou: %2 - + Loading of the layer %1 failed Fallou a carga da capa %1 - - + + Unable to delete layer %1: %2 Incapaz de borra-la capa %1: @@ -8960,13 +9150,13 @@ Would you like to specify path (GISBASE) to your GRASS installation? - + Unsupported type for field %1 Tipo non soportado para o campo %1 - + Creation of fields failed Fallou a creación dos campos @@ -8986,26 +9176,26 @@ Would you like to specify path (GISBASE) to your GRASS installation? Fallou a creación dos campos - + Unable to initialize SpatialMetadata: Incapaz de iniciar SpatialMetadata: - + Could not create a new database Non se pode crear unha nova base de datos - + Unable to activate FOREIGN_KEY constraints [%1] Incapaz de activa-las restriccións FOREIGN_KEY [%1] - + Unable to delete table %1: Incapaz de borra-la táboa %1: @@ -9098,60 +9288,60 @@ Would you like to specify path (GISBASE) to your GRASS installation? Buffer sen resultado - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + Exception: %1 Excepción: %1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + GEOS GEOS - + GEOS prior to 3.2 doesn't support GEOSInterpolate GEOS previo a 3.2 non soporta GEOSInterpolate @@ -9194,39 +9384,45 @@ Would you like to specify path (GISBASE) to your GRASS installation? Lendo parte %1 de %2 do ráster - + Building pyramids failed - write access denied Fallou a creación de pirámides - denegado o acceso de escritura - + Write access denied. Adjust the file permissions and try again. Denegado o acceso de escritura. Axuste os permisos de ficheiro e ténteo de novo. - - - - + + + + Building pyramids failed. Fallou a creación de pirámides. - + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. Este ficheiro non foi escrito. Algúns formatos non soportan vistas xerais de pirámides. Consulte a documentación GDAL en caso de dúbida. - - + + Building pyramid overviews is not supported on this type of raster. A creación de vistas xerais de pirámides non está soportada neste tipo de ráster. - + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. A creación de vistas xerais de pirámides internas non está soportada en capas ráster con compresión JPEG nin na súa librería actual libtiff. + + + + All Ramps + + QextSerialPort @@ -9319,17 +9515,17 @@ Would you like to specify path (GISBASE) to your GRASS installation? &Ráster - + Quantum GIS Quantum GIS - + Multiple Instances of QgisApp Casos múltiples de QgisApp - + Multiple instances of Quantum GIS application object detected. Please contact the developers. @@ -9338,151 +9534,151 @@ Póñase en contacto cos desarrolladores. - + Checking database Comprobando base de datos - + Reading settings Lendo configuración - + Setting up the GUI Establecendo a IGU - + Map canvas. This is where raster and vector layers are displayed when added to the map Vista do mapa. É onde as capas ráster e vectoriais son amosadas cando se engaden ó mapa - + Security warning: Advertencia de seguridade: - macros have been disabled. - As macros foron desactivadas. + As macros foron desactivadas. - Enable - Activar + Activar - + GPS Information Información GPS - + Log Messages Mensaxes do programa - + Quantum GIS - %1 ('%2') Quantum GIS - %1 ('%2') - + QGIS starting... Comezando AGIS... - + Checking provider plugins Comprobando os plugins do provedor - + Starting Python Comezando Python - + Restoring loaded plugins Restablecendo plugins cargados - + Initializing file filters Iniciando filtros de ficheiro - + Restoring window state Restablecendo estado da fiestra - - + + QGIS Ready! ¡QGIS Listo! - + Minimize Minimizar - + Ctrl+M Minimize Window Minimizar Fiestra Ctrl+M - + Minimizes the active window to the dock Minimiza a fiestra activa á base - + Zoom Achegar - + Toggles between a predefined size and the window size set by the user Cambia entre o tamaño predefinido de fiestra e o fixado polo usuario - + Bring All to Front Traer todo á fronte - + Bring forward all open windows Poñer detrás tódalas fiestras abertas - - - - - - - + + + + + + + + + Error Erro - + Failed to open Python console: Fallou a apertura da consola de Python: - + Panels Paneis - + Toolbars Barras de ferramentas @@ -9491,38 +9687,38 @@ Póñase en contacto cos desarrolladores. &Fiestra - + &Database &Base de datos - + Vect&or Vect&or - + &Web &Web - + Progress bar that displays the status of rendering layers and other time-intensive operations Barra de progreso que amosa o estado da renderización das capas e outras operacións que se alongan no tempo - + Toggle extents and mouse position display Cambia a visualización da posición do rato e a extensión - - + + Coordinate: Coordenadas: - + Current map coordinate Coordenadas do mapa actual @@ -9535,149 +9731,149 @@ Póñase en contacto cos desarrolladores. Coordenadas actuais do mapa (no formato x,y) - + Scale Escala - + Current map scale Actual escala do mapa - + Displays the current map scale Amosa a actual escala do mapa - + Current map scale (formatted as x:y) Escala actual do mapa (no formato x:y) - + Stop map rendering Parar renderizado do mapa - + Render Renderizar - + When checked, the map layers are rendered in response to map navigation commands and other events. When not checked, no rendering is done. This allows you to add a large number of layers and symbolize them before rendering. Cando estea activo, as capas do mapa son renderizadas es resposta ós comandos de navegación do mapa e outros eventos. Cando non estea activo, non haberá renderización. Isto permite engadir un gran número de capas e etiquetalas antes da renderización. - + Toggle map rendering Alterna o renderizado do mapa - + This icon shows whether on the fly coordinate reference system transformation is enabled or not. Click the icon to bring up the project properties dialog to alter this behaviour. Esta icona amosa se está activada a transformación 'sobre a marcha' do sistema de coordenadas de referencia ou non. Faga clic na icona para abrir o proxecto de diálogo de propiedades para cambiar este comportamento. - + CRS status - Click to open coordinate reference system dialog Estado do SRC - Clique para abrir o diálogo do sistema de referencia de coordenadas - + Ready Listo - + Map overview canvas. This canvas can be used to display a locator map that shows the current extent of the map canvas. The current extent is shown as a red rectangle. Any layer on the map can be added to the overview canvas. Vista previa. Esta vista do mapa será usada para amosar un localizador de mapa que amose a actual extensión da vista do mapa. A actual extensión será amosada cun rectángulo vermello. Calquera capa no mapa poderá ser engadida á vista previa. - + Overview Vista xeral - + Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties. Lenda do mapa que amosa tódalas capas que están presentes na vista do mapa. Clique na caixa de verificación para activar-la capa ou non. Doble clic na lenda da capa para personaliza-la apariencia e fixar outras propiedades. - + Layers Capas - + Control rendering order Control de orde de renderización - + Map layer list that displays all layers in drawing order. Lista de capas do mapa que amosa tódalas capas na orde de debuxado. - + Layer order Orde da capa - + [ERROR] Can not make qgis.db private copy [ERROR] Non se pode facer unha copia privada de qgis.db - - - + + + Private qgis.db qgis.db privado - + Could not open qgis.db Non se pode abri qgis.db - + Migration of private qgis.db failed. %1 Fallou a migración da qgis.db privada. %1 - + Update of view in private qgis.db failed. %1 Fallou a actualización da vista no qgis.db privado. %1 - - + + < Blank > < En Blanco > - + QGIS version Versión QGIS - + QGIS code revision Revisión de código QGIS - + Compiled against Qt Compilado con Qt - + Running against Qt Funcionando con Qt @@ -9686,171 +9882,178 @@ Póñase en contacto cos desarrolladores. Versión GDAL/OGR - + GEOS Version Versión GEOS - + PostgreSQL Client Version Versión do cliente PostgreSQL - - + + No support. Sen soporte. - + SpatiaLite Version Versión SpatiaLite - + QWT Version Versión QWT - + PROJ.4 Version Versión PROJ.4 - + + QScintilla2 Version + Versión de QScintilla2 + + + This copy of QGIS writes debugging output. Esta copia de QGIS grava a saída da depuración. - + %1 doesn't have any layers %1 non ten ningunha capa - - - + + Invalid Data Source Fonte de Datos Inválida - + %1 is not a valid or recognized data source %1 non é unha fonte de datos válida ou recoñecida - + Select zip layers to add... Seleccione capas zip a engadir... - + Vector Vector - + Select raster layers to add... Seleccione capas ráster a engadir... - + Raster Ráster - + Select vector layers to add... Seleccione capas vectoriais a engadir... - + PostgreSQL PostgreSQL - + Cannot get PostgreSQL select dialog from provider. Non se pode obte-lo diálogo de selección PostgreSQL do provedor. - + %1 is an invalid layer - not loaded %1 é unha capa inválida - non cargada - + + + + Invalid Layer Capa Inválida - + %1 is an invalid layer and cannot be loaded. %1 é unha capa inválida e non pode ser cargada. - + SpatiaLite SpatiaLite - + Cannot get SpatiaLite select dialog from provider. Non se pode obte-lo diálogo de selección SpatiaLite do provedor. - + MSSQL MSSQL - + Cannot get MSSQL select dialog from provider. Non se pode obte-lo diálogo de selección MSSQL do provedor. - + WMS WMS - + Cannot get WMS select dialog from provider. Non se pode obte-lo diálogo de selección WMS do provedor. - + WCS WCS - + Cannot get WCS select dialog from provider. Non se pode obte-lo diálogo de selección WCS do provedor. - + WFS WFS - + Cannot get WFS select dialog from provider. Non se pode obte-lo diálogo de selección WFS do provedor. - + Calculating... Calculando... - - + + Abort... Cancelar... - + Choose a QGIS project file to open Escolla un ficheiro de proxecto QGIS para abrir @@ -9863,134 +10066,144 @@ Póñase en contacto cos desarrolladores. Erro de Lectura Proxecto QGIS - + Unable to open project Incapaz de abrir o proxecto - + + project macros have been disabled. + as macros do proxecto foron desactivadas. + + + + Enable macros + Activar macros + + + Choose a QGIS project file Escolla un ficheiro de proxecto QGIS - - + + Saved project to: %1 Proxecto gardado a: %1 - - + + Unable to save project %1 Incapaz de gardar o proxecto %1 - + Choose a file name to save the QGIS project file as Escolla un nome de ficheiro para garda-lo ficheiro de proxecto QGIS como - + Unable to load %1 Incapaz de cargar %1 - + Choose a file name to save the map image as Escolla un nome de ficheiro para gardar imaxe de mapa como - + Saved map image to %1 Gardada imaxe do mapa a %1 - + Labeling Etiquetado - + Please select a vector layer first. Seleccione primeiro unha capa vectorial. - + Layer labeling settings Configuración do etiquetado de capa - + Saving done Gardado - + Export to vector file has been completed Completada a exportacion do ficheiro vectorial - + Save error Erro ó gardar - + Export to vector file failed. Error: %1 Fallou a exportación do ficheiro vectorial. Erro: %1 - - + + No Layer Selected Non seleccionada ningunha capa - + To delete features, you must select a vector layer in the legend Para eliminar entidades, debe selecciónar unha capa vectorial na lenda - + No Vector Layer Selected Ningunha capa vectorial seleccionada - + Deleting features only works on vector layers Eliminación de entidades só funciona con capas vectoriais - + Provider does not support deletion O provedor non soporta o borrado - + Data provider does not support deleting features O provedor de datos non soporta borrado de entidades - - - + + + Layer not editable Capa non editable - + The current layer is not editable. Choose 'Start editing' in the digitizing toolbar. A capa actual non é editable. Escolla 'Comezar edición' na barra de ferramentas de dixitalización. - + Delete features Eliminar entidades - + Delete %n feature(s)? number of features to delete Número de entidades a eliminar @@ -10000,141 +10213,141 @@ Erro: %1 - + Features deleted Entidades eliminadas - + Problem deleting features Problema eliminando entidades - + A problem occured during deletion of features Ocorreu un problema durante o borrado de entidades - + Merging features... Xuntando entidades... - + Abort Cancelar - - + + Composer %1 Compositor %1 - - + + No active layer Sen capa activa - - + + No active layer found. Please select a layer in the layer list Non se atopou capa activa. Seleccione unha capa la lista das capas - - + + Active layer is not vector A capa activa non é vectorial - - + + The merge features tool only works on vector layers. Please select a vector layer from the layer list A ferramenta de unión de entidades só función en capas vectorias. Seleccione unha capa vectorial da lista de capas - - + + Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing Xuntar entidades só pode facerse para capas en modo edición. Para usa-la ferramenta de unión, vaia a Capa->Alternar edición - - - + + + Not enough features selected Non seleccionadas suficientes entidades - - - + + + The merge tool requires at least two selected features A ferramenta unión require polo menos dúas entidades seleccionadas - + Merged feature attributes Atributos das entidades unidas - - + + Merge failed Fallou a unión - - + + An error occured during the merge operation Ocorreu un erro durante a operación de xuntado - + Union operation canceled Operación de unión cancelada - - + + The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled A operación de unión pode resultar nun tipo de xeometría que non é compatible coa capa actual e polo tanto será cancelada - + Merged features Entidades unidas - + Features cut Cortar Entidades - + Features pasted Entidades pegadas - + Cannot copy style: %1 Non se pode copia-lo estilo: %1 - + Cannot parse style: %1:%2:%3 Non se pode analiza-lo estilo: %1:%2:%3 - + Cannot read style: %1 Non se pode ler o estilo: %1 - - + + Could not commit changes to layer %1 Errors: %2 @@ -10145,30 +10358,74 @@ Erros:%2 - + Start editing failed Fallou Comezar edición - + Provider cannot be opened for editing Non se pode abri-lo provedor para edición - + Stop editing Parar edición - + Do you want to save the changes to layer %1? ¿Desexa garda-los cambios na capa %1? - + Problems during roll back Problemas ó recuar + + + Plugin layer + Capa de plugin + + + + Memory layer + Capa de memoria + + + + + Duplicate layer: + Duplicar capa: + + + + %1 (duplication resulted in invalid layer) + %1 (a duplicación creou unha capa inválida) + + + + %1 (%2type unsupported) + %1 (tipo %2 non soportado) + + + + Do you want to save the current project?%1 + + + + + + Error adding valid layer to map canvas + + + + + + + Raster layer + + Invalid scale Escala inválida @@ -10178,88 +10435,88 @@ Erros:%2 Escala - + Couldn't load Python support library: %1 Non se pode cargala librería de soporte de Python: %1 - + Couldn't resolve python support library's instance() symbol. Non de pode resolve-la instancia de librería de soporte de Python() do símbolo. - + Python support ENABLED :-) ACTIVADO soporte de Python :-) - + There is a new version of QGIS available Hai dispoñible unha nova versión de QGIS - + You are running a development version of QGIS Está usando unha versión de desarrollo de QGIS - + You are running the current version of QGIS Está usando a versión actual de QGIS - + Would you like more information? ¿Desexa máis información? - - - - + + + + QGIS Version Information Información da versión de QGIS - + QGIS - Changes since last release QGIS - Cambios dende o último lanzamento - + Unable to get current version information from server Incapaz de adquirir información da versión actual dende o servidor - + Connection refused - server may be down Conexión rexeitada - o servidor pode estar caído - + QGIS server was not found O servidor QGIS non foi atopado - + Unknown network socket error: %1 Erro de socket de rede descoñecido: %1 - + Unable to communicate with QGIS Version server %1 Incapaz de comunicarse co servidor da versión QGIS %1 - - + + To perform a full histogram stretch, you need to have a raster layer selected. Para realizar un despregamento completo do histograma, necesita ter unha capa ráster seleccionada. - + No Raster Layer Selected Non hai seleccionada ningunha capa ráster @@ -10276,65 +10533,67 @@ Erros:%2 Para levar a cabo un despregamento do histograma local, necesita ter unha capa ráster seleccionada. - - - + + Layer is not valid Capa non válida - + The layer %1 is not a valid layer and can not be added to the map A capa %1 non é unha capa válida e non pode ser engadida ó mapa - - + The layer is not a valid layer and can not be added to the map A capa non é unha capa válida e non pode ser engadida ó mapa - + + Project has layer(s) in edit mode with unsaved edits, which will NOT be saved! + + + + Save? ¿Gardar? - Do you want to save the current project? - ¿Desexa garda-lo actual proxecto? + ¿Desexa garda-lo actual proxecto? - + Current CRS: %1 (OTFR enabled) Actual SRC: %1 (OTFR activado) - + Current CRS: %1 (OTFR disabled) Actual SRC: %1 (OTFR desactivado) - + Map coordinates for the current view extents Coordenadas do mapa para a actual extensión da vista - + Map coordinates at mouse cursor position Coordenadas do mapa na posición do punteiro do rato - + Extents: Extensións: - + Maptips require an active layer Consellos do mapa requiren unha capa activa - + %n feature(s) selected on layer %1. number of selected features número de entidades seleccionadas @@ -10344,22 +10603,21 @@ Erros:%2 - + Open a GDAL Supported Raster Data Source Abrir unha fonte de datos ráster soportada por GDAL - %1 is not a valid or recognized raster data source - %1 non é unha fonte de datos ráster recoñecida ou válida + %1 non é unha fonte de datos ráster recoñecida ou válida - + %1 is not a supported raster data source %1 non é una fonte de datos soportada - + Unsupported Data Source Fonte de datos non soportada @@ -10376,91 +10634,108 @@ Erros:%2 Incapaz de crea-lo marcador. O seu usuario da base de datos podería estar perdido ou corrupto - + Project file is older O ficheiro de proxecto é antigo - + <p>This project file was saved by an older version of QGIS. When saving this project file, QGIS will update it to the latest version, possibly rendering it useless for older versions of QGIS.<p>Even though QGIS developers try to maintain backwards compatibility, some of the information from the old project file might be lost. To improve the quality of QGIS, we appreciate if you file a bug report at %3. Be sure to include the old project file, and state the version of QGIS you used to discover the error.<p>To remove this warning when opening an older project file, uncheck the box '%5' in the %4 menu.<p>Version of the project file: %1<br>Current version of QGIS: %2 <p> Este ficheiro de proxecto foi gardado cunha versión antiga de QGIS. Ó gardar este ficheiro de proxecto, QGIS o actualizará á última versión, posiblemente renderizándoo e facéndoo inservible para vellas versións de QGIS.<p> Incluso pensando que os desarrolladores de QGIS tentan mante-la compatibilidade coas vellas versións, algunha información destes vellos proxectos podería perderse. Para mellorar a calidade de Qgis, apreciamos se presenta un informe de erro en %3. Estea seguro de incluír o vello ficheiro de proxecto e o estado da versión de QGIS que usou para descubrir o erro.<p>Para eliminar este aviso cando abra un vello ficheiro de proxecto, desmarque a casilla '%5' no menú %4.<p> Versión do ficheiro de proxecto: %1 <br>Actual versiónde QGIS:%2 - + Window Fiestra - + Shows the map coordinates at the current cursor position. The display is continuously updated as the mouse is moved. It also allows editing to set the canvas center to a given position. The format is lat,lon or east,north Amosa as coordenadas do mapa na actual posición do cursor. A visualización será actualizada continuamente segundo o rato sexa movido. Tamén permite a edición para establece-la vista do mapa centrada nunha posición dada. O formato é latitude,lonxitude ou este, norte - + Current map coordinate (lat,lon or east,north) Coordenadas do mapa actual (latitude, lonxitude ou este, norte) - + Compiled against GDAL/OGR Compilado con GDAL/OGR - + Running against GDAL/OGR Funcionando con GDAL/OGR - - - + + + QGis files Ficheiros QGIS - + + copy + copiar + + + Unsupported Layer + Capa non soportada + + + %1 + +Duplication of layer type is unsupported. + %1 + +A duplicación deste tipo de capa non está soportada. + + + <tt>Settings:Options:General</tt> Menu path to setting options Ruta do menú para as opcións de axuste <tt>Axustes:Opcións:Xeral</tt> - + Warn me when opening a project file saved with an older version of QGIS Avísame ó abrir un ficheiro de proxecto gardado cunha vella versión de QGIS - + This project file was saved by an older version of QGIS Este ficheiro de proxecto foi gardado por unha versión anterior de QGIS - + Warning Atención - + This layer doesn't have a properties dialog. Esta capa non ten un diálogo de propiedades. - + Authentication required Requerida autentificación - + Proxy authentication required Requerida autentificación do Proxy - + SSL errors occured accessing URL %1: Ocorreron erros SSL accedento á URL %1: - + Always ignore these errors? @@ -10469,7 +10744,7 @@ Always ignore these errors? ¿Ignorar sempre estes erros? - + %n SSL errors occured number of errors número de erros @@ -10482,7 +10757,7 @@ Always ignore these errors? QgisAppInterface - + Attributes changed Atributos cambiados @@ -10546,22 +10821,27 @@ p, li { white-space: pre-wrap; } Desarrolladores - + + Essen (Germany), Developer meeting 2012 + Essen (Alemaña), encontro de Desarrolladores 2012 + + + Contributors Colaboradores - + Translators Tradutores - + about:blank en branco - + Donors Doadores @@ -10683,13 +10963,54 @@ p, li { white-space: pre-wrap; } Caché xuntar capa na memoria virtual + + QgsAddTabOrGroup + + + Add tab or group for %1 + Engadir lapela ou grupo para %1 + + + + QgsAddTabOrGroupBase + + + Dialog + Diálogo + + + + Create category + Crear categoría + + + + as + coma + + + + a tab + unha lapela + + + + a group in container + un grupo no recipiente + + QgsAnnotationWidget - + Select frame color Seleccione cor do cadro + + + Select background color + Seleccione cor do fondo + QgsAnnotationWidgetBase @@ -10709,12 +11030,17 @@ p, li { white-space: pre-wrap; } Marcador de mapa - + Frame width Ancho do marco - + + Background color + Cor de fondo + + + Frame color Cor do marco @@ -10722,19 +11048,19 @@ p, li { white-space: pre-wrap; } QgsApplication - - - + + + Exception Excepción - + unknown exception Excepción descoñecida - + Application state: QGIS_PREFIX_PATH env var: %1 Prefix: %2 @@ -10746,7 +11072,16 @@ Default Theme Path: %7 SVG Search Paths: %8 User DB Path: %9 - + Estado da aplicación: +QGIS_PREFIXO_RUTA env var: %1 +Prefixo: %2 +Ruta do Plugin: %3 +Ruta ós Datos do Paquete: %4 +Nome do Tema Activo: %5 +Ruta ó Tema Activo: %6 +Ruta ó Tema Predeterminado: %7 +Ruta ás buscas SVG: %8 +Ruta á Base de Datos do Usuario: %9 Application state: @@ -10771,7 +11106,7 @@ Ruta da BD de usuario: %8 - + match indentation of application state @@ -10785,12 +11120,12 @@ Ruta da BD de usuario: %8 Map %1 - Mapa %1 + Mapa %1 Expression based filename - + Nome de ficheiro baseado nunha expresión @@ -10798,125 +11133,125 @@ Ruta da BD de usuario: %8 Atlas generation - + Xeración do Atlas Atlas options - + Opcións do Atlas Hide the coverage layer when generating the output - + Agochar a capa de cobertura cando se xenere a saída Hidden coverage layer - + Capa de cobertura agochada Margin around coverage - + Marxe arredor da cobertura Output filename expression - + Expresión do nome de ficheiro de saída % - % + % ... - ... + ... Coverage layer - + Capa de cobertura Fixed scale - + Escala fixada Single file export when possible - + Exportar a un só ficheiro cando sexa posible Composer map to use - + Deseñador do mapa a usar Generate an atlas - + Xerar un atlas QgsAttributeActionDialog - + Select an action File dialog window title Título da fiestra de diálogo de Ficheiro Seleccione unha acción - + Insert expression Inserte expresión - + Missing Information Información Perdida - + To create an attribute action, you must provide both a name and the action to perform. Para crear unha acción de atributo, debe introducir tanto o nome como a acción a realizar. - + Echo attribute's value Devolver valor de atributo - + Run an application Executar unha aplicación - + Get feature id Tomar id de entidade - + Selected field's value (Identify features tool) Valor de campo seleccionado (ferrametna de identificación de entidades) - + Clicked coordinates (Run feature actions tool) Coordenadas clicadas (Executar ferramenta de acción de entidade) - + Open file Abrir arquivo - + Search on web based on attribute's value Buscar valor de atributo baseado na web @@ -11163,17 +11498,17 @@ Ruta da BD de usuario: %8 QgsAttributeDialog - + Error Erro - + Error: %1 Erro: %1 - + Attributes - %1 Atributos - %1 @@ -11181,22 +11516,22 @@ Ruta da BD de usuario: %8 QgsAttributeEditor - + Select a file Seleccione un ficheiro - + Select a date Seleccione unha data - + (no selection) (Sen selección) - + ... ... @@ -11298,7 +11633,7 @@ Ruta da BD de usuario: %8 QgsAttributeTableAction - + Attributes changed Atributos cambiados @@ -11505,7 +11840,7 @@ Ruta da BD de usuario: %8 &Buscar - + Attribute table - %1 (%n Feature(s)) feature count Contador de entidades @@ -11515,7 +11850,7 @@ Ruta da BD de usuario: %8 - + Attribute table - %1 :: %n / %2 feature(s) selected feature count Contador de entidades @@ -11525,22 +11860,22 @@ Ruta da BD de usuario: %8 - + Parsing error Erro de análise - + Evaluation error Erro de avaliación - + Error during search Erro durante a busca - + Attribute table - %1 (%n matching features) matching features Entidades coincidentes @@ -11550,69 +11885,69 @@ Ruta da BD de usuario: %8 - + Attribute table - %1 (No matching features) Táboa de atributos - %1 (Sen entidades coincidentes) - + Attribute added Atributo engadido - - + + Attribute Error Erro de atributo - + The attribute could not be added to the layer Os atributos non poden ser engadidos á capa - + Deleted attribute Eliminar atributo - + The attribute(s) could not be deleted O atributo(s) non poden ser eliminados - + Geometryless feature added Engadida entidade sen xeometría - + Run action Executar acción - - + + Open form Abrir formulario - + Loading feature attributes... Cargando atributos de entidade... - + Abort Cancelar - + Attribute table Táboa de Atributos - + %1 features loaded. %1 entidades cargadas. @@ -11620,7 +11955,7 @@ Ruta da BD de usuario: %8 QgsAttributeTableModel - + feature id ID de entidades @@ -12190,75 +12525,159 @@ Base de datos: %2 Ctrl+Shift+W + + QgsBrowserDirectoryPropertiesBase + + + Dialog + Diálogo + + + + Path + Ruta + + QgsBrowserDockWidget - + Browser Buscador - - Refresh - Recargar + Recargar - Add Selection - Engadir selección + Engadir selección - - + Add Selected Layers Engadir capas seleccionadas - Collapse All - Contraer todo + Contraer todo - + Add as a favourite Engadir como favorito - + Remove favourite Eliminar favorito - + Add Layer Engadir capa - + + Properties Propiedades - - Add a directory + + Filter Pattern Syntax + Sintaxe do patrón do filtro + + + + Wildcard(s) + Comodín(s) + + + + Regular Expression + Expresión regular + + + + Fast scan this dir. - + + Add a directory + Engadir un directorio + + + Add directory to favourites - + Engadir directorio a favoritos - + Error Erro - + Layer Properties Propiedades de capa + + + Directory Properties + Propiedades de directorio + + + + QgsBrowserDockWidgetBase + + + Browser + Buscador + + + + + Refresh + Recargar + + + + Add Selected Layers + Engadir capas seleccionadas + + + + Add + Engadir + + + + Filter Files + Ficheiros de filtro + + + + + ... + ... + + + + Collapse All + Contraer todo + + + + Options + Opcións + + + + Filter files + Ficheiros de filtro + QgsBrowserLayerPropertiesBase @@ -12379,6 +12798,24 @@ Base de datos: %2 Denso 7 + + QgsCategorizedSymbolRendererV2Model + + + Symbol + Símbolo + + + + Value + Valor + + + + Label + Etiqueta + + QgsCategorizedSymbolRendererV2Widget @@ -12388,8 +12825,6 @@ Base de datos: %2 - - Symbol Símbolo @@ -12404,81 +12839,105 @@ Base de datos: %2 Rampla de cor - + Classify Clasificar - + Add Engadir - + Delete Borrar - + Delete all Borrar todo - + Join Xuntar - + Advanced Avanzada - - Value - Valor + Valor - - Label - Etiqueta + Etiqueta - + Symbol levels... Niveis de símbolo... - - + + High number of classes! + + + + + Classification would yield %1 entries which might not be expected. Continue? + + + + + Error Erro - + There are no available color ramps. You can add them in Style Manager. Non hai ramplas de cor dispoñibles. Pode engadir unha no Xestor de Estilos. - + The selected color ramp is not available. A rampla de cor seleccionada non está dispoñible. - + Confirm Delete Confirmar eliminación - + The classification field was changed from '%1' to '%2'. Should the existing classes be deleted before classification? O campo de clasificación foi cambiado de '%1' a '%2'. ¿Deben ser eliminadas as clases existentes antes da clasificación? + + QgsCharacterSelectorBase + + + Character Selector + + + + + Font: + + + + + Current font family and style + + + QgsColorRampComboBox @@ -12565,16 +13024,16 @@ Should the existing classes be deleted before classification? Atlas generation - + Xeración do Atlas - - + + Choose a file name to save the map as Escolla un nome de ficheiro para garda-lo mapa - + PDF Format Formato PDF @@ -12587,12 +13046,12 @@ Should the existing classes be deleted before classification? Fallou a creación da imaxe con %1x%2 pixels. ¿Tentar sen 'Imprimir como Ráster'? - + Big image Imaxe grande - + To create image %1x%2 requires about %3 MB of memory. Proceed? Crear unha imaxe %1x%2 require sobre %3 MB de memoria. ¿Proceder? @@ -12610,77 +13069,77 @@ Should the existing classes be deleted before classification? Item Properties Propiedaes de elemento - - - - - Empty filename pattern - - - The filename pattern is empty. A default one will be used. - + Empty filename pattern + Patrón de nome de ficheiro baleiro - - Directory where to save PDF files - + + + + The filename pattern is empty. A default one will be used. + O Patrón do nome de ficheiro está baleiro. Será utilizado un predeterminado. - - - - Unable to write into the directory - + + Directory where to save PDF files + Directorio no que garda-los ficheiros PDF + Unable to write into the directory + Incapaz de escribir no directorio + + + + + The given output directory is not writeable. Cancelling. - + O directorio de saída aportado non é escribible. Cancelando. - - - - + + + + Rendering maps... - + Renderizando mapas... - - - - + + + + Abort - Cancelar + Cancelar - - - - + + + + Atlas processing error - + Erro de procesamento do Atlas - + Choose a file name to save the map image as Escolla un nome de ficheiro para gardar como nome de imaxe do mapa - + Directory where to save image files - + Directorio no que garda-los ficheiros de imaxe - + Image format: - + Formato de imaxe: Image too big @@ -12691,13 +13150,13 @@ Should the existing classes be deleted before classification? Fallou a creación da imaxe con %1x%2 píxeles. Cancelada a exportación. - + SVG warning Advertencia SVG - - + + Don't show this message again Non amosar esta mensaxe de novo @@ -12706,27 +13165,27 @@ Should the existing classes be deleted before classification? <p>A función de exportado SVG en Qgis sufriu graves problemas debido a erros e deficiencias no - + Qt4 svg code. In particular, there are problems with layers not being clipped to the map bounding box.</p> código Qt4 svg. en particular, hai problemas con capas que non son recortadas á caixa de límites do mapa.</p> - + If you require a vector-based output file from Qgis it is suggested that you try printing to PostScript if the SVG output is not satisfactory.</p> Se requerise un ficheiro de saída baseado en vectores dende Qgis suxerímoslle que tente imprimir a PostScript se a saída SVG non é satisfactoria.</p> - + SVG Format Formato SVG - + Save template Gardar modelo - + Composer templates Modelos do deseñador @@ -12735,37 +13194,37 @@ Should the existing classes be deleted before classification? Gardar modelo - + <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the <p>A función de exportado SVG en Qgis sufriu graves problemas debido a erros e deficiencias no - + Directory where to save SVG files - + Directorio no que garda-los ficheiros SVG - + Save error Erro ó gardar - + Error, could not save file Erro, non se pode garda-lo ficheiro - + Load template Cargar modelo - + Read error Erro de lectura - + Error, could not read file Erro, non se pode ler o ficheiro @@ -12774,17 +13233,17 @@ Should the existing classes be deleted before classification? O contido do ficheiro modelo non é válido - + Composer Deseñador - + Project contains WMS layers O proxecto contén capas WMS - + Some WMS servers (e.g. UMN mapserver) have a limit for the WIDTH and HEIGHT parameter. Printing layers from such servers may exceed this limit. If this is the case, the WMS layer will not be printed Algúns servidores WMS (ex: servidor de mapas UMN) teñen un límite para o ANCHO e a ALTURA dos parámetros. Imprimir capas destes servidores pode sobrepasar este límite. De se-lo caso, a capa WMS non será impresa @@ -13463,7 +13922,7 @@ Should the existing classes be deleted before classification? Insert expression - Inserte expresión + Inserte expresión @@ -13570,13 +14029,13 @@ Should the existing classes be deleted before classification? Insert an expression - + Inserte unha expresión QgsComposerLegend - + Legend Lenda @@ -13605,103 +14064,120 @@ Should the existing classes be deleted before classification? QgsComposerLegendWidget - + General Options Opcións Xerais - + Item wrapping changed Cambiada a deformación do elemento - + Legend title changed Cambiado o título da lenda - + + Legend column count + + + + + Legend split layers + + + + + Legend equal column width + + + + Legend symbol width Ancho do símbolo da lenda - + Legend symbol height Alto do símbolo da lenda - + Legend group space Espazo do grupo da lenda - + Legend layer space Espazo da capa da lenda - + Legend symbol space Espazo do símbolo da lenda - + Legend icon label space Espazo da etiqueta de icona da lenda - + Title font changed Cambiada a fonte do título - + Legend group font changed Cambiada a fonte de grupo da lenda - + Legend layer font changed Cambiada a fonte da capa da lenda - + Legend item font changed Cambiada a fonte do elemento da lenda - + + Legend box space Espazo da caixa da lenda - + Legend map changed Cambiado o mapa da lenda - + Legend item edited Editado o elemento da lenda - - + + + Legend updated Lenda actualizada - + Legend group added Engadido grupo de lenda - + Map %1 Mapa %1 - + None Ningún @@ -13719,111 +14195,142 @@ Should the existing classes be deleted before classification? Xeral - + &Title &Título - + Title Font... Fonte do título... - + Group Font... Fonte do grupo... - + Layer Font... Fonte da capa... - + Item Font... Fonte do elemento... - + Symbol width Ancho do símbolo - - - - - - - + + + + + + + + mm mm - + Symbol height Alto do símbolo - + Layer space Espazo da capa - + Symbol space Espazo do símbolo - + Icon label space Espazo da etiqueta da icona - + Box space Espazo da caixa - + Map Mapa - + Group Space Espazo do grupo - + Wrap text on Axusta-lo texto en - + + Column count + + + + + Allow to split layer items into multiple columns. + + + + + Split layers + + + + + Equal column widths + + + + + Column space + + + + Legend items Elementos da lenda - + Auto Update Auto Actualización - + Update Actualizar - + All Todo - + Add group Engadir grupo + + + Show feature count for each class of vector layer. + Amosar contador de entidade para cada clase de capa vectorial. + QgsComposerManager @@ -13884,13 +14391,13 @@ Should the existing classes be deleted before classification? QgsComposerMap - - + + Map %1 Mapa %1 - + Map will be printed here O mapa será impreso aquí @@ -13904,35 +14411,35 @@ Should the existing classes be deleted before classification? - - + + Cache Caché - - + + Render Renderizar - - + + Rectangle Rectángulo - + Solid Sólido - - + + Cross Cruzado @@ -13953,40 +14460,40 @@ Should the existing classes be deleted before classification? - + No frame Sen marco - - + + Zebra Cebra - - - + + + Inside frame Dentro do marco - - + + Outside frame Fóra do marco - - - + + + Horizontal Horizontal - - + + Vertical Vertical @@ -13999,130 +14506,129 @@ Should the existing classes be deleted before classification? Dirección do límite - + Change item width Cambiar ancho do elemento - + Change item height Cambiar altura do elemento - + Map scale changed Cambiada a escala do mapa - + Map rotation changed Cambiada a rotación do mapa - - + + Map extent changed Cambiada a extensión do mapa - + Canvas items toggled Cambiados os elementos da vista do mapa - - - + + + None Ningún - + Grid checkbox toggled Cambiada a caixa de verificación da grella - - + + Grid interval changed Cambiado o intervalo da grella - - + + Grid offset changed Cambiada a compensación da grella - - + Grid pen changed Cambiado o lapis da grella - + Grid type changed Cambiado o tipo da grella - + Grid cross width changed Cambiado o ancho de cruzamento da grella - + Annotation font changed Cambiada a fonte de anotación - + Annotation distance changed Cambiada a distancia de anotación - + Annotation format changed Cambiado o formato de anotación - + Changed grid frame style Cambiado o estilo da grella do marco - + Changed grid frame width Cambiado o ancho do grella do marco - - - + + + Disabled Deshabilitado - + Annotation position changed Cambiada a posición de anotación - + Map %1 Mapa %1 - + Annotation toggled Anotación cambiada - + Changed annotation direction Cambiada a dirección da anotación - + Changed annotation precision Cambiada a precisión da anotación @@ -14240,77 +14746,86 @@ Should the existing classes be deleted before classification? &Tipo de Grella - + Interval X Intervalo X - + Offset X Desprazamento X - Line width - Ancho da liña + Ancho da liña - + Frame style Estilo do marco - + Frame width Ancho do marco - + + Line style + + + + + change... + + + + Draw annotation Debuxar anotación - + Annotation position left side Posición da anotación na marxe esquerda - + Annotation position right side Posición da anotación na marxe dereita - + Annotation position top side Posición da anotación na parte de arriba - + Annotation position bottom side Posición da anotación na parte de abaixo - + Annotation direction left side Dirección da anotación na marxe esquerda - + Annotation direction right side Dirección da anotación na marxe dereita - + Annotation direction top side Dirección da anotación na parte de arriba - + Annotation direction bottom side Dirección da anotación na parte de abaixo - + Annotation format Formato de anotación @@ -14323,22 +14838,22 @@ Should the existing classes be deleted before classification? Dirección da anotación - + Font... Fonte... - + Distance to map frame Distancia ó marco do mapa - + Coordinate precision Coordinar precisión - + Interval Y Intervalo Y @@ -14353,9 +14868,8 @@ Should the existing classes be deleted before classification? Ancho do cruzamento - Line color - Cor da liña + Cor da liña @@ -14490,12 +15004,12 @@ Should the existing classes be deleted before classification? QgsComposerScaleBar - + km km - + m m @@ -15751,12 +16265,12 @@ Erro: %5 QgsCptCityBrowserModel - + Name Nome - + Info Info @@ -15764,27 +16278,27 @@ Erro: %5 QgsCptCityColorRampItem - + colors Cores - + continuous continua - + continuous (multi) continua (multi) - + discrete discreta - + variants variantes @@ -15814,17 +16328,17 @@ Este ficheiro pode atoparse en [%2] e o ficheiro actual está en [%3] - + %1 directory details %1 detalles do directorio - + %1 gradient details %1 detalles do gradiente - + Error - cpt-city gradient files not found. You have two means of installing them: @@ -15849,17 +16363,17 @@ Este ficheiro pode atoparse en [%2] e o ficheiro actual está en [%3] - + Selections by theme Seleccións por tema - + All by author Todo por autor - + You can download a more complete set of cpt-city gradients by installing the "Color Ramp Manager" plugin (you must enable Experimental plugins in the plugin manager). @@ -15867,6 +16381,11 @@ e o ficheiro actual está en [%3] + + + All Ramps (%1) + + colors Cores @@ -15929,6 +16448,11 @@ e o ficheiro actual está en [%3] Path Ruta + + + Save as standard gradient + + Palette @@ -16212,34 +16736,34 @@ e o ficheiro actual está en [%3] QgsCustomizationDialog - + Object name Nome de obxecto - + Label Etiqueta - + Description Descrición - - + + Choose a customization INI file Escolla un ficheiro de personalización INI - - + + Customization files (*.ini) Ficheiros de personalización (*.ini) - + Widgets trebellos Widgets @@ -16253,52 +16777,57 @@ e o ficheiro actual está en [%3] Personalización - + + Enable customization + + + + toolBar Barra de ferramentas - + Catch Capturar - + Switch to catching widgets in main application Cambiar a widgets de captura na aplicación principal - + Save Gardar - + Save to file Gardar nun ficheiro - + Load Cargar - + Load from file Cargar dende ficheiro - + Expand All Expandir todo - + Collapse All Contraer todo - + Select All Seleccione todo @@ -17190,22 +17719,22 @@ p, li { white-space: pre-wrap; } Introduza un nome de capa antes de engadi-la capa ó mapa - + Choose a delimited text file to open Escolla un ficheiro de texto delimitado a abrir - + Text files Ficheiros de texto - + Well Known Text files Ficheiros de Texto Ben Coñecidos (WKT) - + All files Tódolos ficheiros @@ -17568,37 +18097,37 @@ p, li { white-space: pre-wrap; } O tipo de diagrama '%1' é descoñecido. Un tipo predeterminado será seleccionado para vostede. - + Transparency: %1% Transparencia: %1% - + Background color Cor de fondo - + Pen color Cor da pluma - + No attributes added. Non se engadiu ningún atributo. - + You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams. Vostede non engadiu ningún atributo a esta capa de diagrama. Especifique os atributos a visualizar nos diagramas ou desactive os diagramas. - + No attribute value specified Non se especificou ningún valor de atributo - + You did not specify a maximum value for the diagram size. Please specify the attribute and a reference value as a base for scaling in the Tab Diagram / Size. Non especificou un valor máximo para o tamaño do diagrama. Especifique o atributo e un valor de referenza como base para a escala no Menú Diagrama/Tamaño. @@ -17846,59 +18375,59 @@ p, li { white-space: pre-wrap; } QgsDirectoryParamWidget - - + + Name Nome - - + + Size Tamaño - - + + Date Data - - + + Permissions Permisos - - + + Owner Propietario - - + + Group Grupo - - + + Type Tipo - + folder Cartafol - + file Ficheiro - + link Enlace @@ -17936,42 +18465,35 @@ p, li { white-space: pre-wrap; } QgsEmbedLayerDialog - Select project file - Seleccione o ficheiro de proxecto + Seleccione o ficheiro de proxecto - QGis files - Ficheiros QGIS + Ficheiros QGIS - Recursive embeding not possible - A integración recursiva non é posible + A integración recursiva non é posible - It is not possible to embed layers / groups from the current project - Non é posible integrar capas/grupos ó proxecto actual + Non é posible integrar capas/grupos ó proxecto actual QgsEmbedLayerDialogBase - Select layers and groups to embed - Seleccione capas e grupos a integrar + Seleccione capas e grupos a integrar - Project file - Ficheiro de proxecto + Ficheiro de proxecto - ... - ... + ... @@ -17990,72 +18512,77 @@ p, li { white-space: pre-wrap; } QgsEngineConfigDialog - + Dialog Diálogo - + Search method Método de busca - + Chain (fast) Cadea (rápido) - + Popmusic Tabu Tabú MúsicaPop - + Popmusic Chain Cadea Popmusic - + Popmusic Tabu Chain Cadea tabú Popmusic - + FALP (fastest) FALP (o máis rápido) - + Number of candidates Número de candidatos - + Point Punto - + Line Liña - + Polygon Polígono - + Show all labels and features for all layers Amosar tódalas etiquetas e entidades para tódalas capas - + Show candidates (for debugging) Amosar candidatos (para depuración) - + + Save settings with project + + + + (i.e. including colliding objects) (é dicir incluídos obxectos solapados) @@ -18068,6 +18595,58 @@ p, li { white-space: pre-wrap; } Amosar etiqueta candidatos (para depuración) + + QgsErrorDialog + + + Error + Erro + + + + QgsErrorDialogBase + + + Dialog + Diálogo + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Summary</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Sumario</p></body></html> + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Detailed report.</p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Informe Detallado.</p></body></html> + + + + Always show details + Amosa-los detalles sempre + + + + Details >> + Detalles >> + + QgsExpressionBuilderDialogBase @@ -18138,52 +18717,52 @@ p, li { white-space: pre-wrap; } Campos e Valores - + Parser Error Erro do analizador - + Eval Error Erro de avaliación - + Expression is invalid <a href=more>(more info)</a> Expresión inválida <a href=more>(more info)</a> - + More info on expression error Máis información no erro de expresión - + Load top 10 unique values Cargar 10 valores únicos - + Load all unique values Cargar tódolos valores únicos - + <h3>Oops! QGIS can't find help for this function.</h3>The help file for %1 was not found.<br> <h3> ¡Ups! QGIS non pode atopar axuda para esta función. </h3>O ficheiro de axuda para %1 non foi atopado.<br> - + (Showing English version as there was no help available in your language (%1). If you would like to create it, contact the QGIS translation team).<br> (Amosando versión en inglés porque non hai axuda dispoñible no seu idioma (%1). Se desexa creala, contacte co equipo de tradución de QGIS).<br> - + It was neither available in your language (%1) nor English. Non está dispoñible nin no seu idioma (%1) nin en inglés. - + <br>If you would like to create it, contact the QGIS development team. <br>Se desexa creala, contacte co equipo de desarrolladores de QGIS. @@ -18310,45 +18889,45 @@ p, li { white-space: pre-wrap; } Erro de sintaxe - - + + Not available for layer Non dispoñible para a capa - + Evaluation error Erro de avaliación - + Provider error Erro de provedor - + Could not add the new field to the provider. Non se pode engadi-lo novo campo ó provedor. - + Error Erro - + An error occured while evaluating the calculation string: %1 Ocorreu un erro cando se avaliaban as cadeas de cálculo: %1 - + Please enter a field name Introduza un nome de campo - + The expression is invalid see (more info) for details @@ -18511,6 +19090,271 @@ p, li { white-space: pre-wrap; } Valores + + QgsFieldsProperties + + + Label + Etiqueta + + + + Id + Id + + + + Name + Nome + + + + Type + Tipo + + + + Length + Lonxitude + + + + Precision + Precisión + + + + Comment + Comentario + + + + Edit widget + Editar widget + + + + Alias + Alias + + + + + Name conflict + Conflito de nome + + + + + The attribute could not be inserted. The name already exists in the table. + O atributo no puido ser insertado. O nome xa existe na táboa. + + + + Added attribute + Atributo engadido + + + + + Deleted attribute + Atributo eliminado + + + + Line edit + Editar liña + + + + Unique values + Valores únicos + + + + Unique values editable + Valores únicos etitables + + + + Classification + Clasificación + + + + Value map + Mapa de valores + + + + Edit range + Editar rango + + + + Slider range + Rango deslizante + + + + Dial range + Marcar rango + + + + File name + Nome de ficheiro + + + + Enumeration + Enumeración + + + + Immutable + Inmutable + + + + Hidden + Oculto + + + + Checkbox + caixa de verificación + + + + Text edit + Editar texto + + + + Calendar + Calendario + + + + Value relation + Relación de valores + + + + UUID generator + Xenerador de UUID + + + + Select edit form + Seleccione formulario a editar + + + + UI file + Ficheiro UI + + + + QgsFieldsPropertiesBase + + + Field calculator + Calculadora de campo + + + + + Click to toggle table editing + Clique para activar/desactivar edición de táboa + + + + Toggle editing mode + Activar/Desactivar modo edición + + + + New column + Nova columna + + + + Ctrl+N + Ctrl+N + + + + Delete column + Eliminar columna + + + + Ctrl+X + Ctrl+X + + + + ... + ... + + + + Init function + Función Init + + + + Edit UI + Editar UI + + + + + + + + + + + - + - + + + + > + > + + + + ^ + ^ + + + + v + + + + + Autogenerate + Autoxenerar + + + + Drag and drop designer + Deseñador arrastrar e soltar + + + + Provide ui-file + Proporcionar ficheiro UI + + + + Attribute editor layout: + Esquema do editro de atributo: + + QgsFormAnnotationDialog @@ -18527,9 +19371,13 @@ p, li { white-space: pre-wrap; } QgsFormAnnotationDialogBase - Dialog - Diálogo + Diálogo + + + + Form annotation + Anotación no Formulario @@ -19718,35 +20566,40 @@ Seleccione de novo un ficheiro válido. QgsGdalProvider - + Dataset Description Descrición do conxunto de datos - + Band %1 Banda %1 - + Dimensions: Dismensións: - + X: %1 Y: %2 Bands: %3 X: %1 Y: %2 Bandas: %3 - + Origin: Orixe: - + Pixel Size: Tamaño do pixel: + + + Cannot get GDAL raster band: %1 + Non se pode obter unha banda ráster GDAL: %1 + out of extent Fóra da extesión @@ -19756,22 +20609,22 @@ Seleccione de novo un ficheiro válido. nulo (sen datos) - + Gauss Gauss - + Cubic Cúbica - + Mode Modo - + None Ningún @@ -19780,7 +20633,7 @@ Seleccione de novo un ficheiro válido. Magphase promedio - + Average Promedio @@ -20620,7 +21473,7 @@ p, li { espazo en branco: pre-embalar; } - + All files Tódolos ficheiros @@ -20645,12 +21498,12 @@ p, li { espazo en branco: pre-embalar; } ¿Desexa engadi-la fonte de datos de todos xeitos? - + Open 3D model file Abrir ficheiro modelo 3D - + Model files Ficheiros de modelo @@ -20860,6 +21713,24 @@ p, li { espazo en branco: pre-embalar; } Eliminar clase + + QgsGraduatedSymbolRendererV2Model + + + Symbol + Símbolo + + + + Value + Valor + + + + Label + Etiqueta + + QgsGraduatedSymbolRendererV2Widget @@ -20869,7 +21740,6 @@ p, li { espazo en branco: pre-embalar; } - Symbol Símbolo @@ -20919,61 +21789,66 @@ p, li { espazo en branco: pre-embalar; } Saltos bonitos - + Classify Clasificar - + Add class Engadir clase - + + Delete + + + + + Delete all + Borrar todo + + Delete class - Eliminar clase + Eliminar clase - + Advanced Avanzada - - Range - Rango + Rango - - Label - Etiqueta + Etiqueta - + Symbol levels... Niveis de símbolo... - - - + + + Error Erro - + There are no available color ramps. You can add them in Style Manager. Non hai ramplas de cor dispoñibles. Pode engadir unha no Xestor de Estilos. - + The selected color ramp is not available. A rampla de cor seleccionada non está dispoñible. - + Renderer creation has failed. Fallou a creación do renderizador. @@ -22120,13 +22995,13 @@ na liña %2 columna %3 - - - - - - - + + + + + + + Warning Atención @@ -22142,13 +23017,13 @@ na liña %2 columna %3 - + Cannot read module file (%1) Non se pode ler o ficheiro de módulo (%1) - + %1 at line %2 column %3 @@ -22172,74 +23047,74 @@ na liña %2 columna %3 Asegúrese de ter instalada a documentación de GRASS. - + Not available, description not found (%1) Non dispoñible, descrición non atopada (%1) - + Not available, cannot open description (%1) Non dispoñible, non se pode abri-la descrición (%1) - + Not available, incorrect description (%1) Non dispoñible, descrición incorrecta (%1) - - + + Run Executar - - + + Cannot get input region Non se pode obte-la rexión de entrada - + Input %1 outside current region! ¡Entrada %1 fóra da actual rexión! - + Use Input Region Utilice rexión de entrada - + Output %1 exists! Overwrite? ¡ Saída %1 xa existe! ¿Sobreescribir? - + Cannot find module %1 Non se pode atopa-lo módulo %1 - + Cannot start module: %1 Non se pode comeza-lo módulo: %1 - + Stop Parar - + <B>Successfully finished</B> <B>Finalizado satisfactoriamente</B> - + <B>Finished with error</B> <B>Finalizado con erro</B> - + <B>Module crashed or killed</B> <B>Módulo estragado ou inservible</B> @@ -22290,17 +23165,17 @@ na liña %2 columna %3 QgsGrassModuleField - + Attribute field Campo Atributo - + Warning Atención - + 'layer' attribute in field tag with key= %1 is missing. 'capa' atributo na etiqueta de campo coa clave=%1 está perdida. @@ -22308,17 +23183,17 @@ na liña %2 columna %3 QgsGrassModuleFile - + File Ficheiro - + %1:&nbsp;missing value %1:&nbsp;Valor perdido - + %1:&nbsp;directory does not exist %1:&nbsp;o directorion non existe @@ -22326,44 +23201,44 @@ na liña %2 columna %3 QgsGrassModuleGdalInput - + OGR/PostGIS/GDAL Input Entrada OGR/PostGIS/GDAL - - - + + + Warning Atención - + Cannot find layeroption %1 Non se pode atopa-la opción de capa %1 - + Cannot find whereoption %1 Non se pode atopa-la opción onde%1 - + Password Contrasinal - + Select a layer Seleccione unha capa - + PostGIS driver in OGR does not support schemas!<br>Only the table name will be used.<br>It can result in wrong input if more tables of the same name<br>are present in the database. ¡O driver PostGIS en OGR non soporta esquemas !<br>Só o nome da táboa será utilizado.<br>Pode resultar nunha entrada errónea se máis dunha táboa ten o mesmo nome<br>na mesma base de datos. - + %1:&nbsp;no input %1:&nbsp;ningunha entrada @@ -22371,50 +23246,50 @@ na liña %2 columna %3 QgsGrassModuleInput - + Input Entrada - - - - + + + + Warning Atención - + Cannot find typeoption %1 Non se pode atopa-la opción tipo%1 - + Cannot find values for typeoption %1 Non se poden atopar valores para opcion tipo %1 - + Cannot find layeroption %1 Non se pode atopa-la opción capa %1 - + GRASS element %1 not supported Elemento GRASS %1 non soportado - + Use region of this map Utilice a rexión deste mapa - + Select a layer Seleccione unha capa - + %1:&nbsp;no input %1:&nbsp;ningunha entrada @@ -22422,23 +23297,23 @@ na liña %2 columna %3 QgsGrassModuleOption - - + + Warning Atención - + Cannot parse version_min %1 Non se pode analizar versión_min %1 - + Cannot parse version_max %1 Non se pode analizar versión_max %1 - + %1:&nbsp;missing value %1:&nbsp;Valor perdido @@ -22446,7 +23321,7 @@ na liña %2 columna %3 QgsGrassModuleSelection - + Selected categories Categorías seleccionadas @@ -22456,14 +23331,14 @@ na liña %2 columna %3 - - - - - - - - + + + + + + + + Warning Atención @@ -22483,12 +23358,12 @@ na liña %2 columna %3 <br>comando: %1 %2<br>%3<br>%4 - + Cannot read module description (%1): Non se pode ler a descrición do módulo (%1): - + %1 at line %2 column %3 @@ -22497,43 +23372,43 @@ at line %2 column %3 na liña %2 columna %3 - + Cannot find key %1 Non se pode atopa-la chave %1 - + << Hide advanced options << Agochar opcións avanzadas - + Show advanced options >> Amosar opcións avanzadas >> - + Item with key %1 not found Elemento cunha clava %1 non atopado - + Item with id %1 not found Elemento con id %1 non atopado - - + + Cannot get current region Non se pode obte-la rexión actual - + Cannot check region of map %1 Non se pode comproba-la rexión do mapa %1 - + Cannot set region of map %1 Non se pode fixa-la rexióndo mapa %1 @@ -23221,6 +24096,16 @@ p, li { white-space: pre-wrap; } null (no data) nulo (sen datos) + + + cellhd file %1 does not exist + O ficheiro cellhd %1 non existe + + + + Groups not yet supported + Grupos aínda non soportados + QgsGrassRegion @@ -23853,107 +24738,112 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsIdentifyResults - + Identify Results Identificar resultados - + Feature Entidade - + Value Valor - - + + (Derived) (Derivado) - + (Actions) (Accións) - - - + + + Edit feature form Editar forma da entidade - - - + + + View feature form Ver forma da entidade - + + Print + Imprimir + + + Zoom to feature Zoom á entidade - + Copy attribute value Copiar valores de atributo - + Copy feature attributes Copiar atributos da entidade - + Clear results Limpar resultados - + Clear highlights Limpar destacados - + Highlight all Destacar todo - + Highlight layer Destacar capa - + Layer properties... - + Propiedades de capa... - + Expand all Expandir todo - + Collapse all Contraer todo - + Attribute changes Cambios de atributo - + Could not open url Non se pode abri-la url - + Could not open URL '%1' Non se pode abri-la URL '%1' @@ -23965,6 +24855,34 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Identify Results Identificar resultados + + + Expand tree. + Expandir árbore. + + + + + + + ... + ... + + + + Collapse tree. + Contraer árbore. + + + + New results will be expanded by default. + Os novos resultados serán expandidos por defecto. + + + + Print selected HTML response. + Imprimi-la resposta HTML seleccionada. + QgsImageWarper @@ -23978,13 +24896,13 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.QgsInterpolationDialog - + Triangular interpolation (TIN) Interpolación Triangular (TIN) - + Inverse Distance Weighting (IDW) (IDW) Ponderación da Distancia Inversa (PDI) @@ -24011,23 +24929,23 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. - + Break lines Romper liñas - + Structure lines Liñas de estrutura - + Points Puntos - + Save interpolated raster as... Gardar ráster interpolado coma... @@ -24150,6 +25068,11 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Output file Ficheiro de saída + + + Add result to project + Engadir resultado ó proxecto + QgsInterpolationPlugin @@ -24523,18 +25446,18 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsLabelPropertyDialog - - + + Label font Fonte de etiqueta - + Font color Cor da fonte - + Buffer color Cor do buffer @@ -24559,72 +25482,82 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. - + Size Tamaño - + Display Visualizar - + Show label Amosar etiqueta - + Max Máx - + Min Mín - + Scale-based Baseado na escala - + + Ignores priority and permits collisions/overlaps + Ignora prioridade e permite colisións/solapamentos + + + + Always show (exceptions above) + Amosar sempre (agás excepcións) + + + Buffer Buffer - + Position Posición - + Label distance Distancia da etiqueta - + X Coordinate Coordenada X - + Y Coordinate Coordenada Y - + Horizontal alignment Aliñamento horizontal - + Vertical alignment Aliñamento vertical - + Rotation Rotación @@ -24644,52 +25577,52 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Mostra @ 24 pts (utilizando unidades do mapa) - + (not found!) (¡non atopado!) - + Sample @ %1 pts (using map units) Mostra @ %1 pts (utilizando unidades do mapa) - + Sample @ %1 pts (using map units, BUFFER IN MILLIMETERS) Mostra @ %1 pts (utilizando unidades do mapa, BUFFER EN MILÍMETROS) - + Sample Mostra - + Sample (BUFFER NOT SHOWN, in map units) Mostra (BUFFER NON AMOSADO, en unidades de mapa) - + Expression based label Etiqueta baseada nunha expresión - + Mixed Case Maiúsculas misturadas - + All Uppercase Todo maiúsculas - + All Lowercase Todo minúsculas - + Title Case Título en maiúsculas @@ -24721,9 +25654,11 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. - - - + + + + + ... ... @@ -24733,31 +25668,31 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Axustes de etiqueta - + Text style Estilo de texto - + Font Fonte - + TextLabel Etiqueta de texto - - - + + + Color Cor - - - + + + Size Tamaño @@ -24766,23 +25701,23 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.En puntos - - + + In map units En unidades do mapa - + Buffer Buffer - + mm mm - + Scale-based visibility Visibilidade dependendo da escala @@ -24797,118 +25732,190 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Cor de fondo da mostra - + Multiple lines Múltiples liñas - + Wrap on character Envolve-lo carácter - + Line height spacing for multi-line text Espaciado da altura da liña para texto multiliña - + Alignment Aliñamento - + Paragraph style alignment of multi-line text Aliñamento do estilo do parágrafo do texto multiliña - + Available typeface styles Hai dispoñibles estilos de tipo de letra - + Underlined Text Texto suliñado - + Strikeout text Texto tachado - - + + Space in pixels or map units, relative to size unit choice Espazo en píxeles ou unidades de mapa, en relación ó tamaño da unidade elexida - + Type case Fonte - + Capitalization style of text Estilo de capitalización do texto - + Pen Join style Estilo de unión do lápis - + Color area inside of pen stroke Cor da área dendro do trazo da pluma - + + Minimum Mínimo - + + Maximum Máximo - + Formatted numbers Números formateados - + Decimal places Número de decimais - + Show plus sign Amosar signo máis - + + Pixel size-based visibility + Visibilidade baseada no tamaño do pixel + + + + Labels will not show if larger than this on screen + As etiquetas non se amosarán se son máis largas que isto na pantalla + + + + Labels will not show if smaller than this on screen + As etiquetas non se amosarán se son menores que isto na pantalla + + + + + + + + < + < + + + + Label in Map Units + Etiqueta en Unidades do Mapa + + + + + Label + Etiqueta + + + + Line direction symbols + + + + + Symbol(s) + + + + + > + > + + + + left/right + + + + + above + + + + + below + + + + + Reverse direction + Dirección inversa + + + Advanced Avanzada - + Priority Prioridade - + Low Baixa - + High Alta - + Options Opcións @@ -24918,28 +25925,28 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Expresión - - + + mm mm - - - + + + map units Unidades do mapa - - - + + + Transparency Transparencia - - + + % % @@ -24954,51 +25961,53 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Restablecer texto da mostra - + line Liña - - + + Left Esquerda - + Center Centrado - - + + Right Dereita + + px - px + px - + Multi-line align Aliñamento Multiliña - - + + Line height Altura da liña - - + + Letter spacing Espazo entre letras - - + + Word spacing Espaciado das palabras @@ -25027,12 +26036,12 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Capitalizar - + Style Estilo - + points puntos @@ -25045,12 +26054,12 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.I - + U U - + S S @@ -25059,27 +26068,26 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Capitais - + Label every part of multi-part features Etiquetar cada parte das entidades multiparte - + Merge connected lines to avoid duplicate labels Xuntar liñas conectadas para previr etiquetas duplicadas - Add direction symbol - Engadir símbolo de dirección + Engadir símbolo de dirección - + Suppress labeling of features smaller than Eliminar etiquetado de entidades menores que - + Features don't act as obstacles for labels As entidades non actúan como obstáculos para as etiquetas @@ -25092,7 +26100,8 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Envolver etiqueta no carácter - + + Placement Posicionamento @@ -25137,28 +26146,28 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Utilizando o perímetro - - - + + + Label distance Distancia da etiqueta - - - + + + Rotation Rotación - - + + degrees Graos - - + + In mm En mm @@ -25175,287 +26184,321 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS.Debaixo da liña - + Line orientation dependent position Orientación da liña dependendo da posición - + Data defined settings Axustes dos datos definidos - + Buffer transparency Transparencia do buffer - + Uncheck to write labeling engine derived rotation on pin and NULL on unpin Desmarcar para escribi-la rotación derivada do motor de etiquetado en etiquetas clavadas e NULO nas desclavadas - + Preserve existing rotation values during label pin/unpin operations Preservar valores de rotación existentes durante as operacions de clavado/desclavado da etiqueta - + Display properties Amosar propiedades - + + Always show + Amosar sempre + + + Minimum scale Escala mínima - + Show label Amosar etiqueta - + Maximum scale Escala máxima - + Font properties Propiedades da fonte - + Bold Negriña - + Italic Cursiva - + Underline Suliñado - + Strikeout Tachado - + Font family Familia da fonte - + Capitalization Capitalización - + Add label columns to attribute table Engadir columnas de etiqueta á táboa de atributos - + About data defined values Acerca dos valores definidos dos datos - + Buffer properties Propiedades do buffer - + Automated placement settings Configuración do posicionamento automatizado - Show all labels for this layer (i.e. including colliding labels) - Amosar tódalas etiquetas para esta capa (incluído etiquetas solapadas) + Amosar tódalas etiquetas para esta capa (incluído etiquetas solapadas) - + Around point Arredor do punto - + Offset from point Desprazamento do punto - + Parallel Paralelo - + Curved Curvado - + Horizontal Horizontal - + Offset from centroid Desprazamento dende o centroide - + Around centroid Arredor do centroide - + Horizontal (slow) Horizontal (lento) - + Free (slow) Libre (lento) - + Using perimeter Utilizar perímetro - + Centroid of Centroide de - + visible polygon polígono visible - + whole polygon polígono enteiro - + Above line Sobre a liña - + On line Na liña - + Below line Debaixo da liña - + + outside + + + + + inside + + + + + Maximum angle between curved characters + + + + X X - + Y Y - + Above Right Arriba Dereita - + Above Left Arriba Esquerda - + Over Superposta - + Above Arriba - + Below Left Abaixo esquerda - + Below Abaixo - + Below Right Abaixo Dereita - + + Show all labels for this layer (including colliding labels) + Amosar tódalas etiquetas para esta capa (incluíndo etiquetas solapadas) + + + Show upside-down labels - + Amosar etiquetas invertidas - + never - nunca + nunca - + when rotation defined - + cando a rotación estea definida - + always - sempre + sempre + + + + Limit number of features to be labeled to + + + + + Number of features sent to labeling engine, though not all may be labeled + - + Buffer size Tamaño do buffer - + Buffer color Cor do buffer - + Position Posición - + X Coordinate Coordenada X - + Y Coordinate Coordenada Y - + Horizontal alignment Aliñamento horizontal - + Vertical alignment Aliñamento vertical @@ -25471,79 +26514,79 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsLegend - - + + sub-group Sub-grupo - - + + group Grupo - + Legend context Contexto da lenda - + &Make to Toplevel Item &Mover elemento ó nivel máis alto - + Zoom to Group Zoom ó grupo - + &Set Group CRS &Fixar SRC do grupo - + &Group Selected &Grupo seleccionado - + Copy Style Copiar estilo - + Paste Style Pegar estilo - + &Add New Group &Engadir novo grupo - + &Expand All &Expandir todo - + &Collapse All &Contraer todo - + &Update Drawing Order &Actualizar orde de debuxado - + &Remove &Borrar - + Re&name Re&nomear @@ -25551,80 +26594,83 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsLegendLayer - + &Remove &Eliminar - + &Query... &Consulta... - + &Zoom to Layer Extent &Zoom á extensión da capa - + &Zoom to Best Scale (100%) &Zoom á mellor escala (100%) - + &Stretch Using Current Extent &Despregar utilizando a actual extensión - + &Show in Overview &Amosar na Vista Xeral - + + &Duplicate + &Duplicar + + + &Set Layer CRS &Fixar o SRC da Capa - + Set &Project CRS from Layer Fixar o SRC do &proxecto dende a capa - + &Open Attribute Table &Abrir Táboa de Atributos - - + + Save As... Gardar como... - + Save Selection As... Gardar selección como... - + Show Feature Count Amosar contador de entidades - + &Properties &Propiedades - - + Updating feature count for layer %1 Actualizando contador de entidade para a capa %1 - - + Abort Cancelar @@ -25825,7 +26871,7 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsMapCanvas - + Could not draw %1 because: %2 COMMENTED OUT @@ -25833,7 +26879,7 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. - + Could not draw %1 because: %2 Non se puido debuxar %1 porque: @@ -25887,99 +26933,99 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsMapLayer - - + + Specify CRS for layer %1 Especificar SRC para a capa %1 - - - + + + %1 at line %2 column %3 %1 na liña %2 columna %3 - + style not found in database Estilo non atopado na base de datos - + Error: qgis element could not be found in %1 Erro: elemento de QGIS non pode ser atopado en %1 - - + + Loading style file %1 failed because: %2 Fallou a carga do ficheiro de estilo %1 porque: %2 - - - + + + Could not save symbology because: %1 Non se pode garda-la simboloxía porque: %1 - - + + The directory containing your dataset needs to be writable! ¡O directorio que contén o seu conxunto de datos necesita ser escribible! - - + + Created default style file as %1 Creado ficheiro de estilo por defecto como %1 - + ERROR: Failed to created default style file as %1. Check file permissions and retry. ERRO: fallou a creación do ficheiro de estilo por defecto %1. Verifique os permisos do ficheiro e reinténteo. - + User database could not be opened. A base de datos do usuario non pode ser accedida. - + The style table could not be created. A táboa de estilo non pode ser creada. - + The style %1 was saved to database O estilo %1 foi gardado na base de datos - + The style %1 was updated in the database. O estilo %1 foi actualizado na base de datos. - + The style %1 could not be updated in the database. O estilo %1 non puido ser actualizado na base de datos. - + The style %1 could not be inserted into database. O estilo %1 non puido ser introducido na base de datos. - + ERROR: Failed to created SLD style file as %1. Check file permissions and retry. ERRO: fallou a creación do ficheiro de estilo SLD %1. Verifique os permisos do ficheiro e reinténteo. - + Unable to open file %1 Incapaz de abri-lo ficheiro %1 @@ -25987,14 +27033,14 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsMapRenderer - - + + Transform error caught: %1 Detectado erro de transformación: %1 - - + + CRS SRC @@ -26374,92 +27420,95 @@ Isto pode ser un problema de conexión da súa rede ou do servidor WMS. QgsMapToolIdentify - + No active layer Sen capa activa - + To identify features, you must choose an active layer by clicking on its name in the legend Para identificar entidades, debe escoller unha capa vectorial activa clicando no seu nome na lenda - + Identifying on %1... Identificando en %1... - + Identifying done. Identificación realizada. - + No features at this position found. Sen entidades atopadas neste punto. - - + + (clicked coordinate) (coordenada clicada) - + Length Lonxitude - + firstX attributes get sorted; translation for lastX should be lexically larger than this one atributos son ordeados, a tradución para a últimaX debe ser lexicalmente maior que esta primeira PrimeiraX - + firstY PrimeiraY - + lastX attributes get sorted; translation for firstX should be lexically smaller than this one atributos son ordeados, a tradución para a últimaX debe ser lexicalmente menor que esta ÚltimaX - + lastY ÚltimaY - + Area Área - + + Perimeter + + + + feature id ID de entidades - + new feature Nova entidade - WMS layer - Capa WMS + Capa WMS - Feature info - Información de entidade + Información de entidade - + Raster Ráster @@ -27003,57 +28052,57 @@ http://my.host.com/cgi-bin/mapserv.exe QgsMeasureDialog - + &New &Novo - + The calculations are based on: Os cálculos están baseados en: - + Project CRS transformation is turned off. A transformación do SRC do proxecto está desactivada. - + Canvas units setting is taken from project properties setting (%1). A configuración das unidades da Vista do Mapa está tomada da configuración das propiedades do proxecto (%1). - + Ellipsoidal calculation is not possible, as project CRS is undefined. O cálculo elipsoidal non é posible, en canto o SRC do proxecto non está definido. - + Project CRS transformation is turned on and ellipsoidal calculation is selected. A transformación do SRC do proxecto está activada e o cálculo elipsoidal está seleccionado. - + The coordinates are transformed to the chosen ellipsoid (%1), and the result is in meters As coordenadas serán transformadas ó elipsoide escollido (%1) e os resultados amosaránse en metros - + Project CRS transformation is turned on but ellipsoidal calculation is not selected. A transformación do SRC está activada pero o cálculo elipsoidal non está seleccionado. - + The canvas units setting is taken from the project CRS (%1). A configuración das unidades da Vista do Mapa está tomada do SRC do proxecto (%1). - + Finally, the value is converted from %2 to %3. Finalmente, o valor será transformado de %2 a %3. - + Segments [%1] Segmentos [%1] @@ -27195,9 +28244,24 @@ http://my.host.com/cgi-bin/mapserv.exe QgsMessageBar + Remaining messages + Mensaxes restantes + + + + Close all + Pechar todo + + + Close Pechar + + + more + máis + QgsMessageLogViewer @@ -27803,17 +28867,17 @@ http://my.host.com/cgi-bin/mapserv.exe Recortar ó MínMáx - + Red Vermello - + Green Verde - + Blue Azul @@ -28601,22 +29665,22 @@ Informacion do erro extendido: Always cache - + Caché sempre Prefer cache - + Caché preferible Prefer network - + Rede preferible Always network - + Rede sempre @@ -28650,7 +29714,7 @@ Informacion do erro extendido: Coordinate Reference System - Sistema de Referencia de Coordenadas + Sistema de Referencia de Coordenadas @@ -28787,12 +29851,12 @@ Informacion do erro extendido: Coordinate Reference System: - + Sistema de Referencia de Coordenadas: Selected Coordinate Reference System - + Sistema de Referencia de Coordenadas seleccionado @@ -28832,7 +29896,7 @@ Informacion do erro extendido: Cache - Caché + Caché @@ -28846,7 +29910,16 @@ Prefer network: default value; load from the network if the cached entry is olde Always network: always load from network and do not check if the cache has a valid entry (similar to the "Reload" feature in browsers) - + Preferencias da Caché + +Sempre Caché: cargar dende a caché, mesmo se xa expirou + +Preferir Caché: cargar dende a caché se está dispoñible, doutro xeito cargar dende a rede. Teña en conta que isto posiblemente poida devolver da caché elementos pasados (anque non caducados) + +Preferir rede: valor predeterminado, cargar dende a rede se a entrada da caché é máis antiga que a entrada da rede + +Sempre rede: cargar sempre dende a rede e non comprobar se a caché ten unha entrada válida (similar a "Recargar" elemento nos buscadores) + @@ -29492,67 +30565,67 @@ Always network: always load from network and do not check if the cache has a val QgsOptions - + Current layer Capa actual - + Top down, stop at first De arriba para abaixo, parar na primeira - + Top down De arriba para abaixo - + Show all features Amosar Tódalas Entidades - + Show selected features Amosar entidades seleccionadas - + Show features in current canvas Amosar entidades na actual vista do mapa - + Always Sempre - + If needed De ser necesario - + Never Nunca - + Load all Cargar todo - + Check file contents Verificar contidos do ficheiro - + Check extension Verificar extensión - + No Non @@ -29561,254 +30634,250 @@ Always network: always load from network and do not check if the cache has a val Pasar a través - + Basic scan Escaneado básico - + Full scan Escaneado completo - + No Stretch Non despregar - + Stretch To MinMax Despregar a MínMáx - + Stretch And Clip To MinMax Despregar e recortar ó MínMáx - + Clip To MinMax Recortar ó MínMáx - + Detected active locale on your system: %1 Detectado idioma local activado no seu sistema: %1 - + None / Planimetric Ningún / Planimétrico - - + + Cumulative pixel count cut Corte de conta acumulativa de píxeles - + Minimum / maximum Mínimo / máximo - + Mean +/- standard deviation Media +/- desviación estándar - + To vertex Ó vértice - + To segment Ó segmento - + To vertex and segment Ó vértice e ó segmento - - + + map units Unidades do mapa - - + + pixels píxeles - - - + + + Semi transparent circle Círculo semitransparente - - - + + + Cross Cruzado - - - + + + None Ningún - + Off Apagado - + QGIS QGIS - + GEOS GEOS - + Round Redondo - + Mitre Mitra - + Bevel Comando - + Central point (fastest) Punto central (máis rápido) - + Chain (fast) Cadea (rápido) - + Popmusic tabu chain (slow) Cadea tabú MúsicaPop (lento) - + Popmusic tabu (slow) Tabú MúsicaPop (lento) - + Popmusic chain (very slow) Cadea MúsicaPop (moi lento) - - - + + + Save default project Gardar proxecto predeterminado - + You must set a default project Debe configurar un proxecto predeterminado - + Current project saved as default Proxecto actual gardado como predeterminado - + Error saving current project as default Erro gardando o actual proxecto como predeterminado - + Choose a directory to store project template files Escolla un directorio para almacena-los ficheiros modelo de proxecto - + Selection color Selección de cor - + Create Options - %1 Driver Opcións de Crear - Driver %1 - + Create Options - pyramids Opcións de Crear - pirámides - Parameters : - Parámetros : + Parámetros : - - - + + + Choose a directory Escolla un directorio - + Enter scale Introduza escala - + Scale denominator Denominador de escala - + Load scales Cargar escalas - - + + XML files (*.xml *.XML) Ficheiros XML (*.xml *.XML) - + Save scales Gardar escalas - - Parameters: - Parámetros: + Parámetros: - Can only use ellipsoidal calculations when CRS transformation is enabled - Só pode empregar cálculos elipsoidais cando a transformación do SRC está activada + Só pode empregar cálculos elipsoidais cando a transformación do SRC está activada @@ -29871,12 +30940,12 @@ Always network: always load from network and do not check if the cache has a val Font - Fonte + Fonte Qt default - + Qt predetermindado @@ -29971,14 +31040,14 @@ Always network: always load from network and do not check if the cache has a val - + Add Engadir - + Remove Borrar @@ -30327,57 +31396,56 @@ Always network: always load from network and do not check if the cache has a val Ferramenta de medición - Ellipsoid for distance calculations - Elipsoide para cálculo de distancias + Elipsoide para cálculo de distancias - + Rubberband color Cor da goma - + Preferred measurements units Unidades de medida preferidas - + Meters Metros - + Feet Pes - + Preferred angle units Unidades de ángulo preferidas - + Degrees Graos - + Radians Radiáns - + Gon Gon - + Decimal places Número de decimais - + Keep base unit Mante-la unidade base @@ -30422,291 +31490,289 @@ Always network: always load from network and do not check if the cache has a val Escalas predefinidas - + Overlays Solapamentos - + Position Posición - + Placement algorithm Algoritmo de posicionamento - + Digitizing Dixitalizacion - + Rubberband Goma - + Line width Ancho da liña - + Line width in pixels Ancho da liña en píxeles - + Line color Cor da liña - + Snapping Autoaxuste - + Default snap mode Modo de autoaxuste por defecto - + Default snapping tolerance Tolerancia de autoaxuste por defecto - + Search radius for vertex edits Radio de busca para editar vértices - - + + map units Unidades do mapa - - + + pixels píxeles - + Vertex markers Marcadores de vértices - + Show markers only for selected features Amosar marcadores só para entidades seleccionadas - + Marker style Estilo do marcador - + Marker size Tamaño do marcador - + Reuse last entered attribute values Reutiliza-los últimos valores de atributo introducidos - + Default expiration period for WMS-C/WMTS tiles (hours) Período de caducidade predeterminado para mosaicos WMS-C/WMTS (horas) - + Suppress attributes pop-up windows after each created feature Elimina-la fiestra emerxente de atributos logo de cada entidade creada - + Other settings Outros axustes - + Validate geometries Validar xeometrías - + Join style for curve offset Introduza estilo para desprazamento da curva - + Quadrantsegments for curve offset Segmentos de cuadrante para desprazamento da curva - + Miter limit for curve offset Límite da mitra para desprazamento da curva - + CRS SRC - + Default Coordinate Reference System for new projects Sistema de Referencia de Coordenadas por defecto para novos proxectos - + Enable 'on the &fly' reprojection by default Permitir reproxección 'sobre a &marcha' por defecto - - + + Select... Seleccione... - Semi-minor - Semi-eixo menor + Semi-eixo menor - Semi-major - Semi-eixo maior + Semi-eixo maior - + Always start new projects with this CRS Comezar sempre un proxecto con este SRC - + Automatically enable 'on the fly' reprojection if CRS of a new added layer differ from CRS of layer(s) already present. CRS of present layer(s) will be used. Activar automaticamente reproxección 'sobre a marcha' se o SRC da nova capa engadida difire do SRC da(s) capa(s) xa presentes. O SRC da(s) capa(s) presentes será o utilizado. - + Automatically enable 'on the fly' reprojection if layers have different CRS Activar automaticamente reproxección 'sobre a marcha' se as capas teñen diferentes SRC - + Coordinate Reference System for new layers Sistema de Referencia de Coordenadas para novas capas - + When a new layer is created, or when a layer is loaded that has no Coordinate Reference System (CRS) Cando unha nova capa é creada ou cando unha capa é cargada e non ten Sistema de Referencia de Coordenadas (SRC) - + Prompt for &CRS Solicitar un &SRC - + Use &project CRS Utiliza-lo SRC do &proxecto - + Use default CRS displa&yed below Utiliza-lo SRC por defecto &amosado debaixo - + Locale Internacionalización - + Override system locale Substituír configuración rexional do sistema - + Locale to use instead Configuración rexional a usar no canto de - + <b>Note:</b> Enabling / changing overide on local requires an application restart <b>Nota:</b> Permitir / cambiar substituír configuración rexional require o reinicio da aplicación - + Additional Info Información adicional - + Detected active locale on your system: Detectada configuración rexional activa no seu sistema: - + Network Rede - + Use proxy for web access Utilice proxy para acceder á web - + Host Hóspede - + Port Porto - + User Usuario - - + + Leave this blank if no proxy username / password are required Deixe isto en blanco se non é requerido usuario/contrasinal - + Password Contrasinal - + Proxy type Tipo de proxy - + Exclude URLs (starting with) Excluír URLs (comezando con) - + Cache settings Axustes de caché - + Directory Directorio @@ -30716,28 +31782,28 @@ Always network: always load from network and do not check if the cache has a val - + ... ... - + Size Tamaño - + Clear Limpar - + WMS search address Dirección de busca de WMS - + Timeout for network requests (ms) Tempo límite para resposta da rede (ms) @@ -31130,19 +32196,31 @@ Always network: always load from network and do not check if the cache has a val + Restrict the displayed tables to those that are in the layer registries. + Restrinxi-las táboas amosadas a aquelas que están nos rexistros de capa. + + + + Restricts the displayed tables to those that are found in the layer registries (geometry_columns, geography_columns, topology.layer). This can speed up the initial display of spatial tables. + Restrinxi-las táboas amosadas a aquela que se atopan nos rexistros de capa (geometry_columns, geography_columns, topology.layer). Isto pode axiliza-la visualización inicial das táboas espaciais. + + + + Only look in the layer registries + Mirar só nos rexistros da capa + + Restrict the displayed tables to those that are in the geometry_columns table columnas de xeometría - Restrinxi-las táboas amosadas a aquelas que están na táboa geometry_columns + Restrinxi-las táboas amosadas a aquelas que están na táboa geometry_columns - Restricts the displayed tables to those that are in the geometry_columns table. This can speed up the initial display of spatial tables. - Restrinxi-las táboas amosadas a aquelas que están na táboa geometry_columns. Isto pode acelera-la visualización inicial das táboas espacias. + Restrinxi-las táboas amosadas a aquelas que están na táboa geometry_columns. Isto pode acelera-la visualización inicial das táboas espacias. - Only look in the geometry_columns table - Buscar só na táboa de geometry_columns + Buscar só na táboa de geometry_columns @@ -31324,12 +32402,18 @@ Always network: always load from network and do not check if the cache has a val Parar - + + No accessible tables or views found. Check the message log for possible errors. + Non se atoparon táboas ou vistas accesibles. Comprobe o rexistro de mensaxes para posibles erros. + + + Connect Conectar + Postgres/PostGIS Provider Provedor Postgres/PostGIS @@ -31360,52 +32444,69 @@ Always network: always load from network and do not check if the cache has a val Táboa - Type - Tipo + Tipo - Geometry column - Columna de xeometría + Columna de xeometría - + SRID SRID - Primary key column - Columna de chave primaria + Columna de chave primaria - + Select at id Seleccione na id - + Sql Sql - + Detecting... Detectando... - + Select... Seleccione... - + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). Deshabilitar a capacidade 'Acceso Rápido a Entidade na ID' para forza-lo mantemento de táboas de atributos en memoria (por exemplo, en caso de vistas custosas). - + + Column + Columna + + + + Data Type + Tipo Data + + + + Spatial Type + Tipo Espacial + + + + Primary Key + Chave primaria + + + Enter... Introducir... @@ -31631,7 +32732,7 @@ Velaí a mensaxe de erro: Experimental plugin. Use at own risk - + Plugin experimental. Utilíceo baixo o seu propio risco - %d plugins available @@ -31814,7 +32915,7 @@ Necesita reiniciar Quantum GIS para recargalo. State - Estado + Estado @@ -32274,7 +33375,7 @@ p, li { white-space: pre-wrap; } - + Plugins Plugins @@ -32285,27 +33386,27 @@ p, li { white-space: pre-wrap; } - + Installed in %1 menu/toolbar Instalado no %1menú/barra de ferramentas - + No Plugins Sen Plugins - + No QGIS plugins found in %1 Ningún plugin atopado en %1 - + Error Erro - + Failed to open plugin installer! ¡Fallou a apertura do instalador de plugins! @@ -32313,32 +33414,32 @@ p, li { white-space: pre-wrap; } QgsPluginManagerBase - + QGIS Plugin Manager Administrador de Plugins de QGIS - + To enable / disable a plugin, click its checkbox or description Para activar/desactivar un plugin, clicar na súa casela de verificación ou na descripción - + &Filter &Filtro - + Plugin Directory: Directorio de plugin: - + Directory Directorio - + Plugin Installer Instalador de plugins @@ -32468,24 +33569,24 @@ p, li { white-space: pre-wrap; } - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + PostGIS PostGIS @@ -32520,12 +33621,12 @@ resultado:%2 erro:%3 - + Database connection was successful, but the accessible tables could not be determined. A conexión á base de datos foi satisfactoria, pero as táboas accesibles non puideron ser determinadas. - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 @@ -32534,7 +33635,7 @@ erro:%3 - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 @@ -32544,56 +33645,56 @@ A mensaxe de erro da base de datos foi: - + Database connection was successful, but no accessible tables were found. Please verify that you have SELECT privilege on a table carrying PostGIS geometry. A conexión á base de datos foi satisfactoria, pero as táboas accesibles non foron atopadas. Verifique que posúe privilexios SELECT na táboa de leva a xeometría PostGIS. - + Unable to get list of spatially enabled tables from the database Incapaz de obte-la lista de táboas activadas espacialmente dende a base de datos - + Retrieval of postgis version failed Fallou a recuperación da versión de PostGIS - + Could not parse postgis version string '%1' Non se puido analiza-la cadea de versión PostGIS '%1' - + Connection error: %1 returned %2 [%3] Erro de conexión: %1 retornou %2 [%3] - + Erroneous query: %1 returned %2 [%3] Consulta errónea: %1 retornou %2 [%3] - + Query failed: %1 Error: no result buffer Fallou a consulta: %1 Erro: sen buffer resultante - + Not logged query failed: %1 Error: no result buffer Fallou consulta non rexistrada: %1 Erro: sen buffer resultante - + Query: %1 returned %2 [%3] Consulta: %1 retornou %2 [%3] - + %1 cursor states lost. SQL: %2 Result: %3 (%4) @@ -32602,78 +33703,98 @@ SQL: %2 Resultado: %3 (%4) - + resetting bad connection. restablecer mala conexión. - + retry after reset succeeded. reintentar logo de restablecer con éxito. - + retry after reset failed again. reintentar de novo logo do fallo de restablecemento. - + connection still bad after reset. a conexión segue sendo mala logo de restablecer. - + bad connection, not retrying. conexión mala, non está reintentando. - + Point Punto - + Multipoint Multipunto - + Line Liña - + Multiline Multiliña - + Polygon Polígono - + Multipolygon Multipolígono - + No Geometry Sen xeometría - + Unknown Geometry Xeometría descoñecida - - + + None + Ningún + + + + Geometry + Xeometría + + + + Geography + Xeografía + + + + TopoGeometry + TopoXeometría + + + + Query could not be canceled [%1] A consulta non puido ser cancelada [%1] - + PQgetCancel failed Fallou PQgetCancel @@ -32687,31 +33808,31 @@ Resultado: %3 (%4) - - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + + + - - - + + PostGIS PostGIS @@ -32766,154 +33887,158 @@ Resultado: %3 (%4) Texto, lonxitule ilimitada (text) - + Couldn't get the feature geometry in binary form Non se puido obte-la xeometría de entidade en forma binaria - + Read attempt on an invalid postgresql data source Tentativa de lectura nunha fonte de datos PostgreSQL inválida - + nextFeature() without select() nextFeature() sen selección() - - + + Fetching from cursor %1 failed Database error: %2 Fallo busca dende o cursor %1 Erro da base de datos: %2 - + feature %1 not found Entidade %1 non atopada - + found %1 features instead of just one. Atopadas %1 entidades no canto dunha soa. - + FAILURE: Field %1 not found. FALLO: Campo %1 non atopado. - - + + unexpected formatted field type '%1' for field %2 formato inesperado de tipo de campo '%1' para campo %2 - - + Field %1 ignored, because of unsupported type %2 Campo %1 ignorado, debido a tipo insoportado %2 - + + Field %1 ignored, because of unsupported type type %2 + O campo %1 foi ignorado, debido a un tipo insoportado de tipo %2 + + + The custom query is not a select query. A consulta personalizada non é unha consulta de selección. - + The table has no column suitable for use as a key. Quantum GIS requires a primary key, a PostgreSQL oid column or a ctid for tables. A táboa non ten unha columna axeitada para usar coma chave. Quantum GIS require unha chave primaria, unha columna OID PostgreSQL ou unha CTID para táboas. - + Primary key field '%1' for view not unique. Campo de chave primaria '%1' para vista non único. - + Type '%1' of primary key field '%2' for view invalid. O tipo '%1' de campo de chave primaria '%2' para vista inválido. - + Key field '%1' for view not found. Campo de chave '%1' para vista non atopado. - + No key field for view given. Non foi dado ningún campo chave para vista. - + Unexpected relation type '%1'. Tipo de relación '%1' inesperado. - + No key field for query given. Non foi dado ningún campo chave para consulta. - + PostGIS error while adding features: %1 Erro de PostGIS cando se engadían entidades: %1 - + PostGIS error while deleting features: %1 Erro de PostGIS cando se eliminaban entidades: %1 - + PostGIS error while adding attributes: %1 Erro de PostGIS cando se engadían atributos: %1 - + PostGIS error while deleting attributes: %1 Erro de PostGIS cando se eliminaban atributos: %1 - + PostGIS error while changing attributes: %1 Erro de PostGIS cando se cambiaban atributos: %1 - + PostGIS error while changing geometry values: %1 Erro de PostGIS cando se cambiaban valores de xeometría: %1 - + result of extents query invalid: %1 resultado da consulta de extensión inválida: %1 - + Geometry type and srid for empty column %1 of %2 undefined. Tipo de xeometría e srid para columna baleira %1 de %2 non definidas. - + Feature type or srid for %1 of %2 could not be determined or was not requested. O tipo de entidade ou srid para %1 de %2 non puido ser determinado ou non foi solicitado. - + Editing and adding disabled for 2D+ layer (%1; %2) Edición e adición desactivadas para capas 2D+ (%1; %2) - + Duplicate field %1 found Campo duplicado %1 non atopado - + Unable to access the %1 relation. The error message from the database was: %2. @@ -32924,7 +34049,7 @@ A mensaxe de erro dende a base de datos foi: SQL: %3 - + PostgreSQL is still in recovery after a database crash (or you are connected to a (read-only) slave). Write accesses will be denied. @@ -32933,7 +34058,7 @@ Write accesses will be denied. Accesos de escritura serán denegados. - + Unable to determine table access privileges for the %1 relation. The error message from the database was: %2. @@ -32944,7 +34069,7 @@ A mensaxe de erro dende a base de datos foi: SQL: %3 - + Unable to execute the query. The error message from the database was: %1. @@ -33018,112 +34143,184 @@ Choose ignore to continue loading without the missing layers. Choose cancel to r Escolla ignorar para continuar cargando sen as capas perdidas. Escolla cancelar para volver ó estado de cargado do seu pre-proxecto. Escolla OK para tentar atopa-las capas perdidas. + + QgsProjectLayerGroupDialog + + + Select project file + Seleccione o ficheiro de proxecto + + + + QGis files + Ficheiros QGIS + + + + Recursive embedding not possible + A integración recursiva non é posible + + + + It is not possible to embed layers / groups from the current project. + Non é posible integrar capas/grupos dende proxecto actual. + + + + QgsProjectLayerGroupDialogBase + + + Select layers and groups to embed + Seleccione capas e grupos a integrar + + + + Project file + Ficheiro de proxecto + + + + ... + ... + + QgsProjectProperties - + Layer Capa - + Type Tipo - + Identifiable Identificable - + Vector Vector - + WMS WMS - + Raster Ráster - - + + Coordinate System Restriction Restricción do sistema de coordenadas - + No coordinate systems selected. Disabling restriction. Ningún sistema de coordenadas seleccionado. Desactivando restricción. - + Selection color Selección de cor - + CRS %1 was already selected O SRC %1 xa está seleccionado - + Coordinate System Restrictions Restriccións do sistema de coordenadas - + The current selection of coordinate systems will be lost. Proceed? A actual selección do sistema de coordenadas perderáse. ¿Proceder? - + + Select print composer + Seleccione deseñador de impresión + + + + Composer Title + Título do deseñador + + + + Select restricted layers and groups + Seleccionar capas e grupos restrinxidos + + + Enter scale Introduza escala - + Scale denominator Denominador de escala - + Load scales Cargar escalas - - + + XML files (*.xml *.XML) Ficheiros XML (*.xml *.XML) - + Save scales Gardar escalas - + Transparency %1% Transparencia %1% - + Select a valid symbol Seleccione un símbolo válido - + Invalid symbol : Símbolo inválido : + + + Parameters : + Parámetros : + + + + + Parameters: + Parámetros: + + + + Can only use ellipsoidal calculations when CRS transformation is enabled + Só pode empregar cálculos elipsoidais cando a transformación do SRC está activada + QgsProjectPropertiesBase @@ -33133,52 +34330,52 @@ Proceed? Propiedades do Proxecto - + General Xeral - + General settings Configuracións xerais - + Project title Título do proxecto - + Descriptive project name Nome descriptivo do proxecto - + Default project title Título do proxecto por defecto - + Selection color Selección de cor - + Background color Cor de fondo - + absolute absoluto - + relative relativo - + Save paths Gardar rutas @@ -33187,232 +34384,272 @@ Proceed? Unidades de capa (usado só cando a transformación do SRC está desactivada) - + Meters metros - + Feet Pes - + Degree Grao - + Degree display Amosar grao - + Decimal degrees Grados decimais - + Degrees, Minutes Graos, Minutos - + Degrees, Minutes, Seconds Graos, Minutos, Segundos - + Precision Precisión - + Automatically sets the number of decimal places in the mouse position display Axusta automaticamente o número de decimais na posición do rato - + The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display O número de decimais que son usados cando se amoasa a posición do rato é automaticamente axustada para ser suficiente e movendo o rato un pixel produce un cambio na posición amosada - + Automatic Automático - - + + Sets the number of decimal places to use for the mouse position display Axusta o número de decimais a usar na posición do rato - + Manual Manual - - + + The number of decimal places for the manual option O número de decimais para a opción manual - + decimal places Número de decimais - + Project scales Escalas de proxecto - - - - - - - - + + + + + + + + ... ... - + Coordinate Reference System (CRS) Sistema de Referencia de Coordenadas (SRC) - + Enable 'on the fly' CRS transformation Activar transformación do SRC 'sobre a marcha' - + Identifiable layers Capas identificables - - + + Layer Capa - + Type Tipo - + Identifiable Identificable - + Default Styles Estilos predeterminados - + Default Symbols Símbolos predeterminados - + Marker Marcador - + Line Liña - + Fill Encher - + Color Ramp Rampla de cor - + Style Manager Administrador de Estilo - + Options Opcións - + Assign random colors to symbols Asignar cores aleatorias ós símbolos - + Opacity Opacidade - + OWS Server Servidor OWS - + + Fees + Taxas + + + + Access constraints + Restricións de acceso + + + + Keyword list + Lista de palabras chave + + + + Exclude composers + Excluír deseñadores + + + + Exclude layers + Excluír capas + + + Advertised WMS url Url WMS anunciada - + Maximum width Anchura máxima - + Maximum height Altura máxima - + WFS Capabilitities Capacidades WFS - + Published Publicado - + + Update + Actualizar + + + + Insert + Insertar + + + + Delete + Eliminar + + + Unselect all - + Deseleccionar todo - + Select all - + Seleccionar todo - + Macros Macros - + Python macros Macros Python - + Service Capabilitities Capacidades do Servizo @@ -33421,107 +34658,127 @@ Proceed? Unidades de capa - + Title Título - + Person Persoa - + Phone Teléfono - + Abstract Resumo - + E-Mail Correo electrónico - + + Measure tool + Ferramenta de medición + + + + Ellipsoid for distance calculations + Elipsoide para cálculo de distancias + + + + Semi-minor + Semi-eixo menor + + + + Semi-major + Semi-eixo maior + + + Organization Organización - + Online resource Recurso en liña - + WMS Capabilitities Capacidades WMS - + Advertised Extent Extensión anunciada - + Min. X Mín. X - + Min. Y Mín. Y - + Max. X Máx. X - + Max. Y Máx. Y - + Use Current Canvas Extent Utilice a extensión da Vista do mapa actual - + Coordinate Systems Restrictions Restriccións do sistema de coordenadas - + Used when CRS transformation is turned off Utilizado cando a transformación do SRC está apagada - + Canvas units Unidades da Vista do Mapa - + Add Engadir - + Remove Eliminar - + Used Utilizado - + Add WKT geometry to feature info response Engadir xeometría WKT á resposta de información da entidade @@ -34105,57 +35362,67 @@ p, li { white-space: pre-wrap; } QgsRasterDataProvider - + Identify Indentificar - + Build Pyramids Construír pirámides - + Create Datasources Crear Fontes de Datos - + Remove Datasources Eliminar Fontes de Datos - + + no data + Sen datos + + + + Feature info + Información de entidade + + + Band Banda - + Average Media - + Nearest Neighbour Veciño máis cercano - + Gauss Gauss - + Cubic Cúbica - + Mode Modo - + None Ningún @@ -34461,242 +35728,246 @@ Clique no botón de axuda para obte-las opcións válidas para este formato QgsRasterLayer - - - - - + + + + + Not Set Non fixado - + QgsRasterLayer created Creada capa ráster Qgs - + Retrieving stats for %1 Recuperando estadísticas para %1 - + Could not reproject view extent: %1 Non se puido reproxecta-la extensión da vista: %1 - - - - - - - + + + + Raster Ráster - + Could not reproject layer extent: %1 Non se puido reproxecta-la extensión da capa: %1 - + Cannot read data Non se poden le-los datos - + null (no data) nulo (sen datos) - + Driver: Driver: - + No Data Value Non hai valor de datos - + NoDataValue not set Non fixado 'non hai valor de datos' - + Data Type: Tipo de datos: - + GDT_Byte - Eight bit unsigned integer GDT_Byte - Enteiro non asinado de oito bits - + GDT_UInt16 - Sixteen bit unsigned integer GDT_UInt16 -Enteiro non asinado de dezaseis bits - + GDT_Int16 - Sixteen bit signed integer GDT_Int16 -Enteiro asinado de dezaseis bits - + GDT_UInt32 - Thirty two bit unsigned integer GDT_UInt32 - Enteiro non asinado de trinta e dous bits - + GDT_Int32 - Thirty two bit signed integer GDT_Int32 - Enteiro asinado de trinta e dous bits - + GDT_Float32 - Thirty two bit floating point GDT_Float32 - Coma flotante de trinta e dous bits - + GDT_Float64 - Sixty four bit floating point GDT_Float64 - Coma flotante de sesenta e catro bits - + GDT_CInt16 - Complex Int16 GDT_CInt16 - Complexo Enteiro 16 - + GDT_CInt32 - Complex Int32 GDT_CInt32 - Complexo Enteiro 32 - + GDT_CFloat32 - Complex Float32 GDT_CFloat32 - Complexo Decimal 32 - + GDT_CFloat64 - Complex Float64 GDT_CFloat64 - Complexo Decimal 64 - + Could not determine raster data type. Non se puido determina-lo tipo de datos ráster. - + Pyramid overviews: Vista xeral das pirámides: - + Layer Spatial Reference System: Sistema de Referencia Espacial da Capa: - + Layer Extent (layer original source projection): Extensión da capa (proxección da fonte orixinal da capa): - + Project Spatial Reference System: Sistema de Referencia Espacial do Proxecto: - - + + Band Banda - + Band No Ningunha Banda - + No Stats Sen estadísticas - + No stats collected yet Ningunha estadística recollida aínda - + Min Val Valor Mínimo - + Max Val Valor Máximo - + Range Rango - + Mean Media - + Sum of squares Suma dos cadrados - + Standard Deviation Desviación estándar - + Sum of all cells Suma de tódalas celas - + Cell Count Contar celas - + + Cannot instantiate the '%1' data provider + Non se puido instancia-lo provedor de datos '%1' + + + + Provider is not valid (provider: %1, URI: %2 + Provedor non válido (provedor: %1, URI: %2) + + Failed to load provider %1 (Reason: %2) - Fallou a carga do provedor %1 (Razón: %2) + Fallou a carga do provedor %1 (Razón: %2) - Cannot resolve the classFactory function - Non se puido resolve-la función classFactory + Non se puido resolve-la función classFactory - Cannot instantiate the data provider - Non se puido instancia-lo provedor de datos + Non se puido instancia-lo provedor de datos Data provider is invalid (layers: %1, styles: %2, formats: %3) O provedor de datos é inválido (capas: %1, estilos: %2, formatos: %3) - + <maplayer> not found. <maplayer> non atopado. - + GDAL data type %1 is not supported O tipo de datos GDAL %1 non está soportado @@ -34769,105 +36040,105 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoEtiqueta - + Description Descrición - + Large resolution raster layers can slow navigation in QGIS. As capas ráster de gran resolución poden enlentecer a navegación en QGIS. - + By creating lower resolution copies of the data (pyramids) performance can be considerably improved as QGIS selects the most suitable resolution to use depending on the level of zoom. Creando copias de baixa resolución dos datos (pirámides) a manexabilidade pode incrementarse considerablemente porque QGIS selecciona a resolución máis apropiada a usar dependendo do nivel do zoom. - + You must have write access in the directory where the original data is stored to build pyramids. Debe ter acceso de escritura no directorio onde os datos orixinais están almacenados para constuír pirámides. - + Please note that building internal pyramids may alter the original data file and once created they cannot be removed! ¡Teña en conta que construíndo pirámides internas pode altera-lo arquivo de datos orixinal e unha vez creado estes non poden ser eliminados! - + Please note that building internal pyramids could corrupt your image - always make a backup of your data first! ¡Teña en conta que construíndo pirámides internas pode estraga-la súa imaxe - faga sempre unha copia de seguridade dos seus datos primeiro! - + Layer Properties - %1 Propiedades de capa - %1 - - + + Nearest neighbour Veciño máis cercano - - + + Bilinear Biliñal - - + + Cubic Cúbica - - + + Average Media - + None Ningún - - + + Red Vermello - - + + Green Verde - - + + Blue Azul - - - + + + + - Percent Transparent Porcentaxe de transparencia - - + + Gray Gris - - + + Indexed Value Valor indexado @@ -34903,41 +36174,41 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoR:%1 G:%2 B:%3 por defecto - + Columns: %1 Columnas: %1 - + Rows: %1 Ringleiras: %1 - + Columns: Columnas: + - - - + + n/a non está - + Rows: Ringleiras: - - + + No-Data Value: Non hai valor de datos: - + No-Data Value: %1 Non hai valor de datos: %1 @@ -34946,48 +36217,48 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoNon hai valor de datos: Non fixado - - + + Write access denied Denegado o acceso de escritura - + Write access denied. Adjust the file permissions and try again. Denegado o acceso de escritura. Axuste os permisos de ficheiro e ténteo de novo. - - - - + + + + Building pyramids failed. Fallou a creación de pirámides. - + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. Este ficheiro non foi escrito. Algúns formatos non soportan vistas xerais de pirámides. Consulte a documentació GDAL en caso de dúbida. - - + + Building pyramid overviews is not supported on this type of raster. A creación de vistas xerais de pirámides non está soportado neste tipo de ráster. - + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. A creación de vistas xerais de pirámides internas non está soportado en capas ráster con compresión JPEG nin na súa librería actual libtiff. - + Save file Gardar ficheiro - - + + Textfile Ficheiro de texto @@ -34996,28 +36267,28 @@ Clique no botón de axuda para obte-las opcións válidas para este formatonulo (sen datos) - + Load layer properties from style file Cargar propiedades da capa dende ficheiro de estilo - - + + QGIS Layer Style File Ficheiro de estilo de capa de QGIS - + Save layer properties as style file Gardar propiedades de capa como ficheiro de estilo - + Filter Filtro - + Bands Bandas @@ -35026,27 +36297,27 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoTempo - + QGIS Generated Transparent Pixel Value Export File QGIS xenerou un ficheiro de exportación de valor de pixel transparente - + From Dende - + To Ata - + not defined Non definido - + Write access denied. Adjust the file permissions and try again. @@ -35063,17 +36334,17 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoEscolla un nome de ficheiro para gardar como nome de imaxe do mapa - + Open file Abrir arquivo - + Import Error Erro de importación - + The following lines contained errors %1 @@ -35082,12 +36353,12 @@ Clique no botón de axuda para obte-las opcións válidas para este formato - + Read access denied Denegado o acceso de lectura - + Read access denied. Adjust the file permissions and try again. @@ -35132,14 +36403,14 @@ Clique no botón de axuda para obte-las opcións válidas para este formato - - + + Default Style Estilo por defecto - - + + Saved Style Estilo gardado @@ -35168,9 +36439,8 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoCor de tres bandas - Invert color map - Invertir cor do mapa + Invertir cor do mapa RGB mode band selection and scaling @@ -35189,12 +36459,12 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoBanda Azul - - - - - - + + + + + + ... ... @@ -35283,8 +36553,10 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoMellora do contraste + + Current - Actual + Actual Default @@ -35295,100 +36567,161 @@ Clique no botón de axuda para obte-las opcións válidas para este formatoEtiqueta de texto - + Transparency Transparencia - + Global transparency Transparencia global - + None Ningún - + 00% 00% - + <p align="right">Full</p> <p align="dereita">Full</p> - + Custom transparency options Personalizar opcións de transparencia - + Transparency band Banda transparente - + Transparent pixel list Lista de píxeles transparentes - + Add values manually Engadir valores manualmente - + Add Values from display Engadir valores dende a visualización - + Remove selected row Eliminar as ringleiras seleccionadas - + Default values Valores por defecto - + Import from file Importar dende ficheiro - + Export to file Exportar a ficheiro - + + + Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inclusive)</p></body></html> + + + + + + Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exclusive)</p></body></html> + + + + MInimum scale denominator. + Denominador mínimo da escala. + + + Maximum scale: + Escala máxima: + + + Minimum scale (maximum scale denominator). + Escala mínima (denominador de escala máxima). + + + Maximum scale (minimum scale denominator). + Escala máxima (denominador mínimo de escala). + + + Maximum scale denominator + Denominador máximo da escala + + + Minimum scale + Escala mínima + + + No data value Non hai valor de datos - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> -<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> {3C?} {4.0/?} {3.?} {40/?} {1"?} {9p?} {400;?} {0p?} {0p?} {0p?} {0p?} {0;?} {0p?} {11p?} +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> - <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> @@ -35455,37 +36788,37 @@ p, li { white-space: pre-wrap; } 2 - + General Xeral - + Display name Mostrar nome - + Layer source Fonte da capa - + Columns Columnas - + Rows Ringleiras - + No Data Ningún dato - + Scale dependent visibility Visibilidade dependendo da escala @@ -35498,53 +36831,53 @@ p, li { white-space: pre-wrap; } Mínimo - + Coordinate reference system Sistema de Referencia de Coordenadas - - + + Specify the coordinate reference system of the layer's geometry. Especifique o sistema de referencia de coordenadas da xeometría da capa. - + Specify... Especifique... - + Thumbnail Miniatura - + Legend Lenda - + Palette Paleta - + Metadata Metadatos - + Title Título - + Abstract Resumo - + Pyramids Pirámides @@ -35603,12 +36936,12 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></td></tr></table></body></html> - + Notes Notas - + Pyramid resolutions Resolucións das pirámides @@ -35677,68 +37010,66 @@ p, li { white-space: pre-wrap; } Crear pirámides internamente se é posible - + Resampling method Método de remostraxe - + Average Media - + Oversampling - + Sobremostraxe - + Use original source no data value. Utilizar valores sen datos da fonte orixinal. - + No data value: Non hai valor de datos: - + Original data source no data value, if exists. Valor sen datos da fonte de datos orixinal, se existe. - + <src no data value> <src non hai valor de datos> - - + + Additional user defined no data value. Valor sen datos adicional definido polo usuario. - + Additional no data value Valor sen datos adicional - Less than: - Menor que: + Menor que: - More than or equal to: - Máis que ou igual a: + Máis que ou igual a: - + Nearest Neighbour Veciño máis cercano - + Build pyramids Construír pirámides @@ -35755,27 +37086,27 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><br /></p></body></html> - + Overview format Formato da Vista Xeral - + External Externo - + Internal (if possible) Interno (de ser posible) - + External (Erdas Imagine) Externo (Erdas Imagine) - + Histogram Histograma @@ -35784,43 +37115,43 @@ p, li { white-space: pre-wrap; } Gardar como Imaxe... - + Restore Default Style Restaurar estilo por defecto - + Save As Default Gardar como Predeterminado - + Load Style ... Cargar estilo... - + Style mRendererTab Estilo - + Render type Tipo de renderizado - + Resampling Remostraxe - + Zoomed in Achegado - + Zoomed out Afastado @@ -35893,12 +37224,12 @@ p, li { white-space: pre-wrap; } <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif';"><br /></p></td></tr></table></body></html> - + Pipe Tubo - + Save Style ... Gardar estilo... @@ -36250,7 +37581,7 @@ p, li { white-space: pre-wrap; } Cumulative count cut - + Corte de conta acumulativa @@ -36376,32 +37707,32 @@ p, li { white-space: pre-wrap; } Unknown - Descoñecido + Descoñecido User defined - + Definido polo usuario Estimated - + Estimado Exact - Exacto + Exacto min / max - + mín /máx of - + de @@ -36506,77 +37837,77 @@ p, li { white-space: pre-wrap; } Engadir resultado ó proxecto - + Illumination Iluminación - + Azimuth (horizontal angle) Azimut (ángulo horizontal) - + Vertical angle Ángulo vertical - + Relief colors Cores de relevo - + Create automatically Crear automaticamente - + Export distribution... Exportar distribución... - + Up Arriba - + Down Abaixo - + + + - + - - - + Lower bound Límite máis baixo - + Upper bound Límite superior - + Color Cor - + Export colors... Exportar cores... - + Import colors... Importar cores... @@ -36671,7 +38002,7 @@ p, li { white-space: pre-wrap; } - + Filter Filtro @@ -36717,24 +38048,24 @@ p, li { white-space: pre-wrap; } Símbolo - + Error Erro - + Filter expression parsing error: Erro de procesamento da expresión do filtro: - + Evaluation error Erro de avaliación - + Filter returned %n feature(s) number of filtered features @@ -36888,109 +38219,149 @@ p, li { white-space: pre-wrap; } QgsRuleBasedRendererV2Model - + (no filter) (sen filtro) - + + <li><nobr>%1 features also in rule %2</nobr></li> + <li><nobr>%1 entidades tamén en norma %2</nobr></li> + + + Label Etiqueta - + Rule Norma - + Min. scale Mínimo da escala - + Max.scale Máximo da escala + + + Count + Contar + + + + Duplicate count + Duplicar conta + + + + Number of features in this rule. + Número de entidades nesta norma. + + + + Number of features in this rule which are also present in other rule(s). + Número de entidades nesta norma que tamén están presentes noutra(s) norma(s). + QgsRuleBasedRendererV2Widget - + Add Engadir - + Edit Editar - + Remove Eliminar - + Refine current rules Refinar normas actuais - + + Count features + Contar entidades + + + Rendering order... Orde de renderizado... - + Add scales to rule Engadir escalas á norma - + Add categories to rule Engadir categorías á norma - + Add ranges to rule Engadir rangos á norma - + Refine a rule to categories Refinar unha norma a categorías - + Refine a rule to ranges Refinar unha norma a rangos - - + + Scale refinement Refinamento da escala - + Parent rule %1 must have a symbol for this operation. A norma base %1 debe ter un símbolo para esta operación. - + Please enter scale denominators at which will split the rule, separate them by commas (e.g. 1000,5000): Introduza denominadores de escala nos cales a norma quebrará, separándoos por comas (por exemplo 1000,5000): - + Error Erro - + "%1" is not valid scale denominator, ignoring it. O "%1" non é un denominador de escala válido, ignorádoo. + + + Calculating feature count. + Calculando conta de entidades. + + + + Abort + Cancelar + QgsRunProcess @@ -37187,7 +38558,7 @@ p, li { white-space: pre-wrap; } QgsSVGFillSymbolLayerWidget - + Select svg texture file Seleccione ficheiro de textura svg @@ -37421,22 +38792,32 @@ O erro foi: QgsSingleBandGrayRendererWidget - + + Black to white + Negro a branco + + + + White to black + Branco a negro + + + No enhancement Sen melloras - + Stretch to MinMax Despregar a MínMáx - + Stretch and clip to MinMax Despregar e recortar ó MínMáx - + Clip to MinMax Recortar ó MínMáx @@ -37492,32 +38873,37 @@ O erro foi: Max Máx + + + Color gradient + Gradiente de cor + QgsSingleBandPseudoColorRendererWidget - - - + + + Discrete Discreto - - - - + + + + Linear Liñal - - + + Exact Exacto @@ -37533,33 +38919,33 @@ O erro foi: Personaliza-la entrada e cores do mapa - + Load Color Map Cargar Cor do Mapa - + The color map for band %1 failed to load Fallou a carga da cor do mapa para a banda %1 - + Open file Abrir arquivo - - + + Textfile (*.txt) Ficheiro de texto (*.txt) - + Import Error Erro de importación - + The following lines contained errors @@ -37568,12 +38954,12 @@ O erro foi: - + Read access denied Denegado o acceso de lectura - + Read access denied. Adjust the file permissions and try again. @@ -37582,22 +38968,22 @@ O erro foi: - + Save file Gardar ficheiro - + QGIS Generated Color Map Export File QGIS xenerou un ficheiro de exportación de cor de mapa - + Write access denied Denegado o acceso de escritura - + Write access denied. Adjust the file permissions and try again. @@ -37653,12 +39039,12 @@ O erro foi: Add values manually - Engadir valores manualmente + Engadir valores manualmente Remove selected row - + Eliminar a ringleira seleccionada @@ -37698,17 +39084,17 @@ O erro foi: Colors - Cores + Cores Min - Mín + Mín Max - Máx + Máx @@ -37718,12 +39104,17 @@ O erro foi: Min / max origin: - + Orixe mín / máx: Min / Max origin - + Orixe mín / máx + + + + Invert colors order + Invertir orde de cores Color ramp @@ -37982,7 +39373,7 @@ O erro foi: Enable snapping on intersection - + Permitir autoaxuste na intersección @@ -38026,24 +39417,24 @@ O erro foi: - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + SQLite error: %2 SQL: %1 Erro SQLite: %2 @@ -38059,19 +39450,19 @@ SQL: %1 - - - - - - - - - - - - - + + + + + + + + + + + + + SpatiaLite SpatiaLite @@ -38079,12 +39470,12 @@ SQL: %1 - - - - - - + + + + + + unknown cause Causa descoñecida @@ -38094,7 +39485,7 @@ SQL: %1 Erro SQLite adquirindo entidade: %1 - + FAILURE: Field %1 not found. FALLO: Campo %1 non atopado. @@ -39408,7 +40799,7 @@ As actualizacións dos valores de xeometría serán desactivadas, e a acción da Import style(s) - + Importar estilo(s) @@ -39423,7 +40814,7 @@ As actualizacións dos valores de xeometría serán desactivadas, e a acción da Export style(s) - + Exportar estilo(s) @@ -39715,106 +41106,106 @@ Overwrite? nova rampla aleatoria - + Color Ramp Name Nome da rampla de cor - + Please enter a name for new color ramp: Introduza un nome para a nova rampla de cor: - + Save Color Ramp Gardar rampla de cor - + Cannot save color ramp without name. Enter a name. Non se pode garda-la rampla de cor sen un nome. Introduza un nome. - + Save color ramp Gardar rampla de cor - + Color ramp with name '%1' already exists. Overwrite? A rampla de cor co nome '%1' xa existe. ¿Sobreescribir? - - + + Invalid Selection Selección inválida - + The parent group you have selected is not user editable. Kindly select a user defined group. O grupo matriz seleccionado non é editable polo usuario. Seleccione un grupo definido polo usuario. - + Operation Not Allowed Operación non permitida - + Creation of nested smart groups are not allowed Select the 'Smart Group' to create a new group. A creación de grupos intelixentes aniñados non está permitida Seleccione o 'Grupo Intelixente' para crear un novo grupo. - + Invalid selection Selección inválida - + Cannot delete system defined categories. Kindly select a group or smart group you might want to delete. Non pode elimina-las categorías definidas polo sistema. Seleccione un grupo ou grupo intelixente que queira eliminar. - + Error! ¡Erro! - + New group could not be created. There was a problem with your symbol database. O novo grupo non puido ser creado. Houbo un problema coa base de datos de símbolos. - + Database Error Erro de base de datos - + There was a problem with the Symbols database while regrouping. Houbo un problema coa base de datos de Símbolos cando se reagrupaban. - + You have not selected a Smart Group. Kindly select a Smart Group to edit. Non seleccionou ningún Grupo Intelixente. Seleccione un Grupo Intelixente a editar. - + Database Error! ¡Erro de base de datos! - + There was some error while editing the smart group. Houbo un erro mentras se editaba o grupo intelixente. @@ -39867,12 +41258,12 @@ Houbo un problema coa base de datos de símbolos. Rampla de cor - + Add item Engadir elemento - + Share Compartir @@ -39886,17 +41277,17 @@ Houbo un problema coa base de datos de símbolos. Engadir - + Edit item Editar elemento - + Edit Editar - + Remove item Eliminar elemento @@ -39913,15 +41304,66 @@ Houbo un problema coa base de datos de símbolos. Importar... + + QgsSvgAnnotationDialog + + + SVG annotation + Anotación SVG + + + + Delete + Eliminar + + + + Select SVG file + Seleccione ficheiro SVG + + + + SVG files + Ficheiros SVG + + + html + html + + + + QgsSvgCache + + + SVG request failed [error: %1 - url: %2] + + + + + + SVG + + + + + SVG request error [status: %1 - reason phrase: %2] + + + + + %1 of %2 bytes of svg image downloaded. + + + QgsSvgMarkerSymbolLayerV2Widget - + Select SVG file Seleccione ficheiro SVG - + SVG files Ficheiros SVG @@ -40181,19 +41623,18 @@ Houbo un problema coa base de datos de símbolos. QgsTextAnnotationDialog - + Delete Eliminar - + Select font color Seleccione cor da fonte - Select background color - Seleccione cor do fondo + Seleccione cor do fondo @@ -40214,9 +41655,8 @@ Houbo un problema coa base de datos de símbolos. I - Background color - Cor de fondo + Cor de fondo @@ -40843,18 +42283,38 @@ Should the existing classes be deleted before classification? QgsVectorGradientColorRampV2Dialog - - - - + + Discrete + Discreto + + + + Continous + + + + + Gradient file : %1 + + + + + License file : %1 + + + + + + + Offset of the stop Desprazamento da parada - - - - + + + + Please enter offset in percents (%) of the new stop Introduza desprazamentos en porcentaxes (%) da nova parada @@ -40883,32 +42343,46 @@ Should the existing classes be deleted before classification? Cor 2 - + + Type + Tipo + + + Multiple stops Múltiples paradas - + Add stop Engadir parada - + Remove stop Eliminar parada - + Color Cor - + + Offset (%) + + + + + Information + Información + + Offset - Desprazamento + Desprazamento - + Preview Vista previa @@ -40916,42 +42390,52 @@ Should the existing classes be deleted before classification? QgsVectorLayer - + + Updating feature count for layer %1 + Actualizando contador de entidade para a capa %1 + + + + Abort + Cancelar + + + Unknown renderer Renderizador descoñecido - + No renderer object Sen obxecto renderizado - + Classification field not found Campo de clasificación non atopado - + renderer failed to save O renderizador fallou ó gardar - + no renderer Sen renderizador - + ERROR: no provider ERRO: sen provedor - + ERROR: layer not editable ERRO: capa non editable - + SUCCESS: %n attribute(s) deleted. deleted attributes count @@ -40960,7 +42444,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n attribute(s) not deleted. not deleted attributes count @@ -40969,7 +42453,7 @@ Should the existing classes be deleted before classification? - + SUCCESS: %n attribute(s) added. added attributes count @@ -40978,7 +42462,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n new attribute(s) not added not added attributes count @@ -40987,17 +42471,17 @@ Should the existing classes be deleted before classification? - + SUCCESS: attribute %1 was added. LOGRO: atributo %1 foi engadido. - + ERROR: attribute %1 not added ERRO: atributo %1 non engadido - + SUCCESS: %n attribute value(s) changed. changed attribute values count @@ -41006,7 +42490,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n attribute value change(s) not applied. not changed attribute values count @@ -41015,7 +42499,7 @@ Should the existing classes be deleted before classification? - + SUCCESS: %n feature(s) added. added features count @@ -41024,7 +42508,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n feature(s) not added. not added features count @@ -41033,7 +42517,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n feature(s) not added - provider doesn't support adding features. not added features count @@ -41042,7 +42526,7 @@ Should the existing classes be deleted before classification? - + SUCCESS: %n geometries were changed. changed geometries count @@ -41051,7 +42535,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n geometries not changed. not changed geometries count @@ -41060,7 +42544,7 @@ Should the existing classes be deleted before classification? - + SUCCESS: %n feature(s) deleted. deleted features count @@ -41069,7 +42553,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n feature(s) not deleted. not deleted features count @@ -41078,123 +42562,123 @@ Should the existing classes be deleted before classification? - + Provider errors: Erros de provedor: - + Commit errors: %1 - Cometer erros: + Erros cometidos: %1 - + General: Xeral: - + Layer comment: %1 Comentario de capa: %1 - + Storage type of this layer: %1 Tipo de almacenamento desta capa: %1 - + Source for this layer: %1 Fote para esta capa: %1 - + Geometry type of the features in this layer: %1 Tipo de xeometrías das entidades desta capa: %1 - + The number of features in this layer: %1 O número de entidades nesta capa: %1 - + Editing capabilities of this layer: %1 Editar capacidades desta capa: %1 - + Extents: Extensións: - + In layer spatial reference system units : Unidades do sistema de referencia espacial na capa: - - + + xMin,yMin %1,%2 : xMax,yMax %3,%4 xMín,yMín %1,%2 : xMáx,yMáx %3,%4 - + unknown extent Extensión descoñecida - - + + In project spatial reference system units : Unidades do sistema de referencia espacial no proxecto: - + Layer Spatial Reference System: Sistema de Referencia Espacial da Capa: - + Project (Output) Spatial Reference System: Sistema de Referencia Espacial (de saída) do Proxecto: - + (Invalid transformation of layer extents) (Transformación inválida da extensión da capa) - + Attribute field info: Información do campo atributo: - + Field Campo - + Type Tipo - + Length Lonxitude - + Precision Precisión - + Comment Comentario @@ -41202,209 +42686,179 @@ Should the existing classes be deleted before classification? QgsVectorLayerProperties - Overlay - Solapar + Solapar - + Layer Properties - %1 Propiedades de capa - %1 - Id - Id + Id - Name - Nome + Nome - Type - Tipo + Tipo - Length - Lonxitude + Lonxitude - Precision - Precisión + Precisión - Comment - Comentario + Comentario - Edit widget - Editar widget + Editar widget - Alias - Alias + Alias - - + + Stop editing mode to enable this. Para modo edición para activar isto. - Name conflict - Conflito de nome + Conflito de nome - The attribute could not be inserted. The name already exists in the table. - O atributo no puido ser insertado. O nome xa existe na táboa. + O atributo no puido ser insertado. O nome xa existe na táboa. - Added attribute - Atributo engadido + Atributo engadido - Deleted attribute - Atributo eliminado + Atributo eliminado - + Transparency: %1% Transparencia: %1% - - + + Single Symbol Símbolo único - - + + Graduated Symbol Símbolo graduado - - + + Continuous Color Cor continua - - + + Unique Value Valores único - + Insert expression Inserte expresión - + This button opens the query builder and allows you to create a subset of features to display on the map canvas rather than displaying all features in the layer Este botón abre o creador de consultas e permítelle crear un subconxunto de entidades a amosar na vista do mapa mellor que amosar tódalas entidades na capa - + The query used to limit the features in the layer is shown here. To enter or modify the query, click on the Query Builder button A consulta utilizada para limita-las entidades na capa é amosada aquí. Para exexultar ou moficicar a consulta, clique no botón Constructor de Consultas - Line edit - Editar liña + Editar liña - Unique values - Valores únicos + Valores únicos - Unique values editable - Valores únicos etitables + Valores únicos etitables - Classification - Clasificación + Clasificación - Value map - Mapa de valores + Mapa de valores - Edit range - Editar rango + Editar rango - Slider range - Rango deslizante + Rango deslizante - Dial range - Marcar rango + Marcar rango - File name - Nome de ficheiro + Nome de ficheiro - Enumeration - Enumeración + Enumeración - Immutable - Inmutable + Inmutable - Hidden - Oculto + Oculto - Checkbox - caixa de verificación + caixa de verificación - Text edit - Editar texto + Editar texto - Calendar - Calendario + Calendario - Value relation - Relación de valores + Relación de valores - UUID generator - Xenerador de UUID + Xenerador de UUID Text diagram @@ -41419,54 +42873,53 @@ Should the existing classes be deleted before classification? Unidades do mapa - - + + Spatial Index Índice espacial - + Creation of spatial index successful A creación do índice espacial foi satisfactoria - + Creation of spatial index failed Fallou a creación do índice espacial - - + + Default Style Estilo por defecto - + Saved Style Estilo gardado - Select edit form - Seleccione forma a editar + Seleccione forma a editar - + Symbology Simboloxía - + Do you wish to use the new symbology implementation for this layer? ¿Desexa utiliza-la nova simboloxía para esta capa? - + Save Style Gardar estilo - + Save Style... Gardar estilo... @@ -41487,38 +42940,37 @@ Should the existing classes be deleted before classification? Arredor do punto - + Load layer properties from style file Cargar propiedades da capa dende ficheiro de estilo - - - + + + QGIS Layer Style File Ficheiro de estilo de capa de QGIS - - - + + + SLD File Ficheiro SLD - + Load Style Cargar estilo - + Save layer properties as style file Gardar propiedades de capa como ficheiro de estilo - UI file - Ficheiro UI + Ficheiro UI mm @@ -41624,51 +43076,67 @@ Should the existing classes be deleted before classification? Campos - New column - Nova columna + Nova columna - Ctrl+N - Ctrl+N + Ctrl+N - Delete column - Eliminar columna + Eliminar columna - Ctrl+X - Ctrl+X + Ctrl+X - Toggle editing mode - Activar/Desactivar modo edición + Activar/Desactivar modo edición - - Click to toggle table editing - Clique para activar/desactivar edición de táboa + Clique para activar/desactivar edición de táboa - Field calculator - Calculadora de campo + Calculadora de campo - + General Xeral - + Options Opcións + + Maximum scale (minimum scale denominator). + Escala máxima (denominador mínimo de escala). + + + Minimum scale: + Escala mínima: + + + Minimum scale denominator. + Denominador mínimo da escala. + + + Maximum scale: + Escala máxima: + + + Minimum scale (maximum scale denominator). + Escala mínima (denominador máximo de escala). + + + Set current + Fixar actual + Display name Mostrar nome @@ -41690,48 +43158,45 @@ Should the existing classes be deleted before classification? Utilice este control para establecer que campo é situado no nivel máis alto da caixa de diálogo de Identificar Resultados. - Edit UI - Editar UI + Editar UI - ... - ... + ... - + Create Spatial Index Crear índice espacial - - + + Specify the coordinate reference system of the layer's geometry. Especifique o sistema de referencia de coordenadas da xeometría da capa. - + Specify CRS Especifique SRC - + Update Extents Actualizar extensión - Init function - Función Init + Función Init - + CRS SRC - + Use scale dependent rendering Utilice renderizado dependendo da escala @@ -41744,47 +43209,47 @@ Should the existing classes be deleted before classification? Mínimo - + Subset Subconxunto - + Query Builder Constructor de Consultas - + Provider-specific options Opcións específicas do provedor - + Encoding Codificación - + Display Visualizar - + Legend display text Texto da lenda a visualizar - + Map Tip display text Texto dos consellos do mapa a visualizar - + Field Campo - + HTML HTML @@ -41794,82 +43259,118 @@ Should the existing classes be deleted before classification? Etiquetas (obsoleto) - Less than: - Menos que: + Menos que: - More than or equal to: - Máis que ou igual a: + Máis que ou igual a: + + + + + Minimum scale, i.e. maximum scale denominator. This limit is exclusive, that means the layer will not be displayed on this scale. + - + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Minimum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(exclusive)</p></body></html> + + + + + + Maximum scale, i.e. minimum scale denominator. This limit is inclusive, that means the layer will be displayed on this scale. + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Maximum scale</p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">(inclusive)</p></body></html> + + + + + + Current + Actual + + + Inserts an expression into the action Inserta unha expresión na acción - + Insert expression... Inserte expresión... - + The valid attribute names for this layer Nomes de atributo válidos para esta capa - + Inserts the selected field into the action Introduce o campo seleccionado na acción - + Insert field Introduza campo - + Metadata Metadatos - + Title Título - + Abstract Resumo - + Actions Accións - + Joins Unións - + Join layer Xuntar capa - + Join field Xuntar campo - + Target field Campo destino - + Diagrams Diagramas @@ -41981,32 +43482,31 @@ Should the existing classes be deleted before classification? QgsVectorLayerSaveAsDialog - SpatiaLite - SpatiaLite + SpatiaLite - + Layer CRS SRC da capa - + Project CRS SRC do Proxecto - + Selected CRS SRC seleccionado - + Save layer as... Gardar capa como... - + Select the coordinate reference system for the vector file. The data points will be transformed from the layer coordinate reference system. Seleccione o sistema de referencia de coordenadas para o ficheiro vectorial. Os puntos de datos serán transformados ó sistema de referencia de coordenadas da capa. @@ -42197,17 +43697,17 @@ Should the existing classes be deleted before classification? QgsWFSProvider - + unknown descoñecido - + received %1 bytes from %2 recibidos %1 bytes dende %2 - + Error Erro @@ -42915,62 +44415,57 @@ A resposta foi: QgsWcsProvider - + Cannot describe coverage Non se pode describi-la cobertura - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + WCS WCS - + Coverage not found Non se atopou a cobertura - + Cannot calculate extent Non se pode calcula-la extensión - + Cannot get test dataset. Non se pode obte-lo conxunto de datos de proba. - + Received coverage has wrong extent %1 (expected %2) - + A cobertura recibida ten unha extensión errónea%1 (agardada %2) - + Rotating raster Rotación de ráster - + Block read OK Lectura de bloque conforme @@ -42979,88 +44474,92 @@ A resposta foi: A cobertura recibida ten un tamaño erróneo - + Received coverage has wrong size %1 x %2 (expected %3 x %4) A cobertura recibida ten un tamaño erróneo %1 x %2 (agardado %3 x %4) - + Getting map via WCS. Adquirindo mapa vía WCS. - + Map request error (Status: %1; Reason phrase: %2; URL:%3) Erro de petición de mapa (Estado:%1, Frase de razón:%2, URL: %3) - - + Map request error (Title:%1; Error:%2; URL: %3) Erro de petición de mapa (Título:%1, Erro:%2, URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) Erro de petición de mapa (Estado: %1, Resposta: %2, URL: %3) - + + Map request error:<br>Title: %1<br>Error: %2<br>URL: <a href='%3'>%3</a>) + Erro de petición de mapa:<br>Título:%1<br> Erro:%2<br> URL: <a href='%3'>%3</a>) + + + Cannot find boundary in multipart content type Non se pode atopa-lo límite no tipo de contido multiparte - + Expected 2 parts, %1 received Agardadas 2 partes, %1 recibido - + More than 2 parts (%1) received Máis de 2 partes (%1) recibido - + Map request error (Response: %1; URL:%2) Erro de petición de mapa (Resposta: %1, URL: %2) - + Content-Transfer-Encoding %1 not supported Codificación do contido transferido %1 non soportado - + No data received Non se recibiu ningún dato - + Cannot create memory file Non se pode crear ficheiro de memoria - + Map request failed [error:%1 url:%2] Fallou a petición de mapa [erro:%1 url:%2] - + Not logging more than 100 request errors. Non rexistrar máis de 100 erros de petición. - + %1 of %2 bytes of map downloaded. %1 de %2 bytes de mapa descargados. - + Dom Exception Excepción Dom - + Could not get WCS Service Exception at %1: %2 at line %3 column %4 Response was: @@ -43073,133 +44572,133 @@ A resposta foi: %5 - + Request contains a format not offered by the server. A petición contén un formato non ofertado polo servidor. - + Request is for a Coverage not offered by the service instance. A petición é para unha Cobertura non ofrecida pola instancia de servicio. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. Valor (opcional) do parámetro UpdateSequence na petición GetCapabilities é igual ó actual valor do número de secuencia actualizada do servizo de metadatos. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. Valor (opcional) do parámetro UpdateSequence na petición GetCapabilities é maior que o actual valor do número de secuencia actualizada do servizo de metadatos. - + Request does not include a parameter value, and the server instance did not declare a default value for that dimension. A petición non inclúe un valor de parámetro, e a instancia do servidor non declarou un valor predeterminado para esa dimensión. - + Request contains an invalid parameter value. A petición contén un valor de parámetro inválido. - + No other exceptionCode specified by this service and server applies to this exception. Ningunha outra exceptionCode especificada por este servicio e servidor se aplica a esta excepción. - + Operation request contains an output CRS that can not be used within the output format. A petición de operación contén un SRC de saída que non pode ser utilizado dentro do formato de saída. - + Operation request specifies to "store" the result, but not enough storage is available to do this. A petición de operación require o "almacenamento" do resultado, pero non hai espazo abondo dispoñible para facer isto. - + (No error code was reported) (Ningún erro de código foi reportado) - + (Unknown error code) (Erro de código descoñecido) - + The WCS vendor also reported: O vendedor WCS tamén informou: - + composed error message '%1'. mensaxe de erro composto '%1'. - - + + Property Propiedade - - + + Value Valor - + Name (identifier) Nome (identificador) - - + + Title Título - - + + Abstract Resumo - + Fixed Width Ancho fixo - + Fixed Height Alto fixo - + Native CRS SRC nativo - + Native Bounding Box Caixa delimitadora nativa - + WGS 84 Bounding Box Caixa delimitadora WGS 84 - - + + Available in CRS Dispoñible no SRC - - + + (and %n more) crs @@ -43208,74 +44707,74 @@ A resposta foi: - - + + Available in format Dispoñible no formato - - + + Coverages Coberturas - + Cache Stats Estadísticas de caché - + Server Properties Propiedades do servidor - + Keywords Palabras clave - + Online Resource Recurso en liña - + Contact Person Persoa de Contacto - + Fees Taxas - + Access Constraints Restricións de acceso - + Image Formats Formatos de imaxe - + GetCapabilitiesUrl GetCapabilitiesUrl - + Get Coverage Url Obter Url de cobertura - + &nbsp;<font color="red">(advertised but ignored)</font> &nbsp;<font color="red">(avisado pero ignorado)</font> - + And %1 more coverages E %1 máis coberturas @@ -43291,7 +44790,7 @@ A resposta foi: QgsWmsProvider - + Getting map via WMS. Adquirindo mapa vía WMS. @@ -43300,8 +44799,8 @@ A resposta foi: Adquirindo mosaico vía WMs. - - + + %n tile requests in background tile request count @@ -43310,8 +44809,8 @@ A resposta foi: - - + + , %n cache hits tile cache hits @@ -43320,8 +44819,8 @@ A resposta foi: - - + + , %n cache misses. tile cache missed @@ -43330,8 +44829,8 @@ A resposta foi: - - + + , %n errors. errors @@ -43340,23 +44839,23 @@ A resposta foi: - + image is NULL NULA imaxe é NULL - + unexpected image size Tamaño de imaxe inesperado - + Tile request error Erro de solicitude de mosaico - + Status: %1 Reason phrase: %2 Estado: %1 @@ -43367,8 +44866,8 @@ Frase de razón: %2 resposta: %1 - - + + Returned image is flawed [%1] A imaxe retornada é defectuosa [%1] @@ -43381,51 +44880,51 @@ Frase de razón: %2 Resposta: %1 - + empty capabilities document documento de capacidades baleiro - + Tried URL: %1 URL probada: %1 - + Capabilities request redirected. Petición de capacidades redireccionada. - + empty of capabilities: %1 baleiro de capacidades: %1 - + Download of capabilities failed: %1 Fallou a descarga de capacidades: %1 - + %1 of %2 bytes of capabilities downloaded. %1 de %2 bytes de capacidades descargadas. - + %1 of %2 bytes of map downloaded. %1 de %2 bytes de mapa descargados. - - - + + + Dom Exception Excepción Dom - + Could not get WMS capabilities: %1 at line %2 column %3 This is probably due to an incorrect WMS Server URL. Response was: @@ -43438,7 +44937,7 @@ A resposta foi: %4 - + Could not get WMS capabilities in the expected format (DTD): no %1 or %2 found. This might be due to an incorrect WMS Server URL. Tag:%3 @@ -43451,7 +44950,7 @@ A resposta foi: %4 - + Could not get WMS Service Exception at %1: %2 at line %3 column %4 Response was: @@ -43464,82 +44963,82 @@ A resposta foi: %5 - + Request contains a format not offered by the server. A petición contén un formato non ofertado polo servidor. - + Request contains a CRS not offered by the server for one or more of the Layers in the request. A petición contén un SRC no ofertado polo servidor para unha ou máis das capas da peticion. - + Request contains a SRS not offered by the server for one or more of the Layers in the request. A petición contén un SRS no ofertado polo servidor para unha ou máis das capas da peticion. - + GetMap request is for a Layer not offered by the server, or GetFeatureInfo request is for a Layer not shown on the map. A petición GetMap é para unha capa non ofertada polo servidor, ou ben a petición GetFeatureInfo é para unha capa non amosada no mapa. - + Request is for a Layer in a Style not offered by the server. A petición é para unha capa nun Estilo non ofertado polo servidor. - + GetFeatureInfo request is applied to a Layer which is not declared queryable. A petición GetFeatureInfo é aplicada a unha capa que non está declarada consultable. - + GetFeatureInfo request contains invalid X or Y value. A petición GetFeatureInfo contén valor inválido X ou Y. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. Valor (opcional) do parámetro UpdateSequence na petición GetCapabilities é igual ó actual valor do número de secuencia actualizada do servizo de metadatos. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. Valor (opcional) do parámetro UpdateSequence na petición GetCapabilities é maior que o actual valor do número de secuencia actualizada do servizo de metadatos. - + Request does not include a sample dimension value, and the server did not declare a default value for that dimension. A petición non inclúe unha mostra de valor da dimensión, e o servidor non declara un valor por defecto para esa dimensión. - + Request contains an invalid sample dimension value. A petición contén unha mostra de valor da dimensión inválida. - + Request is for an optional operation that is not supported by the server. A petición é para unha operación opcional que non está soportada polo servidor. - + (No error code was reported) (Ningún erro de código foi reportado) - + (Unknown error code) (Erro de código descoñecido) - + The WMS vendor also reported: O vendedor WMS tamén informou: - + composed error message '%1'. mensaxe de erro composto '%1'. @@ -43552,109 +45051,109 @@ A resposta foi: sen extensión para capa - - - - + + + + Property Propiedade - - - - + + + + Value Valor - + Visibility Visibilidade - + Visible Visible - + Hidden Oculto - - - + + + Title Título - - - + + + Abstract Resumo - + Can Identify Poder Identificar - - - - + + + + Yes Si - - - - + + + + No Non - + Can be Transparent Pode ser transparente - + Can Zoom In Poder Achegar - + Cascade Count Contar en fervenza - + Fixed Width Ancho fixo - + Fixed Height Alto fixo - + WGS 84 Bounding Box Caixa delimitadora WGS 84 - - + + Available in CRS Dispoñible no SRC - + (and %n more) crs @@ -43663,73 +45162,73 @@ A resposta foi: - + Available in style Dispoñible no estilo - + Tile Layer Properties Propiedades da Capa de Mosaico - + Tile Layer Count Contador de capa de mosaico - + GetTileUrl GetTileUrl - + Tile templates Modelos de mosaico - + FeatureInfo templates Modelos FeatureInfo - + WMTS WMTS - + WMS-C WMS-C - + Available Styles Estilos dispoñibles - + Available Tilesets Mosaicos dispoñibles - + Map getfeatureinfo error %1: %2 Erro de mapa getfeatureinfo %1: %2 - + ERROR: GetFeatureInfo failed ERRO: fallou GetFeatureInfo - + Map getfeatureinfo error: %1 [%2] Erro de mapa getfeatureinfo: %1 [%2] - - + + Name Nome @@ -43738,147 +45237,182 @@ A resposta foi: o número de capas e estilos non cadra - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + WMS WMS - - + + Server Properties Propiedades do servidor - - + + Selected Layers Capas seleccionadas - - + + Other Layers Outras capas - + Tileset Properties Propiedades do mosaico - + Cache Stats Estadísticas de caché - + + Cannot parse URI + Non se pode analiza-la URI + + + + Cannot calculate extent + Non se pode calcula-la extensión + + + + Cannot set CRS + Non se pode fixa-lo SRC + + + Number of layers and styles don't match O número de capas e de estilos non cadra - + + Number of tile layers must be one + O número de capas de mosaico debe ser único + + + + Tile layer not found + Capa de mosaico non atopada + + + + Tile layer or tile matrix set not found + Non atopados capa de mosaico nin conxunto de grella de mosaicos + + + Getting tiles. Adquirindo mosaico. - + Tile request error (Title:%1; Error:%2; URL: %3) Erro de petición de mosaico (Título:%1, Erro:%2, URL: %3) - + Tile request error (Status:%1; Content-Type:%2; Length:%3; URL: %4) Erro de petición de mosaico (Estado:%1, Contido-Tipo:%2, Lonxitude:%3, URL: %4) - + Tile request failed [error:%1 url:%2] Erro de petición de mosaico [erro:%1, url:%2] - - + + Not logging more than 100 request errors. Non rexistrar máis de 100 erros de petición. - + Map request error (Status: %1; Reason phrase: %2; URL:%3) Erro de petición de mapa (Estado:%1, Frase de razón:%2, URL: %3) - + Map request error (Title:%1; Error:%2; URL: %3) Erro de petición de mapa (Título:%1, Erro:%2, URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) Erro de petición de mapa (Estado: %1, Resposta: %2, URL: %3) - + Map request failed [error:%1 url:%2] Fallou a petición de mapa [erro:%1 url:%2] - + + Extent for layer %1 not found in capabilities + Extensión para a capa %1 non atopada nas capacidades + + + WMS Version Versión WMS - + Keywords Palabras clave - + Online Resource Recurso en liña - + Contact Person Persoa de Contacto - + Fees Taxas - + Access Constraints Restricións de acceso - + Image Formats Formatos de imaxe - + Identify Formats Identificar formatos - + Layer Count Contador de capa @@ -43887,28 +45421,28 @@ A resposta foi: Contador de mosaico - + GetCapabilitiesUrl GetCapabilitiesUrl - + GetMapUrl GetMapUrl - - + + &nbsp;<font color="red">(advertised but ignored)</font> &nbsp;<font color="red">(avisado pero ignorado)</font> - + GetFeatureInfoUrl GetFeatureInfoUrl - + Selected Seleccionado @@ -43917,12 +45451,12 @@ A resposta foi: Estilos - + CRS SRC - + Bounding Box Caixa delimitadora @@ -43931,37 +45465,35 @@ A resposta foi: Dispoñible en Resolucións - + Cache stats Estadísticas de caché - + Hits Acertosf - + Misses Perdas - + Errors Erros - Layer cannot be queried in plain text. - A capa non pode ser consultada en texto plano. + A capa non pode ser consultada en texto plano. - Layer cannot be queried. - A capa non pode ser consultada. + A capa non pode ser consultada. - + identify request redirected. pedido de identificación redireccionado. @@ -44320,35 +45852,47 @@ A resposta foi: SEXTANTE Analysis - Análise + Análise &SEXTANTE Toolbox - + Caixa de ferramentas &SEXTANTE &SEXTANTE Modeler - + Modelador &SEXTANTE &SEXTANTE History and log - + Historial e incidencias &SEXTANTE + + + &SEXTANTE toolbox + Caixa de ferramentas &SEXTANTE + + + &SEXTANTE modeler + Modelizador &SEXTANTE + + + &SEXTANTE history and log + Historial e incidencias &SEXTANTE &SEXTANTE options and configuration - + Opcións e configuración &SEXTANTE &SEXTANTE results viewer - + Visor de resultados &SEXTANTE &SEXTANTE help - + Axuda &SEXTANTE &About SEXTANTE - + Acerca de &SEXTANTE @@ -44824,36 +46368,65 @@ Descrición: %3 Listo + + SettingsDialog + + + Font + Fonte + + + + Size + Tamaño + + + + API file + Ficheiro API + + + + Browse + Buscar + + + + Use preloaded API file + Utilizar ficheiro API precargado + + SextanteToolbox SEXTANTE Toolbox - + Caixa de ferramentas SEXTANTE Click here to configure additional algorithm providers - + Clique aquí para configurar +provedores de algoritmos adicionais Execute - + Excutar Execute as batch process - + Executar como proceso de lotes Edit rendering styles for outputs - + Editar estilos de renderizado para saídas Warning - + Advertencia Recently used algorithms - + Algoritmos utilizados recentemente @@ -45026,10 +46599,35 @@ additional algorithm providers Please specify input field Especifique campo de entrada + + Please specify output shapefile + + Cancel Cancelar + + Geometry + Xeometría + + + Created output shapefile: +%1 +%2 + +Would you like to add the new layer to the TOC? + Creado shapefile de saída: +%1 +%2 + +¿Quere engadir a nova capa á caixa de contidos? + + + Error loading output shapefile: +%1 + + Feature Entidade @@ -46701,6 +48299,10 @@ O plugin non será activado. Difference Diferencia + + Eliminate sliver polygons + Eliminar polígonos esgazados + G&eometry Tools Ferramentas de X&eometría diff --git a/i18n/qgis_it.ts b/i18n/qgis_it.ts index 52fb096600c4..01121bbac939 100644 --- a/i18n/qgis_it.ts +++ b/i18n/qgis_it.ts @@ -830,6 +830,11 @@ sono stati ridotti a %2 dopo la semplificazione Press Ctrl+C to copy results to the clipboard Premi Ctrl+C per copiare i risultati negli appunti + + + Save errors location + Salva posizione errori + Sum line lengths Somma lunghezza linee @@ -4299,17 +4304,17 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Form - + Modulo Symbol layer type - Tipo layer del simbolo + Tipo layer del simbolo This layer doesn't have any editable properties - + Questo layer non ha proprietà modificabili @@ -5036,7 +5041,7 @@ Ctl (Cmd) increments by 15 deg. Add WCS Layer... - + Aggiungi layer WCS... @@ -5336,7 +5341,7 @@ Acts on currently active editable layer Check if your QGIS version is up to date (requires internet access) - Controlla se la versione di QGIS in uso è aggiornata (è necessario il collegamento internet) + Controlla se la versione di QGIS in uso è aggiornata (richiede il collegamento internet) @@ -6494,12 +6499,12 @@ la cronologia dei comandi ? meters - metri + metri feet - piedi + piedi @@ -6507,12 +6512,12 @@ la cronologia dei comandi ? degrees - gradi + gradi <unknown> - + <sconosciuto> @@ -7577,7 +7582,7 @@ Errore(%2): %3 Imported from GDAL - + Importato da GDAL @@ -8893,7 +8898,7 @@ Stai vedendo questo messaggio perché probabilmente non hai settato la variabile Building pyramids failed - write access denied - + Errore nella creazione delle piramidi - scrittura non consentita @@ -9809,7 +9814,7 @@ Ignora sempre questi errori? Security warning: - + Avviso di sicurezza: @@ -9819,7 +9824,7 @@ Ignora sempre questi errori? Enable - + Abilita @@ -9877,7 +9882,7 @@ Ignora sempre questi errori? Vector - Vettore + Vettore @@ -9917,7 +9922,7 @@ Ignora sempre questi errori? WCS - + WCS @@ -9959,7 +9964,7 @@ Ignora sempre questi errori? Layer labeling settings - Impostazione etichettatura vettore + Impostazioni etichettatura vettore @@ -11245,7 +11250,7 @@ L'errore è: %2 No filter - + Nessun filtro @@ -11372,7 +11377,7 @@ Questo è il widget predefinito per le operazioni di modifica. Allow multiple selections - + Consenti selezioni multiple @@ -11768,12 +11773,12 @@ Database:%2 Add a directory - + Aggiungi cartella Add directory to favourites - + Aggiungi la cartella ai preferiti @@ -12095,12 +12100,12 @@ Should the existing classes be deleted before classification? Panels - Pannelli + Pannelli Toolbars - Barre degli strumenti + Barre degli strumenti @@ -12154,7 +12159,7 @@ Should the existing classes be deleted before classification? <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the - + <p>La funziona di esportazione SVG in QGIS ha diversi problemi causati da bug e limitazioni nel @@ -12630,7 +12635,7 @@ Should the existing classes be deleted before classification? Add html - + Aggiungi html @@ -12713,7 +12718,7 @@ Should the existing classes be deleted before classification? General options - Opzioni generali + Opzioni generali @@ -12736,22 +12741,22 @@ Should the existing classes be deleted before classification? Form - + Modulo HTML - + HTML ... - ... + ... URL - URL + URL @@ -12891,7 +12896,7 @@ Should the existing classes be deleted before classification? Label rotation changed - + Rotazione dell'etichetta modificata @@ -12909,7 +12914,7 @@ Should the existing classes be deleted before classification? Rotation - Rotazione + Rotazione @@ -13582,7 +13587,7 @@ Should the existing classes be deleted before classification? Change... - Cambia ... + Cambia ... @@ -13892,12 +13897,12 @@ Should the existing classes be deleted before classification? km - + km m - + m @@ -13962,17 +13967,17 @@ Should the existing classes be deleted before classification? Map units - Unità mappa + Unità mappa Meters - Metri + Metri Feet - Piedi + Piedi @@ -14054,7 +14059,7 @@ Should the existing classes be deleted before classification? Scalebar unit changed - + Unità della barra di scala modificata @@ -14091,12 +14096,12 @@ Should the existing classes be deleted before classification? Segment size - + Dimensione del segmento Units - Unità + Unità @@ -14475,7 +14480,7 @@ Should the existing classes be deleted before classification? Html item added - + Elemento html aggiunto @@ -14488,7 +14493,7 @@ Should the existing classes be deleted before classification? Item moved - + Elemento spostato @@ -14890,7 +14895,7 @@ Should the existing classes be deleted before classification? Number of pages - + Numero di pagine @@ -15154,12 +15159,12 @@ Errore: %5 Name - Nome + Nome Info - Informazioni + Informazioni @@ -15167,12 +15172,12 @@ Errore: %5 colors - + colori continuous - + colore continuo @@ -15251,37 +15256,37 @@ and current file is [%3] License - + Licenza Palette - Tavolozza + Tavolozza Path - Percorso + Percorso Information - Informazioni + Informazioni Author(s) - + Autore/i Source - Sorgente + Sorgente Details - + Dettagli @@ -15814,22 +15819,22 @@ p, li { white-space: pre-wrap; } Error - Errore + Errore No active layer - + Nessun layer attivo Please select a raster layer - Scegli un raster + Scegli un raster Invalid raster layer - + Layer raster non valido @@ -15842,7 +15847,7 @@ p, li { white-space: pre-wrap; } Dialog - + Finestra di dialogo @@ -15852,12 +15857,12 @@ p, li { white-space: pre-wrap; } Interval X - Intervallo X + Intervallo X Interval Y - Intervallo Y + Intervallo Y @@ -15872,27 +15877,27 @@ p, li { white-space: pre-wrap; } Draw annotation - Scrivi le coordinate + Scrivi le coordinate Annotation direction - Direzione delle coordinate + Direzione delle coordinate Font... - Carattere... + Carattere... Distance to map frame - Distanza dal bordo della mappa + Distanza dal bordo della mappa Coordinate precision - Precisione delle coordinate + Precisione delle coordinate @@ -15902,12 +15907,12 @@ p, li { white-space: pre-wrap; } Offset X - Offset X + Offset X Offset Y - Offset Y + Offset Y @@ -15917,51 +15922,51 @@ p, li { white-space: pre-wrap; } Canvas Extents - + Estensione della mappa Active Raster Layer - + Raster attivo Line - Linea + Linea Marker - Indicatore + Indicatore Horizontal - Orizzontale + Orizzontale Vertical - Verticale + Verticale Horizontal and vertical - + Boundary direction - Direzione del confine + Direzione del confine Horizontal and Vertical - Orizzontale e verticale + Orizzontale e verticale @@ -16286,7 +16291,7 @@ p, li { white-space: pre-wrap; } Delimited Text - + Testo delimitato @@ -16488,7 +16493,8 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Note: the following lines were not loaded because QGIS was unable to determine values for the x and y coordinates: - + Nota: le seguenti linee non sono state caricate in quanto QGIS non è in grado di interpretare il valore delle coordinate x e y: + @@ -16496,32 +16502,32 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. No layer name - Layer senza nome + Layer senza nome Please enter a layer name before adding the layer to the map - Assegnare un nome al layer prima di aggiungerlo alla mappa + Assegnare un nome al layer prima di aggiungerlo alla mappa Choose a delimited text file to open - Scegli un file di testo delimitato da aprire + Scegli un file di testo delimitato da aprire Text files - File di testo + File di testo Well Known Text files - File Well Known Text + File Well Known Text All files - Tutti i file + Tutti i file @@ -16529,182 +16535,181 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Create a Layer from a Delimited Text File - Crea un vettore da un file di testo delimitato + Crea un vettore da un file di testo delimitato File Name - Nome file + Nome file Full path to the delimited text file - Percorso completo del file di testo delimitato + Percorso completo del file di testo delimitato Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file. - Percorso completo del file di testo delimitato. Per definire i campi del file da analizzare occorre prima dichiarare il delimitatore e successivamente caricare i file. -Per selezionare il file da caricare utilizzare il bottone Sfoglia. + Percorso completo del file di testo delimitato. Per definire i campi del file da analizzare occorre prima dichiarare il delimitatore e successivamente caricare i file. Per selezionare il file da caricare utilizzare il bottone Sfoglia. Layer name - + Nome layer Name to display in the map legend - Nome da utilizzare nella legenda + Nome da utilizzare nella legenda Name displayed in the map legend - Nome visualizzato nella legenda + Nome visualizzato nella legenda Browse to find the delimited text file to be processed - Sfoglia il file system per trovare il file di testo delimitato da analizzare + Sfoglia il file system per trovare il file di testo delimitato da analizzare Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the <i>Delimiter</i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file. - Usa questo bottone per sfogliare il file system al fine di individuare il file di testo delimitato da caricare. Questo bottone non sarà abilitato fino a questo non verrà definito il carattere del delimitatore nell'input area <i>Delimitatore</i>. Una volta selezionato il file, scegli i campi X e Y dai relativi menu a tendina popolati dalla lettura del file di testo delimitato. + Usa questo bottone per sfogliare il file system al fine di individuare il file di testo delimitato da caricare. Questo bottone non sarà abilitato fino a questo non verrà definito il carattere del delimitatore nell'input area <i>Delimitatore</i>. Una volta selezionato il file, scegli i campi X e Y dai relativi menu a tendina popolati dalla lettura del file di testo delimitato. Browse... - Sfoglia... + Sfoglia... Selected delimiters - Delimitatori selezionati + Delimitatori selezionati The delimiter is a regular expression - Il delimitatore è una espressione regolare + Il delimitatore è una espressione regolare Regular expression - Espressione regolare + Espressione regolare The delimiter is taken as is - Il delimitatore viene letto come è + Il delimitatore viene letto come è Plain characters - Carattere semplice + Carattere semplice Tab - Tab + Tab Space - Spazio + Spazio Comma - Virgola + Virgola Semicolon - Punto e virgola + Punto e virgola Colon - Due punti + Due punti Delimiter to use when splitting fields in the text file. The delimiter can be more than one character. - Delimitatore utilizzato per dividere in campi il file di testo. Il delimitatore può essere di 1 o più caratteri. + Delimitatore utilizzato per dividere in campi il file di testo. Il delimitatore può essere di 1 o più caratteri. Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length. - Delimitatore utilizzato per dividere in campi il file di testo. Il delimitatore può essere di 1 o più caratteri. + Delimitatore utilizzato per dividere in campi il file di testo. Il delimitatore può essere di 1 o più caratteri. Start import at row - Inizia l'importazione dalla riga + Inizia l'importazione dalla riga The file contains X and Y coordinate columns - Il file contiene colonne con coordinate X e Y + Il file contiene colonne con coordinate X e Y X Y fields - Campi X Y + Campi X Y <p align="right">X field</p> - <p align="right">Campo X</p> + <p align="right">Campo X</p> Name of the field containing x values - Nome del campo che contiene i valori di X + Nome del campo che contiene i valori di X Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. - Nome del campo che contiene i valori di X. Scegli un campo dalla lista. La lista è generata dall'analisi della riga di intestazione del file contenente del testo delimitato. + Nome del campo che contiene i valori di X. Scegli un campo dalla lista. La lista è generata dall'analisi della riga di intestazione del file contenente del testo delimitato. <p align="right">Y field</p> - <p align="right">Campo Y</p> + <p align="right">Campo Y</p> Name of the field containing y values - Nome del campo che contiene i valori di Y + Nome del campo che contiene i valori di Y Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. - Nome del campo che contiene i valori di Y. Scegli un campo dalla lista. La lista è generata dall'analisi della riga di intestazione del file contenente il testo delimitato. + Nome del campo che contiene i valori di Y. Scegli un campo dalla lista. La lista è generata dall'analisi della riga di intestazione del file contenente il testo delimitato. The file contains a well known text geometry field - Il file contiene un campo geometrico well know text (WKT) + Il file contiene un campo geometrico well know text (WKT) WKT field - Campo WKT + Campo WKT Decimal point - Indicatore decimale + Indicatore decimale Sample text - Testo di esempio + Testo di esempio @@ -16795,77 +16800,77 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. mm - mm + mm Map units - Unità mappa + Unità mappa Around Point - + Intorno al punto Over Point - + Sopra il punto Line - Linea + Linea Horizontal - Orizzontale + Orizzontale Free - Libero + Libero On line - Sulla linea + Sulla linea Above line - Sopra la linea + Sopra la linea Below Line - Sotto la linea + Sotto la linea Map orientation - Oreintazione della mappa + Orientazione della mappa Pie chart - Grafico a torta + Grafico a torta Text diagram - Diagramma testo + Diagramma testo Histogram - Istogramma + Istogramma Height - Altezza + Altezza @@ -16876,23 +16881,23 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Area - Area + Area Diameter - + Diametro None - Nessuno + Nessuno Unknown diagram type. - + Tipo di diagramma sconosciuto. @@ -16902,17 +16907,17 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Transparency: %1% - Trasparenza: %1% + Trasparenza: %1% Background color - Colore di sfondo + Colore di sfondo Pen color - Colore del tratto + Colore del tratto @@ -16940,52 +16945,52 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Display diagrams - Visualizza diagrammi + Visualizza diagrammi Diagram type - Tipo di diagramma + Tipo di diagramma Priority: - Priorità: + Priorità: Low - Bassa + Bassa High - Alta + Alta Appearance - Aspetto + Aspetto Background color - Colore di sfondo + Colore di sfondo Line color - Colore della linea + Colore della linea Line width - + Spessore linea Font... - Carattere... + Carattere... @@ -17010,54 +17015,54 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Scale dependent visibility - Visibilità dipendente dalla scala + Visibilità dipendente dalla scala Minimum - Minimo + Minimo Maximum - Massimo + Massimo Size - Dimensione + Dimensione Fixed size - Dimensione fissa + Dimensione fissa Size units - Unità della dimensione + Unità della dimensione Scale linearly between 0 and the following attribute value / diagram size: - Scala linearmente tra 0 ed il seguente valore attributo / dimensione diagramma: + Scala linearmente tra 0 ed il seguente valore attributo / dimensione diagramma: Attribute - Attributo + Attributo Find maximum value - Trova valore massimo + Trova valore massimo Scale - Scala + Scala @@ -17072,42 +17077,42 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Minimum size - + Dimensione minima Position - Posizione + Posizione Placement - + Posizionamento Line Options - Opzioni linea + Opzioni linea Distance - Distanza + Distanza Data defined position - Posizione definita da attributo + Posizione definita da attributo x - x + x y - y + y @@ -17117,7 +17122,7 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Options - Opzioni + Opzioni @@ -17132,27 +17137,27 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Up - Su + Su Down - Giù + Giù Right - Destra + Destra Left - Sinistra + Sinistra Attributes - Attributi + Attributi @@ -17172,7 +17177,7 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Color - Colore + Colore @@ -17462,7 +17467,7 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Search - Cerca + Cerca @@ -17549,12 +17554,12 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Load all unique values - Carica tutti i valori univoci + Carica tutti i valori univoci Load 10 sample values - + Carica 10 valori di esempio @@ -17641,7 +17646,7 @@ Per selezionare il file da caricare utilizzare il bottone Sfoglia. Not available for layer - + Non disponibile per il layer @@ -18970,12 +18975,12 @@ Scegli un file valido. Gauss - + Gauss Cubic - Cubico + Cubico @@ -18985,7 +18990,7 @@ Scegli un file valido. None - Nessuno + Nessuno out of extent @@ -19469,7 +19474,7 @@ p, li { white-space: pre-wrap; } None - Nessuno + Nessuno @@ -19807,12 +19812,12 @@ p, li { white-space: pre-wrap; } Local histogram stretch - + Stiramento locale dell'istogramma Full histogram stretch - Stiramento completo dell'istogramma + Stiramento completo dell'istogramma @@ -22963,12 +22968,12 @@ alla linea %2 colonna %3 Delete - Elimina + Elimina html - + html @@ -23128,7 +23133,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Could not open url - + Impossibile aprire l'URL @@ -23769,22 +23774,22 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Display - Visualizza + Visualizza Show label - + Mostra etichetta Max - + Max Min - + Min @@ -23903,7 +23908,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Expression - Espressione + Espressione @@ -23913,7 +23918,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Sample text - Testo di esempio + Testo di esempio @@ -23959,7 +23964,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Alignment - Allineamento + Allineamento @@ -23970,18 +23975,18 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Left - Sinistra + Sinistra Center - Centro + Centro Right - Destra + Destra @@ -23996,7 +24001,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve U - + U @@ -24006,37 +24011,37 @@ Può essere o un problema della propria connessione di rete o sul lato del serve S - S + S points - + punti map units - unità mappa + unità mappa Style - Stile + Stile Transparency - Trasparenza + Trasparenza % - + % @@ -24070,7 +24075,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve mm - mm + mm @@ -24401,17 +24406,17 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Parallel - + Parallelo Curved - + Curvato Horizontal - Orizzontale + Orizzontale @@ -24421,12 +24426,12 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Around centroid - + Attorno al centroide Horizontal (slow) - + Orizzontale (lento) @@ -24436,7 +24441,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Using perimeter - + Utilizzando il perimetro @@ -24456,12 +24461,12 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Above line - Sopra la linea + Sopra la linea On line - Sulla linea + Sulla linea @@ -24481,37 +24486,37 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Above Right - In alto a destra + In alto a destra Above Left - In alto a sinistra + In alto a sinistra Over - Sovrapposto + Sovrapposto Above - Sopra + Sopra Below Left - In basso a sinistra + In basso a sinistra Below - Sotto + Sotto Below Right - In basso a destra + In basso a destra @@ -24604,7 +24609,7 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Outline: %1 - Cornice: %1 + Cornice: %1 @@ -25012,12 +25017,12 @@ Può essere o un problema della propria connessione di rete o sul lato del serve X / East: - + X / Est: Y / North: - + Y / Nord: X: @@ -25753,12 +25758,12 @@ Può essere o un problema della propria connessione di rete o sul lato del serve Label hidden - + Etichetta nascosta Label shown - + Etichetta mostrata @@ -26330,7 +26335,7 @@ http://mio.server.it/cgi-bin/mapserver.exe Close - Chiudi + Chiudi @@ -26913,7 +26918,7 @@ http://mio.server.it/cgi-bin/mapserver.exe Not set - Non impostato + Non impostato @@ -26938,17 +26943,17 @@ http://mio.server.it/cgi-bin/mapserver.exe Red - Rosso + Rosso Green - Verde + Verde Blue - Blu + Blu @@ -26956,37 +26961,37 @@ http://mio.server.it/cgi-bin/mapserver.exe Form - + Modulo Red band - Banda rosso + Banda rosso Green band - Banda verde + Banda verde Blue band - Banda blu + Banda blu Min - Min + Min Max - Max + Max Contrast enhancement - Miglioramento contrasto + Miglioramento contrasto @@ -26999,7 +27004,7 @@ http://mio.server.it/cgi-bin/mapserver.exe Network - Rete + Rete @@ -27032,7 +27037,7 @@ http://mio.server.it/cgi-bin/mapserver.exe Saving passwords - Salva password + Salva password @@ -27086,7 +27091,7 @@ Note: giving the password is optional. It will be requested interactivly, when n Invert axis orientation - + Inverti l'orientazione degli assi @@ -27638,7 +27643,7 @@ Ulteriori informazioni sull'errore: WMS Password for %1 - Password WMS per %1 + Password WMS per %1 @@ -27646,12 +27651,12 @@ Ulteriori informazioni sull'errore: Edit... - Modifica... + Modifica... Delete - Elimina + Elimina @@ -27659,12 +27664,12 @@ Ulteriori informazioni sull'errore: &Add - &Aggiungi + &Aggiungi Add selected layers to map - Aggiungi i layer selezionati alla mappa + Aggiungi i layer selezionati alla mappa @@ -27709,23 +27714,23 @@ Ulteriori informazioni sull'errore: Confirm Delete - Conferma eliminazione + Conferma eliminazione Load connections - Carica connessioni + Carica connessioni XML files (*.xml *XML) - File XML (*.xml *.XML) + File XML (*.xml *.XML) Coordinate Reference System (%n available) crs count - + Sistema di Riferimento (%n disponbile) Sistemi di Riferimento (%n disponbili) @@ -27739,32 +27744,32 @@ Ulteriori informazioni sull'errore: WMS proxies - proxy WMS + Proxy WMS Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. - Vari server WMS sono stati aggiunti alla lista dei server. Nota: se si accede ad internet attraverso un proxy, si deve impostare il proxy nelle opzioni di QGIS. + Vari server WMS sono stati aggiunti alla lista dei server. Nota: se si accede ad internet attraverso un proxy, si deve impostare il proxy nelle opzioni di QGIS. parse error at row %1, column %2: %3 - errore di analisi alla riga %1, colonna %2: %3 + errore di analisi alla riga %1, colonna %2: %3 network error: %1 - errore di rete: %1 + errore di rete: %1 The %1 connection already exists. Do you want to overwrite it? - La connessione %1 è già presente. Vuoi sovrascriverla? + La connessione %1 è già presente. Vuoi sovrascriverla? Confirm Overwrite - Conferma sovrascrittura + Conferma sovrascrittura @@ -27772,94 +27777,94 @@ Ulteriori informazioni sull'errore: Add Layer(s) from a Server - Aggiungi layer dal server + Aggiungi layer dal server Ready - Pronto + Pronto Layers - Layer + Layer C&onnect - C&onnetti + C&onnetti &New - &Nuovo + &Nuovo Edit - Modifica + Modifica Delete - Elimina + Elimina Load connections from file - Carica le connessioni dal file + Carica le connessioni dal file Load - Carica + Carica Save connections to file - + Salva le connessioni su file Save - Salva + Salva Adds a few example WMS servers - Aggiungere alcuni server WMS di esempio + Aggiungere alcuni server WMS di esempio Add default servers - Aggiungere server predefiniti + Aggiungere server predefiniti ID - ID + ID Name - Nome + Nome Title - Titolo + Titolo Abstract - Riassunto + Riassunto Time - Tempo + Tempo @@ -27870,38 +27875,38 @@ Ulteriori informazioni sull'errore: Change ... - Cambia ... + Cambia ... Format - Formato + Formato Options - Opzioni + Opzioni Layer name - + Nome layer Tile size - Dimensione tile + Dimensione tile Feature limit for GetFeatureInfo - Limite di elementi per GetFeatureInfo + Limite di elementi per GetFeatureInfo Cache - Cache + Cache @@ -27920,82 +27925,82 @@ Always network: always load from network and do not check if the cache has a val Layer Order - Ordine layer + Ordine layer Move selected layer UP - Spostare in alto il layer selezionato + Spostare in alto il layer selezionato Up - Su + Su Move selected layer DOWN - Spostare in basso il layer selezionato + Spostare in basso il layer selezionato Down - Giù + Giù Layer - + Layer Style - Stile + Stile Tilesets - Set di tile + Set di tile Styles - Stili + Stili Size - Dimensione + Dimensione CRS - + SR Server Search - Cerca Server + Cerca Server Search - Cerca + Cerca Description - Descrizione + Descrizione URL - URL + URL Add selected row to WMS list - Aggiungi riga alla lista WMS + Aggiungi riga alla lista WMS @@ -28257,7 +28262,7 @@ Always network: always load from network and do not check if the cache has a val Unknown - + Sconosciuto @@ -28671,7 +28676,7 @@ Always network: always load from network and do not check if the cache has a val Scale denominator - + Denominatore della scala @@ -28723,12 +28728,12 @@ Always network: always load from network and do not check if the cache has a val Minimum / maximum - + Minimo / massimo Mean +/- standard deviation - + Media +/- deviazione standard @@ -28835,7 +28840,7 @@ Always network: always load from network and do not check if the cache has a val Parameters: - + Parametri: @@ -29115,7 +29120,7 @@ Always network: always load from network and do not check if the cache has a val Open identify results in a dock window (QGIS restart required) - Apri i risultati di una interrogazione in una finestra agganciata (è necessario riavviare QGIS) + Apri i risultati di una interrogazione in una finestra agganciata (richiede il riavvio di QGIS) @@ -29140,7 +29145,7 @@ Always network: always load from network and do not check if the cache has a val Copy geometry in WKT representation from attribute table - Compa la geometria in formato WKT dalla tabella delgi attributi + Copia la geometria in formato WKT dalla tabella degli attributi @@ -29512,22 +29517,22 @@ Always network: always load from network and do not check if the cache has a val Browse - Sfoglia + Sfoglia Reset - Ripristina + Ripristina Enable macros - + Abilita macro Never - Mai + Mai @@ -29547,7 +29552,7 @@ Always network: always load from network and do not check if the cache has a val Font - Carattere + Carattere @@ -29562,7 +29567,7 @@ Always network: always load from network and do not check if the cache has a val Name - Nome + Nome @@ -29577,7 +29582,7 @@ Always network: always load from network and do not check if the cache has a val Description - Descrizione + Descrizione @@ -29602,7 +29607,7 @@ Always network: always load from network and do not check if the cache has a val Single band gray - Banda singola grigia + Banda singola grigia @@ -29627,7 +29632,7 @@ Always network: always load from network and do not check if the cache has a val - - - + - @@ -29952,22 +29957,22 @@ Always network: always load from network and do not check if the cache has a val Form - + Band - Banda + Banda Value - Valore + Valore Color - Colore + Colore @@ -32180,7 +32185,7 @@ Procedere? Transparency %1% - Trasparenza %1% + Trasparenza %1% @@ -32274,47 +32279,47 @@ Procedere? ... - ... + ... Default Styles - + Stili predefiniti Default Symbols - + Simboli predefiniti Marker - Indicatore + Indicatore Line - Linea + Linea Fill - Riempimento + Riempimento Color Ramp - Scala di colori + Scala di colori Style Manager - Gestore stile + Gestore stile Options - Opzioni + Opzioni @@ -32324,7 +32329,7 @@ Procedere? Opacity - Opacità + Opacità @@ -32410,7 +32415,7 @@ Procedere? Macros - + Macro @@ -32797,7 +32802,7 @@ p, li { white-space: pre-wrap; }(new line) Use unfiltered layer - + Usa layer non filtrato @@ -33185,22 +33190,22 @@ p, li { white-space: pre-wrap; }(new line) Average - Media + Media Nearest Neighbour - Il più vicino possibile + Il più vicino possibile Gauss - + Gauss Cubic - Cubico + Cubico @@ -33210,7 +33215,7 @@ p, li { white-space: pre-wrap; }(new line) None - Nessuno + Nessuno @@ -33218,7 +33223,7 @@ p, li { white-space: pre-wrap; }(new line) Default - Predefinito + Predefinito @@ -33264,7 +33269,7 @@ p, li { white-space: pre-wrap; }(new line) Valid - Valido + Valido @@ -33301,22 +33306,22 @@ Click on help button to get valid creation options for this format Form - + Modulo New - Nuovo + Nuovo Remove - Rimuovi + Rimuovi Reset - Ripristina + Ripristina @@ -33326,17 +33331,17 @@ Click on help button to get valid creation options for this format Name - Nome + Nome Value - Valore + Valore + - + + + @@ -33351,7 +33356,7 @@ Click on help button to get valid creation options for this format - - - + - @@ -33364,7 +33369,7 @@ Click on help button to get valid creation options for this format Visibility - Visibilità + Visibilità @@ -33389,7 +33394,7 @@ Click on help button to get valid creation options for this format Reset - Ripristina + Ripristina @@ -33399,17 +33404,17 @@ Click on help button to get valid creation options for this format Estimate (faster) - Stimato (più veloce) + Stimato (più veloce) Actual (slower) - Attuale (più lento) + Attuale (più lento) Current extent - Estensione attuale + Estensione attuale @@ -33434,7 +33439,7 @@ Click on help button to get valid creation options for this format Band %1 - Banda %1 + Banda %1 @@ -33447,17 +33452,17 @@ Click on help button to get valid creation options for this format Form - + Modulo Band - Banda + Banda Min - Min + Min @@ -33468,12 +33473,12 @@ Click on help button to get valid creation options for this format ... - ... + ... Max - Max + Max @@ -33493,7 +33498,7 @@ Click on help button to get valid creation options for this format Save as image... - Salva come immagine... + Salva come immagine... @@ -33541,7 +33546,7 @@ Click on help button to get valid creation options for this format null (no data) - nullo (nessun dato) + nullo (nessun dato) @@ -33766,17 +33771,17 @@ Click on help button to get valid creation options for this format From - + Da To - A + A not defined - + non definito @@ -33900,30 +33905,30 @@ Click on help button to get valid creation options for this format Nearest neighbour - Vicino più prossimo + Vicino più prossimo Bilinear - Bilineare + Bilineare Cubic - Cubico + Cubico Average - Media + Media None - Nessuno + Nessuno @@ -33967,17 +33972,17 @@ Click on help button to get valid creation options for this format Filter - Filtro + Filtro Bands - + Bande Time - Tempo + Tempo Note: Minimum Maximum values are estimates, user defined, or calculated from the current extent @@ -34463,7 +34468,7 @@ Click on help button to get valid creation options for this format Style mRendererTab - Stile + Stile @@ -34790,22 +34795,22 @@ p, li { white-space: pre-wrap; } From - + Da To - A + A Select output directory - + Scegli cartella di output Select output file - + Scegli il file di output @@ -34885,52 +34890,52 @@ p, li { white-space: pre-wrap; } Format - Formato + Formato Save as - Salva con nome + Salva con nome Browse... - Sfoglia... + Sfoglia... CRS - + SR Change ... - Cambia ... + Cambia ... Extent - Estensione + Estensione West - Ovest + Ovest East - Est + Est North - Nord + Nord South - Sud + Sud @@ -34945,22 +34950,22 @@ p, li { white-space: pre-wrap; } Resolution - Risoluzione + Risoluzione Horizontal - Orizzontale + Orizzontale Columns - Colonne + Colonne Rows - Righe + Righe @@ -34975,7 +34980,7 @@ p, li { white-space: pre-wrap; } Vertical - Verticale + Verticale @@ -35022,12 +35027,12 @@ p, li { white-space: pre-wrap; } No data values - Valori nulli + Valori nulli Add values manually - Aggiungi un valore manualmente + Aggiungi un valore manualmente @@ -35035,7 +35040,7 @@ p, li { white-space: pre-wrap; } ... - ... + ... @@ -35045,17 +35050,17 @@ p, li { white-space: pre-wrap; } Remove selected row - Rimuovi la riga selezionata + Rimuovi la riga selezionata Clear all - Cancella tutto + Cancella tutto Pyramids - Piramidi + Piramidi @@ -35078,7 +35083,7 @@ p, li { white-space: pre-wrap; } Form - + Modulo @@ -35093,17 +35098,17 @@ p, li { white-space: pre-wrap; } - - - + - % - % + % Min / max - + Min / max @@ -35113,7 +35118,7 @@ p, li { white-space: pre-wrap; } Extent - Estensione + Estensione @@ -35123,27 +35128,27 @@ p, li { white-space: pre-wrap; } Current - Attuale + Attuale Accuracy - + Accuratezza Actual (slower) - Attuale (più lento) + Attuale (più lento) Estimate (faster) - Stimato (più veloce) + Stimato (più veloce) Load - Carica + Carica @@ -35151,7 +35156,7 @@ p, li { white-space: pre-wrap; } Form - + Modulo @@ -35181,12 +35186,12 @@ p, li { white-space: pre-wrap; } Average - Media + Media Nearest Neighbour - Il più vicino possibile + Il più vicino possibile @@ -35206,7 +35211,7 @@ p, li { white-space: pre-wrap; } Resampling method - Metodo di ricampionamento + Metodo di ricampionamento @@ -36258,27 +36263,27 @@ L´errore era: Form - + Modulo Contrast enhancement - Miglioramento contrasto + Miglioramento contrasto Gray band - Banda grigio + Banda grigio Min - Min + Min Max - Max + Max @@ -36290,7 +36295,7 @@ L´errore era: Discrete - Discrete + Discreto @@ -36300,40 +36305,40 @@ L´errore era: Linear - Lineare + Lineare Exact - Esatto + Esatto Equal interval - Equal interval + Intervallo uguale Custom color map entry - Definizione mappa colori personalizzati + Definizione mappa colori personalizzati Load Color Map - Carica Mappa Colore + Carica Mappa Colore The color map for band %1 failed to load - Impossibile caricare la mappa colore per la banda %1 + Impossibile caricare la mappa colore per la banda %1 Open file - Apri file + Apri file @@ -36351,43 +36356,44 @@ L´errore era: The following lines contained errors - Le seguenti linee contengono errori + Le seguenti linee contengono errori + Read access denied - Permesso di lettura negato + Permesso di lettura negato Read access denied. Adjust the file permissions and try again. - Permesso di lettura negato. Sistema i permessi dei file e prova ancora. + Permesso di lettura negato. Sistema i permessi dei file e prova ancora. Save file - Salva file + Salva file QGIS Generated Color Map Export File - Esporta file QGIS mappa colori generata + Write access denied - Permesso di scrittura negato + Permesso di scrittura negato Write access denied. Adjust the file permissions and try again. - Permesso di scrittura negato. Sistema i permessi dei file e prova ancora. + Permesso di scrittura negato. Sistema i permessi dei file e prova ancora. @@ -36397,79 +36403,79 @@ L´errore era: Form - + Modulo Band - Banda + Banda Color interpolation - Interpolazione colore + Interpolazione colore Add entry - Aggiungi elemento + Aggiungi elemento Delete entry - Cancella elemento + Cancella elemento Sort - Ordina + Ordina Load color map from band - Carica mappa colore dalla banda + Carica mappa colore dalla banda ... - ... + ... Load color map from file - Carica mappa colore da file + Carica mappa colore da file Export color map to file - Esporta mappa colore su file + Esporta mappa colore su file Value - Valore + Valore Color - Colore + Colore Label - Etichetta + Etichetta Generate new color map - Genera nuova mappa colore + Genera nuova mappa colore Classes - Classi + Classi @@ -36479,12 +36485,12 @@ L´errore era: Classify - + Classifica Color ramp - Scala di colori + Scala di colori @@ -36597,7 +36603,7 @@ L´errore era: Form - + Modulo @@ -38271,12 +38277,12 @@ Sovrascrivere? Load styles - Carica stili + Carica stili XML files (*.xml *XML) - File XML (*.xml *.XML) + File XML (*.xml *.XML) @@ -38286,12 +38292,12 @@ Sovrascrivere? HTTP Error! - + Errore HTTP! Download failed: %1. - Errore di download: %1. + Errore di download: %1. @@ -38304,7 +38310,7 @@ Sovrascrivere? Import from - + Importa da @@ -38420,7 +38426,7 @@ Sovrascrivere? Symbol Name - Nome simbolo + Nome simbolo @@ -38524,7 +38530,7 @@ Kindly select a group or smart group you might want to delete. Error! - Errore! + Errore! @@ -38535,7 +38541,7 @@ There was a problem with your symbol database. Database Error - Errore database + Errore database @@ -38618,7 +38624,7 @@ There was a problem with your symbol database. Share - + Condividi Add @@ -38745,32 +38751,32 @@ There was a problem with your symbol database. Symbol layers - Layer simbolo + Layer simbolo Add symbol layer - Aggiungi layer simbolo + Aggiungi layer simbolo Remove symbol layer - Rimuovi layer simbolo + Rimuovi layer simbolo Lock layer's color - Blocca colore del layer + Blocca colore del layer Move up - Sposta in su + Sposta in alto Move down - Sposta in giù + Sposta in basso Change... @@ -38842,32 +38848,32 @@ There was a problem with your symbol database. Symbol name - Nome simbolo + Nome simbolo Please enter name for the symbol: - Iserire un nome per il simbolo: + Inserire un nome per il simbolo: New symbol - Nuovo simbolo + Nuovo simbolo Save symbol - Salva simbolo + Salva simbolo Symbol with name '%1' already exists. Overwrite? - + Il simbolo con nome '%1' esiste già. Sovrascrivere? Transparency %1% - Trasparenza %1% + Trasparenza %1% @@ -38968,7 +38974,7 @@ There was a problem with your symbol database. Tile scale - Scala delle tiles + Scala delle tiles @@ -40102,7 +40108,7 @@ Should the existing classes be deleted before classification? Insert expression - Inserisci l'espressione + Inserisci l'espressione @@ -40203,12 +40209,12 @@ Should the existing classes be deleted before classification? Save Style - + Salva stile Save Style... - + Salva stile ... Text diagram @@ -40405,7 +40411,7 @@ Should the existing classes be deleted before classification? CRS - + SR @@ -40866,12 +40872,12 @@ Should the existing classes be deleted before classification? Edit... - Modifica... + Modifica... Delete - Elimina + Elimina @@ -40879,7 +40885,7 @@ Should the existing classes be deleted before classification? New Connection... - Nuova connessione... + Nuova connessione... @@ -40887,12 +40893,12 @@ Should the existing classes be deleted before classification? Select a layer - Scegli un layer + Scegli un layer No CRS selected - Nessun SR selezionato + Nessun SR selezionato @@ -41421,7 +41427,7 @@ in cache 10 - 10 + 10 @@ -41554,45 +41560,45 @@ in cache empty capabilities document - il documento di capabilities è vuoto + il documento di capabilities è vuoto Tried URL: %1 - + URL provata: %1 Capabilities request redirected. - Richiesta capabilities reindirizzata. + Richiesta capabilities reindirizzata. empty of capabilities: %1 - assenza di capabilities: %1 + assenza di capabilities: %1 Download of capabilities failed: %1 - Download di capabilities non riuscito: %1 + Download di capabilities non riuscito: %1 WCS - + WCS %1 of %2 bytes of capabilities downloaded. - %1 di %2 bytes di capabilities scaricato. + %1 di %2 bytes di capabilities scaricato. Exception - Eccezione + Eccezione @@ -41605,7 +41611,7 @@ URL provata: %1 Dom Exception - Dom Exception + @@ -41668,7 +41674,7 @@ Response was: WCS - + WCS @@ -41774,7 +41780,7 @@ Response was: %1 of %2 bytes of map downloaded. - %1 di %2 bytes di mappa scaricati. + %1 di %2 bytes di mappa scaricati. @@ -41793,7 +41799,7 @@ Response was: Request contains a format not offered by the server. - La richiesta contiene un formato non disponibile dal server. + La richiesta contiene un formato non disponibile dal server. @@ -41859,13 +41865,13 @@ Response was: Property - Proprietà + Proprietà Value - Valore + Valore @@ -41876,23 +41882,23 @@ Response was: Title - Titolo + Titolo Abstract - Riassunto + Riassunto Fixed Width - Larghezza fissa + Larghezza fissa Fixed Height - Altezza fissa + Altezza fissa @@ -41907,20 +41913,20 @@ Response was: WGS 84 Bounding Box - Perimetro WGS 84 + Perimetro WGS 84 Available in CRS - Disponibile in SR + Disponibile in SR (and %n more) crs - + (e %n in più) (e %n in più) @@ -41929,7 +41935,7 @@ Response was: Available in format - + Disponibile nel formato @@ -41940,47 +41946,47 @@ Response was: Cache Stats - Statistiche cache + Statistiche cache Server Properties - Proprietà del server + Proprietà del server Keywords - Parole chiave + Parole chiave Online Resource - Risorsa online + Risorsa online Contact Person - Persona di riferimento + Persona di riferimento Fees - Tasse + Tasse Access Constraints - Vincoli di accesso + Vincoli di accesso Image Formats - Formati immagine + Formati immagine GetCapabilitiesUrl - GetCapabilitiesUrl + GetCapabilitiesUrl @@ -41990,7 +41996,7 @@ Response was: &nbsp;<font color="red">(advertised but ignored)</font> - &nbsp;<font color="red">(annunciato ma ignorato)</font> + &nbsp;<font color="red">(annunciato ma ignorato)</font> @@ -42357,12 +42363,12 @@ La risposta è stata: WMTS - + WMTS WMS-C - + WMS-C @@ -42682,28 +42688,28 @@ URL provata: %1 Dialog - + Finestra di dialogo Dimension - + Dimensione Value - Valore + Valore Abstract - Riassunto + Riassunto Default - Predefinito + Predefinito @@ -43024,7 +43030,7 @@ URL provata: %1 SEXTANTE Analysis - Analisi + Analisi &SEXTANTE Toolbox @@ -43537,7 +43543,7 @@ additional algorithm providers Execute - + Esegui Execute as batch process @@ -43549,11 +43555,11 @@ additional algorithm providers Warning - Attenzione + Attenzione Recently used algorithms - + Algoritmi usati di recente @@ -43602,77 +43608,77 @@ additional algorithm providers Form - + Modulo Unit - Unità + Unità Millimeter - Millimetri + Millimetri Map unit - Unità mappa + Unità mappa Opacity - Opacità + Opacità Color - Colore + Colore Change - Cambia + Cambia Size - Dimensione + Dimensione Rotation - Rotazione + Rotazione ° - ° + ° Width - + Larghezza Saved styles - Stili salvati + Stili salvati Symbol Name - Nome simbolo + Nome simbolo Style - Stile + Stile Advanced - Avanzato + Avanzato @@ -44121,12 +44127,12 @@ additional algorithm providers SVG Groups - + Gruppi SVG SVG Symbols - + Simboli SVG @@ -44312,7 +44318,7 @@ additional algorithm providers SVG Groups - + Gruppi SVG diff --git a/i18n/qgis_pt_PT.ts b/i18n/qgis_pt_PT.ts index d92cb3ffd412..24bd8138e955 100644 --- a/i18n/qgis_pt_PT.ts +++ b/i18n/qgis_pt_PT.ts @@ -63,12 +63,12 @@ Coordinate in your selected CRS (lat,lon or east,north) - + Coordenadas no CRS seleccionado (Lat, Long ou Este, Norte) Coordinate in map canvas coordinate reference system (lat,lon or east,north) - + Coordendas no sistema de coordenadas do mapa (Lat,Long ou Este, Norte) Coordinate in your selected CRS @@ -1564,12 +1564,12 @@ were reduced to %2 vertices after simplification About SEXTANTE - + Sobre o SEXTANTE about:blank - sobre:branco + sobre:em branco @@ -2011,7 +2011,7 @@ columns <html><head/><body><p>Avoid selecting feature by id. Sometimes - especially when running expensive queries/views - fetching the data sequentially instead of fetching features by id can be much quicker.</p></body></html> - + <html><head/><body><p>Evite seleccionar elementos pelo id. Por vezes e especialmente durante a execução de questionários a conjuntos de dados extensos será mais rápida a busca por dados sequenciais em vez da selecção de elementos pelo id.</p></body></html> @@ -3766,7 +3766,7 @@ when pressing on the tool dialog's Help button. cubic - + Cúbico @@ -4953,17 +4953,17 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Form - Formulário + Formulário Symbol layer type - Tipo da camada do símbolo + Tipo da camada do símbolo This layer doesn't have any editable properties - + Esta camanda não possui propriedades editáveis @@ -5261,7 +5261,7 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Rotate Label Ctl (Cmd) increments by 15 deg. - + Rodar legenda Ctl (Cmd) em incrementos de 15 graus @@ -5312,7 +5312,7 @@ Ctl (Cmd) increments by 15 deg. Pin/Unpin Labels - + Fixar / Não fixar um rótulo @@ -5320,13 +5320,13 @@ Ctl (Cmd) increments by 15 deg. Click or marquee on label to pin Shift unpins, Ctl (Cmd) toggles state Acts on all editable layers - + Fixar / Não Fixar um rótulo. Seleccione a label para fixar. Shift para não fixar, Ctl (Cmd) muda o estado. Funciona em todas as camadas editáveis Highlight Pinned Labels - + Realçar as legendas fixadas @@ -5337,22 +5337,22 @@ Acts on all editable layers Local Cumulative Cut Stretch - + Expansão Cumulativa Local do Corte Local cumulative cut stretch using current extent, default limits and estimated values. - + Expansão Cumulativa Local do Corte usando a extensão actual, limites padrão e valores estimados. Full Dataset Cumulative Cut Stretch - + Expansão Cumulativa do Corte para a totalidade dos dados Cumulative cut stretch using full dataset extent, default limits and estimated values. - + Expansão Cumulativa do Corte usando a totalidade da extensão de dados, limites padrão e valores estimados. @@ -5365,13 +5365,13 @@ Acts on all editable layers Click or marquee on feature to show label Shift+click or marquee on label to hide it Acts on currently active editable layer - + Mostrar / Esconder legendas. Seleccionar o elementos para ver legenda. Shift+selecção da camada activa Html Annotation - + Anotação Html Composer manager... @@ -7234,39 +7234,39 @@ Please change this situation first, because OSM Plugin doesn't know what la PythonConsole Clear console - + Limpar consola Import Class - + Importar classe Manage Script - + Gerir Script Import sextante class - + Importar classe sextante Import iface class - + Importar classe iface Open script file - + Abrir ficheiro script Save to script file - + Gravar para ficheiro script Run command - + Executar comando Help - Ajuda + Ajuda Python Console @@ -7302,12 +7302,12 @@ use o objeto qgis.utils.iface (instância da classe QgisInterface). meters - metros + metros feet - + pés @@ -7315,12 +7315,12 @@ use o objeto qgis.utils.iface (instância da classe QgisInterface). degrees - graus + graus <unknown> - + <desconhecido> @@ -8869,7 +8869,7 @@ Apenas %1 de %2 elementos escritos. Reading raster - + A ler raster CRS undefined - defaulting to default CRS @@ -9416,22 +9416,22 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente Cannot convert '%1' to DateTime - + Impossível converter '%1' para formato Data Hora Cannot convert '%1' to Date - + Impossível converter '%1' para formato Data Cannot convert '%1' to Time - + Impossível converter '%1' para formato Hora Cannot convert '%1' to Interval - + Impossível converter '%1' para formato Intervalo @@ -9479,7 +9479,7 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente Conditionals - + Condicionais @@ -9544,12 +9544,12 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente Unary minus only for numeric values. - + Sinal negativo apenas para valores numéricos Can't preform /, *, or % on DateTime and Interval - + Impossível incluir /, *, ou % no formato Data e Hora e Intervalo @@ -9783,7 +9783,7 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente GEOS prior to 3.2 doesn't support GEOSInterpolate - + versão GEOS anterior a 3.2 não suporta interpolação @@ -9796,17 +9796,17 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente Reading raster part %1 of %2 - + A ler raster parte %1 de %2 Building pyramids failed - write access denied - + Construção de pirâmides falhou - registo de dados negado Write access denied. Adjust the file permissions and try again. - Acesso de escrita negado. Ajuste as permissões do arquivo e tente novamente. + Registo de dados negado. Ajuste as permissões do arquivo e tente novamente. @@ -9814,23 +9814,23 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente Building pyramids failed. - Falha ao construir pirâmides. + Falha ao construir pirâmides. The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. - O arquivo não pode ser escrito. Alguns formatos não suportam visões em pirâmide. consulte a documentação GDAL em caso de dúvida. + O arquivo não pode ser escrito. Alguns formatos não suportam pre-visualização de pirâmides. consulte a documentação GDAL em caso de dúvida. Building pyramid overviews is not supported on this type of raster. - Construir 'overviews' em pirâmide não é suportado neste tipo de raster. + Pré-visualização de pirâmides não suportado neste tipo de raster. Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. - A construção de súmulas de pirâmides interna não é suportada em camadas raster com compressão JPEG e sua biblioteca libtiff atual. + A construção de pré-visualizações de pirâmides não é suportada em camadas raster com compressão JPEG e biblioteca libtiff atual. @@ -9840,7 +9840,7 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente Paletted - + Paletizada @@ -9850,12 +9850,12 @@ Está a ver esta mensagem provavelmente porque não tem a variável de ambiente Singleband pseudocolor - + Banda de cor falsa simples Singleband color data - + Banda cor simples @@ -12069,17 +12069,17 @@ Esta cópia do QGIS foi compilada com QWT %1. Security warning: - + Aviso de segurança: macros have been disabled. - + macros desativadas Enable - + Permitir @@ -12104,12 +12104,12 @@ Esta cópia do QGIS foi compilada com QWT %1. Shows the map coordinates at the current cursor position. The display is continuously updated as the mouse is moved. It also allows editing to set the canvas center to a given position. The format is lat,lon or east,north - + Mostra as coordenadas do mapa na posição actual do cursor. A tela é continuamente actualizada durante o movimento do rato. Permite ainda ser a editado para definir o centro da tela numa determinada posição. Current map coordinate (lat,lon or east,north) - + Coordenadas do mapa atual (lat, lon ou este, norte) @@ -12135,13 +12135,13 @@ Esta cópia do QGIS foi compilada com QWT %1. Update of view in private qgis.db failed. %1 - + Falha na actualização da visualização em qgis.db (modo privado) < Blank > - + < Blank > @@ -12192,7 +12192,7 @@ Esta cópia do QGIS foi compilada com QWT %1. PROJ.4 Version - + Versão PROJ.4 @@ -12621,7 +12621,16 @@ Default Theme Path: %7 SVG Search Paths: %8 User DB Path: %9 - + Estado da aplicação: +QGIS_PREFIX_PATH env var: %1 +Prefixo: %2 +Caminho da Extensão: %3 +Caminho de dados do complemento: %4 +Nome do tema activo: %5 +Caminho do tema activo: %6 +Caminho padrão do tema: %7 +Procura de Caminho SVG: %8 +Caminho do utilizador DB: %9 Application state: @@ -13550,7 +13559,7 @@ Caminho DB de utilizador: %8 No filter - + Sem filtro @@ -13626,7 +13635,7 @@ Caminho DB de utilizador: %8 Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box. - Permite agrupar valores numéricos a partir de um intervalo específico. The edit widget can be either a slider or a spin box. + Permite agrupar valores numéricos a partir de um intervalo específico. A ferramenta de edição pode de barra deslizante ou caixa de rotação. @@ -13686,12 +13695,12 @@ Caminho DB de utilizador: %8 Filter column - + Coluna de Filtro Filter value - + Valor de Filtro @@ -13845,7 +13854,10 @@ Erro:%2 Database: %1 Driver: %2 Database: %3 - + Impossível abrir base de dados do marcador: +Base de dados: %1 +Drive: %2 +Base de dados:%3 @@ -13860,22 +13872,22 @@ Database: %3 xMin - + xMin yMin - + yMin xMax - + xMax yMax - + yMax @@ -13892,7 +13904,9 @@ Database: %3 Unable to create the bookmark. Driver:%1 Database:%2 - + Não foi possivel criar o marcador. +Driver:%1 +Base de dados:%2 @@ -13903,9 +13917,9 @@ Database:%2 Are you sure you want to delete %n bookmark(s)? number of rows - - - + + Tem a certeza que deseja excluir %n marcador(es)? + número de colunas @@ -13999,7 +14013,7 @@ Database:%2 Param - + Param @@ -14024,7 +14038,7 @@ Database:%2 toolBar - + toolBar @@ -14120,12 +14134,12 @@ Database:%2 Add a directory - + Adicionar um directório Add directory to favourites - + Adicionar directório aos favoritos @@ -14171,7 +14185,7 @@ Database:%2 Home - + Início @@ -14184,77 +14198,77 @@ Database:%2 Solid - Sólido + Sólido Horizontal - Horizontal + Horizontal Vertical - Vertical + Vertical Cross - Cruz + Cruz BDiagonal - + BDiagonal FDiagonal - + FDiagonal Diagonal X - + Diagonal X Dense 1 - Denso 1 + Densidade 1 Dense 2 - Denso 2 + Densidade 2 Dense 3 - Denso 3 + Densidade 3 Dense 4 - Denso 4 + Densidade 4 Dense 5 - Denso 5 + Densidade 5 Dense 6 - Denso 6 + Densidade 6 Dense 7 - Denso 7 + Densidade 7 No Brush - Sem pincel + Sem pincel @@ -14274,7 +14288,7 @@ Database:%2 Symbol levels... - + Nível dos símbolos... @@ -14285,29 +14299,29 @@ Database:%2 There are no available color ramps. You can add them in Style Manager. - Não existem cor de rampas disponíveis. Você pode adicioná-las no Gerenciador de Estilos. + Não existem gradações de cores disponíveis. Pode adicioná-las no Gerenciador de Estilos. The selected color ramp is not available. - A cor de rampa selecionada não está disponível. + A cor de rampa selecionada não está disponível. Confirm Delete - Confirma exclusão + Confirme a exclusão The classification field was changed from '%1' to '%2'. Should the existing classes be deleted before classification? - O campo de classificação foi mudado de '%1' para '%2'. -Existem classes que podem ser excluídas antes da classificação? + O campo de classificação foi mudado de '%1' para '%2'. +Podem as classes ser excluídas antes da classificação? change - mudar + alteração @@ -14324,17 +14338,17 @@ Existem classes que podem ser excluídas antes da classificação? Color ramp - Cor da inclinação + Gradação de cor Classify - Classifica + Classifica Add - Adiciona + Adiciona @@ -14344,17 +14358,17 @@ Existem classes que podem ser excluídas antes da classificação? Delete all - Exclui tudo + Exclui tudo Join - Unir + Unir Advanced - Avançado + Avançado @@ -14362,7 +14376,7 @@ Existem classes que podem ser excluídas antes da classificação? New color ramp... - Nova cor da rampa... + Nova gradação de cor... @@ -14370,12 +14384,12 @@ Existem classes que podem ser excluídas antes da classificação? Show compass - + Mostrar Bússula &About - &Sobre + &Sobre @@ -14383,7 +14397,7 @@ Existem classes que podem ser excluídas antes da classificação? Pixmap not found - Pixmap não encontrado + Pixmap não encontrado @@ -14391,12 +14405,12 @@ Existem classes que podem ser excluídas antes da classificação? Internal Compass - Bússola interna + Bússola interna Azimut - + Azimute @@ -14452,12 +14466,12 @@ Existem classes que podem ser excluídas antes da classificação? Panels - Painéis + Painéis Toolbars - + Barras de Ferramentas @@ -14511,7 +14525,7 @@ Existem classes que podem ser excluídas antes da classificação? <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the - <p>A função de exportação SVG no QGIS tem vários problemas devido a bugs e deficiências no + <p>A função de exportação SVG no QGIS tem vários problemas devido a bugs e deficiências no @@ -14544,7 +14558,7 @@ Existem classes que podem ser excluídas antes da classificação? Qt4 svg code. In particular, there are problems with layers not being clipped to the map bounding box.</p> - código Qt4 svg. Em particular, existem problemas com camadas que não são aparadas da caixa limite do mapa.</p> + código Qt4 svg. Em particular, existem problemas com camadas que não são aparadas da caixa limite do mapa.</p> To create image %1 x %2 requires circa %3 MB of memory @@ -14553,7 +14567,7 @@ Existem classes que podem ser excluídas antes da classificação? If you require a vector-based output file from Qgis it is suggested that you try printing to PostScript if the SVG output is not satisfactory.</p> - Se você necessita de um arquivo de saída do tipo vetorial é sugerido que você tente imprimir para PostScript se o SVG criado não foi satisfatório.</p> + Se necessita de um arquivo de saída do tipo vetorial é sugerido que tente imprimir para PostScript se o SVG criado não foi satisfatório.</p> save template @@ -15096,12 +15110,12 @@ Existem classes que podem ser excluídas antes da classificação? Repeat on every page - + Repetir em cada página Repeat until finished - + Repetir até terminar @@ -15414,7 +15428,7 @@ Existem classes que podem ser excluídas antes da classificação? Item wrapping changed - + Alteração da modificação do item @@ -15424,78 +15438,78 @@ Existem classes que podem ser excluídas antes da classificação? Legend symbol width - Espessura do símbolo da legenda + Espessura do símbolo da legenda Legend symbol height - Altura do símbolo da legenda + Altura do símbolo da legenda Legend group space - Espaço do grupo da legenda + Espaço do grupo da legenda Legend layer space - Espaço da camada da legenda + Espaço da camada da legenda Legend symbol space - Espaço do símbolo da legenda + Espaço do símbolo da legenda Legend icon label space - + Espaço da legenda do símbolo Title font changed - Fonte do título alterada + Tipo de letra do título alterado Legend group font changed - + Tipo de letra da legenda do grupo alterada Legend layer font changed - + Tipo de letra da camada da legenda alterada Legend item font changed - + Tipo de letra do item da legenda alterado Legend box space - + Espaço da caixa da legenda Legend map changed - Mapa da legenda alterado + Mapa da legenda alterado Legend item edited - Item da legenda editado + Item da legenda editado Legend updated - Legenda actualizada + Legenda actualizada Legend group added - Grupo de legenda adicionado + Grupo de legenda adicionado @@ -15726,7 +15740,7 @@ Existem classes que podem ser excluídas antes da classificação? Render - Desenhar + Desenhar @@ -15754,12 +15768,12 @@ Existem classes que podem ser excluídas antes da classificação? DegreeMinute - Grau e Minuto + Grau e Minuto DegreeMinuteSecond - Grau, Minuto e Segundo + Grau, Minuto e Segundo @@ -15772,7 +15786,7 @@ Existem classes que podem ser excluídas antes da classificação? Zebra - + Zebra @@ -15811,12 +15825,12 @@ Existem classes que podem ser excluídas antes da classificação? Change item width - Alterar largura do item + Alterar largura do item Change item height - Alterar altura do item + Alterar altura do item @@ -15837,7 +15851,7 @@ Existem classes que podem ser excluídas antes da classificação? Canvas items toggled - + Alterados items do mapa @@ -15849,7 +15863,7 @@ Existem classes que podem ser excluídas antes da classificação? Grid checkbox toggled - + Alterada a caixa de verificação da grelha @@ -15861,23 +15875,23 @@ Existem classes que podem ser excluídas antes da classificação? Grid offset changed - + Alterado offset da grelha Grid pen changed - + Alterada caneta da grelha Grid type changed - Tipo de grelha alterado + Tipo de grelha alterado Grid cross width changed - + Espessura da cruz da grelha alterada @@ -15897,19 +15911,19 @@ Existem classes que podem ser excluídas antes da classificação? Changed grid frame style - Estilo da moldura da grelha alterado + Estilo da moldura da grelha alterado Changed grid frame width - Largura da moldura da grelha alterada + Largura da moldura da grelha alterada Disabled - Desativado + Desativado @@ -15924,7 +15938,7 @@ Existem classes que podem ser excluídas antes da classificação? Annotation toggled - + Alterada a anotação @@ -16113,12 +16127,12 @@ Existem classes que podem ser excluídas antes da classificação? Annotation position top side - Posição da anotação na parte superior + Posição da anotação na parte superior Annotation position bottom side - Posição da anotação na parte inferior + Posição da anotação na parte inferior @@ -16133,12 +16147,12 @@ Existem classes que podem ser excluídas antes da classificação? Annotation direction top side - Direcção da anotação na parte superior + Direcção da anotação na parte superior Annotation direction bottom side - Direcção da anotação na parte inferior + Direcção da anotação na parte inferior @@ -16173,7 +16187,7 @@ Existem classes que podem ser excluídas antes da classificação? Cross width - Espessura do cruzamento + Espessura do cruzamento @@ -16193,17 +16207,17 @@ Existem classes que podem ser excluídas antes da classificação? Picture width changed - Largura da imagem alterada + Largura da imagem alterada Picture height changed - Altura da imagem alterada + Altura da imagem alterada Picture rotation changed - Rotação da imagem alterada + Rotação da imagem alterada @@ -16213,12 +16227,12 @@ Existem classes que podem ser excluídas antes da classificação? Rotation synchronisation toggled - + Alterada a sincronização da rotação Rotation map changed - Rotação do mapa alterada + Rotação do mapa alterada @@ -18324,22 +18338,22 @@ and current file is [%3] Bottom Left - Inferior Esquerdo + Inferior Esquerdo Top Left - Superior Esquerdo + Superior Esquerdo Top Right - Superior Direito + Superior Direito Bottom Right - Inferior Direito + Inferior Direito @@ -18347,12 +18361,12 @@ and current file is [%3] Copyright Label Decoration - + Direitos de autor do rótulo de Decoração Enable copyright label - Habilita rótulo de copyright + Ativar rótulo de copyright @@ -18376,42 +18390,42 @@ p, li { white-space: pre-wrap; } Bottom Left - Inferior Esquerdo + Inferior Esquerdo Top Left - Superior Esquerdo + Superior Esquerdo Bottom Right - Inferior Direito + Inferior Direito Top Right - Superior Direito + Superior Direito &Orientation - &Orientação + &Orientação Horizontal - Horizontal + Horizontal Vertical - Vertical + Vertical &Color - &Cor + &Cor @@ -18422,27 +18436,27 @@ p, li { white-space: pre-wrap; } Error - Erro + Erro No active layer - Nenhuma camada ativa + Nenhuma camada ativa Please select a raster layer - Por favor seleccione uma camada raster + Por favor seleccione uma camada raster Invalid raster layer - + Camada raster inválida Layer CRS must be equal to project CRS - + SRC da camada tem de ser igual ao SRC do projecto @@ -18450,77 +18464,77 @@ p, li { white-space: pre-wrap; } Dialog - Diálogo + Diálogo Enable grid - + Ativar grelha Interval X - Intervalo X + Intervalo X Interval Y - Intervalo Y + Intervalo Y Grid type - + Tipo de grelha Line symbol - + Símbolo de linha Draw annotation - Desenha anotação + Desenhar anotação Annotation direction - Direção da anotação + Direção da anotação Font... - Fonte... + Fonte... Distance to map frame - Distância a moldura do mapa + Distância à moldura do mapa Coordinate precision - Precisão da coordenada + Precisão da coordenada Marker symbol - + Símbolo de marcador Offset X - Deslocamento X + Deslocamento X Offset Y - Deslocamento Y + Deslocamento Y Update Interval / Offset from - + Atualize intervalo / Deslocamento de @@ -18530,46 +18544,46 @@ p, li { white-space: pre-wrap; } Active Raster Layer - + Camada raster ativa Line - Linha + Linha Marker - Marcador + Marcador Horizontal - Horizontal + Horizontal Vertical - Vertical + Vertical Horizontal and vertical - + Horizontal e vertical Boundary direction - Direção limite + Direção limite Horizontal and Vertical - Horizontal e Vertical + Horizontal e Vertical @@ -18577,27 +18591,27 @@ p, li { white-space: pre-wrap; } Bottom Left - Inferior Esquerdo + Inferior Esquerdo Top Left - Superior Esquerdo + Superior Esquerdo Top Right - Superior Direito + Superior Direito Bottom Right - Inferior Direito + Inferior Direito North arrow pixmap not found - Pixmap da seta norte não encontrado + Pixmap da seta de norte não encontrado @@ -18605,62 +18619,62 @@ p, li { white-space: pre-wrap; } North Arrow Decoration - + Decoração da seta de norte Preview of north arrow - Pré-visualização da rosa dos ventos + Pré-visualização da seta de norte Angle - Ângulo + Ângulo Placement - + Posicionamento Placement on screen - Posicionamento na Tela + Posicionamento no ecrã Top Left - Superior Esquerdo + Superior Esquerdo Top Right - Superior Direito + Superior Direito Bottom Left - Inferior Esquerdo + Inferior Esquerdo Bottom Right - Inferior Direito + Inferior Direito Enable North Arrow - Habilitar Rosa dos Ventos + Ativar Seta de Norte Set direction automatically - Configurar a direção automaticamente + Configurar a direção automaticamente Pixmap not found - Pixmap não encontrado + Pixmap não encontrado @@ -18668,22 +18682,22 @@ p, li { white-space: pre-wrap; } Bottom Left - Inferior Esquerdo + Inferior Esquerdo Top Left - Superior Esquerdo + Superior Esquerdo Top Right - Superior Direito + Superior Direito Bottom Right - Inferior Direito + Inferior Direito @@ -18698,72 +18712,72 @@ p, li { white-space: pre-wrap; } Bar - Barra + Barra Box - Caixa + Caixa km - km + km mm - mm + mm cm - cm + cm m - m + m miles - milhas + milhas mile - milha + milha inches - polegadas + polegadas foot - pé + pé feet - + pé degree - grau + grau degrees - graus + graus unknown - desconhecido + desconhecido @@ -18781,32 +18795,32 @@ p, li { white-space: pre-wrap; } Top Left - Superior Esquerdo + Superior Esquerdo Top Right - Superior Direito + Superior Direito Bottom Left - Inferior Esquerdo + Inferior Esquerdo Bottom Right - Inferior Direito + Inferior Direito Scale bar style - Estilo de barra de escala + Estilo da barra de escala Select the style of the scale bar - Selecione o estilo da barra de escala + Selecione o estilo da barra de escala @@ -18821,53 +18835,53 @@ p, li { white-space: pre-wrap; } Box - Caixa + Caixa Bar - Barra + Barra Color of bar - Cor da barra + Cor da barra Click to select the color - Clique para selecionar a cor + Clique para selecionar a cor Size of bar - Tamanho da barra + Tamanho da barra Enable scale bar - Habilitar barra de escala + Ativa barra de escala Automatically snap to round number on resize - Arredondar números automaticamente ao redimensionar + Ajustar automaticamente para arredondar o número ao redimensionar metres/km - metros/km + metros/km feet/miles - pés/milhas + pés/milhas degrees - graus + graus @@ -18883,12 +18897,12 @@ p, li { white-space: pre-wrap; } &Add Delimited Text Layer - &Adicionar uma camada a partir de um texto delimitado + &Adicionar camada de texto delimitado Add a delimited text file as a map layer. The file must have a header row containing the field names. The file must either contain X and Y fields with coordinates in decimal units or a WKT field. - + Adicionar um ficheiro de texto delimitado como uma camada de mapa. O ficheiro deve ter uma linha de cabeçalho contendo os nomes de campo. O ficheiro deve conter campos X e Y com coordenadas em unidades decimais ou um campo WKT. @@ -18898,7 +18912,7 @@ p, li { white-space: pre-wrap; } Cannot get Delimited Text select dialog from provider. - + Não é possível obter texto delimitado do fornecedor. &Delimited text @@ -18907,7 +18921,7 @@ p, li { white-space: pre-wrap; } DelimitedTextLayer - CamadaTextoDelimitado + CamadaTextoDelimitado Add a delimited text file as a map layer. The file must have a header row containing the field names. X and Y fields are required and must contain coordinates in decimal units. @@ -19084,7 +19098,7 @@ p, li { white-space: pre-wrap; } Note: the following lines were not loaded because QGIS was unable to determine values for the x and y coordinates: - + Nota: as seguintes linhas não foram carregadas, porque o QGIS foi incapaz de determinar os valores para as coordenadas X e Y: @@ -19102,7 +19116,7 @@ p, li { white-space: pre-wrap; } Choose a delimited text file to open - Escolha um arquivo de texto delimitado para abrir + Escolha um ficheiro de texto delimitado para abrir @@ -19112,7 +19126,7 @@ p, li { white-space: pre-wrap; } Well Known Text files - + Ficheiros Well Known Text (WKT) @@ -19125,99 +19139,99 @@ p, li { white-space: pre-wrap; } Create a Layer from a Delimited Text File - Criar uma camada a partir de arquivo de texto delimitado + Criar uma camada a partir de ficheiro de texto delimitado File Name - + Nome do ficheiro Full path to the delimited text file - Caminho completo para o arquivo de texto delimitado + Caminho completo para o ficheiro de texto delimitado Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file. - Caminho completo para o arquivo texto delimitado. Para analisar apropriadamente os campos do arquivo, o delimitador deve ser escolhido antes do arquivo. Use o botão procurar ao lado deste campo para escolher um arquivo de entrada. + Caminho completo para o ficheiro de texto delimitado. Para analisar apropriadamente os campos do ficheiro, o delimitador deve ser escolhido antes do arquivo. Use o botão procurar ao lado deste campo para escolher um ficheiro de entrada. Layer name - Nome da camada + Nome da camada Name to display in the map legend - Nome para exibir na legenda do mapa + Nome para exibir na legenda do mapa Name displayed in the map legend - Nome exibido na legenda do mapa + Nome exibido na legenda do mapa Browse to find the delimited text file to be processed - Procurar arquivo de texto delimitado para processamento + Procurar ficheiro de texto delimitado para processamento Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the <i>Delimiter</i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file. - Utilize este botão para procurar o arquivo texto delimitado. O botão não será habilitado enquanto um delimitador não houver sido escolhido no campo <i>Delimitador</i>. Depois de escolhido um arquivo, as caixas de seleção X e Y serão preenchidas com os campos do arquivo texto. + Utilize este botão para procurar o ficheiro de texto delimitado. O botão não será habilitado enquanto um delimitador não tiver sido escolhido no campo <i>Delimitador</i>. Depois de escolhido um ficheiro, as caixas de seleção X e Y serão preenchidas com os campos do ficheiro texto. Browse... - Procurar... + Procurar... Selected delimiters - + Delimitadores selecionados The delimiter is a regular expression - O delimitador é uma expressão regular + O delimitador é uma expressão regular Regular expression - Expressão regular + Expressão regular The delimiter is taken as is - O delimitador reconhecido é + O delimitado é tomado como está Plain characters - Caracteres planos + Caracteres planos Tab - + Tabulação Space - Espaço + Espaço Comma - Vírgula + Vírgula Semicolon - + Ponto e vírgula @@ -19227,22 +19241,22 @@ p, li { white-space: pre-wrap; } Delimiter to use when splitting fields in the text file. The delimiter can be more than one character. - Delimitador usado ao separar os campos do arquivo texto. O delimitador pode possuir mais de um caractere. + Delimitador usado ao separar os campos do ficheiro texto. O delimitador pode possuir mais de um caracter. Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length. - Delimitador usado ao separar os campos do arquivo texto. O delimitador pode possuir um ou mais caracteres. + Delimitador usado ao separar os campos do ficheiro texto. O delimitador pode possuir um ou mais caracteres. Start import at row - + Iniciar importação na linha The file contains X and Y coordinate columns - + O ficheiro contêm colunas de coordenadas X e Y @@ -19252,7 +19266,7 @@ p, li { white-space: pre-wrap; } <p align="right">X field</p> - <p align="right">Campo X</p> + <p align="right">Campo X</p> @@ -19262,12 +19276,12 @@ p, li { white-space: pre-wrap; } Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. - Nome do campo contendo valores de X. Escolha um campo da lista. A lista é gerada a partir da linha de cabeçalho do arquivo. + Nome do campo que contém os valores de X. Escolha um campo da lista. A lista é gerada a partir da linha de cabeçalho do ficheiro de texto delimitado. <p align="right">Y field</p> - <p align="right">Campo Y</p> + <p align="right">Campo Y</p> @@ -19279,12 +19293,12 @@ p, li { white-space: pre-wrap; } Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. - Nome do campo contendo valores de Y. Escolha um campo da lista. A lista é gerada a partir da linha de cabeçalho do arquivo. + Nome do campo que contém os valores de Y. Escolha um campo da lista. A lista é gerada a partir da linha de cabeçalho do arquivo. The file contains a well known text geometry field - + O ficheiro contém um campo de geometria well known text @@ -19299,7 +19313,7 @@ p, li { white-space: pre-wrap; } Sample text - Texto de exemplo + Texto de exemplo @@ -19312,17 +19326,17 @@ p, li { white-space: pre-wrap; } Heading Label - Rótulo do cabeçalho + Rótulo do cabeçalho Detail label - Rótulo do detalhe + Rótulo do detalhe Category label - + Rótulo de categoria @@ -20291,22 +20305,22 @@ p, li { white-space: pre-wrap; } Not available for layer - + Não disponível para a camada Evaluation error - Erro de avaliação + Erro de avaliação Provider error - Erro no provedor + Erro no fornecedor Could not add the new field to the provider. - Impossível adicionar um novo campo ao provedor. + Não foi possível adicionar o novo campo ao fornecedor. @@ -20317,18 +20331,19 @@ p, li { white-space: pre-wrap; } An error occured while evaluating the calculation string: %1 - + Ocorreu um erro ao avaliar a cadeia de cálculo: +%1 Please enter a field name - + Por favor, insira um nome de campo The expression is invalid see (more info) for details - + A expressão é inválida, ver (mais informações) para obter mais detalhes An error occured while evaluating the calculation string. @@ -20340,22 +20355,22 @@ p, li { white-space: pre-wrap; } Field calculator - Calculadora de campo + Calculadora de campo Create a new field - + Criar um novo campo Update existing field - Atualiza um campo existente + Atualizar campo existente Only update selected features - Apenas atualiza feições selecionadas + Apenas atualizar elementos selecionados New field @@ -20364,17 +20379,17 @@ p, li { white-space: pre-wrap; } Output field name - Nome do arquivo de saída + Nome do campo de saída Output field type - Tipo do arquivo de saída + Tipo de campo de saída Output field width - Espessura do campo de saída + Tamanho do campo de saída Output field precision @@ -20403,7 +20418,7 @@ p, li { white-space: pre-wrap; } Width of complete output. For example 123,456 means 6 as field width. - + Tamanho de saída total. Por exemplo 123,456 significa 6 como tamanho do campo. @@ -21932,122 +21947,122 @@ Please reselect a valid file. A5 (148x210 mm) - A5 (148x210 mm) + A5 (148x210 mm) A4 (210x297 mm) - A4 (210x297 mm) + A4 (210x297 mm) A3 (297x420 mm) - A3 (297x420 mm) + A3 (297x420 mm) A2 (420x594 mm) - A2 (420x594 mm) + A2 (420x594 mm) A1 (594x841 mm) - A1 (594x841 mm) + A1 (594x841 mm) A0 (841x1189 mm) - A1 (594x841 mm) + A1 (594x841 mm) B5 (176 x 250 mm) - B5 (176 x 250 mm) + B5 (176 x 250 mm) B4 (250 x 353 mm) - B4 (250 x 353 mm) + B4 (250 x 353 mm) B3 (353 x 500 mm) - B3 (353 x 500 mm) + B3 (353 x 500 mm) B2 (500 x 707 mm) - B2 (500 x 707 mm) + B2 (500 x 707 mm) B1 (707 x 1000 mm) - B1 (707 x 1000 mm) + B1 (707 x 1000 mm) B0 (1000 x 1414 mm) - B0 (1000 x 1414 mm) + B0 (1000 x 1414 mm) Legal (8.5x14 inches) - Legal (8.5x14 polegadas) + Legal (8.5x14 polegadas) ANSI A (Letter; 8.5x11 inches) - ANSI A (Carta; 8.5x11 polegadas) + ANSI A (Carta; 8.5x11 polegadas) ANSI B (Tabloid; 11x17 inches) - ANSI B (Tablóide; 11x17 polegadas) + ANSI B (Tablóide; 11x17 polegadas) ANSI C (17x22 inches) - ANSI C (17x22 polegadas) + ANSI C (17x22 polegadas) ANSI D (22x34 inches) - ANSI D (22x34 polegadas) + ANSI D (22x34 polegadas) ANSI E (34x44 inches) - ANSI E (34x44 polegadas) + ANSI E (34x44 polegadas) Arch A (9x12 inches) - Arch A (9x12 polegadas) + Arch A (9x12 polegadas) Arch B (12x18 inches) - Arch B (12x18 polegadas) + Arch B (12x18 polegadas) Arch C (18x24 inches) - Arch C (18x24 polegadas) + Arch C (18x24 polegadas) Arch D (24x36 inches) - Arch D (24x36 polegadas) + Arch D (24x36 polegadas) Arch E (36x48 inches) - Arch E (36x48 polegadas) + Arch E (36x48 polegadas) Arch E1 (30x42 inches) - Arch E1 (30x42 polegadas) + Arch E1 (30x42 polegadas) @@ -22055,43 +22070,43 @@ Please reselect a valid file. Configure Georeferencer - Configurar georreferenciador + Configurar georreferenciador Point tip - Ponteira + Ponteiro Show IDs - Mostrar IDs + Mostrar IDs Show coords - Mostrar coordenadas + Mostrar coordenadas PDF report - Relatório PDF + Relatório PDF Left margin - Margem esquerda + Margem esquerda mm - mm + mm Right margin - Margem direita + Margem direita @@ -22101,27 +22116,27 @@ Please reselect a valid file. PDF map - Mapa em PDF + Mapa em PDF Paper size - Tamanho do papel + Tamanho do papel Residual units - Unidades residuais + Unidades residuais Pixels - Pixels + Pixels Use map units if possible - Usar unidades do mapa se possível + Usar unidades do mapa se possível @@ -22129,7 +22144,7 @@ Please reselect a valid file. Description georeferencer - Descrição do Georreferenciador + Descrição do Georreferenciador @@ -22164,7 +22179,7 @@ p, li { white-space: pre-wrap; } &Georeferencer - &Georreferenciador + &Georreferenciador @@ -22172,17 +22187,17 @@ p, li { white-space: pre-wrap; } All other files (*) - Todos os outros arquivos (*) + Todos os outros ficheiros (*) Open raster - Abrir raster + Abrir raster %1 is not a supported raster data source - %1 é uma fonte de dados raster sem suporte + %1 não é uma fonte de dados raster suportada @@ -22192,19 +22207,19 @@ p, li { white-space: pre-wrap; } Raster loaded: %1 - Raster carregado: %1 + Raster carregado: %1 Georeferencer - %1 - Georreferenciador - %1 + Georreferenciador - %1 Transform: - Transformar: + Transformar: @@ -22219,33 +22234,33 @@ p, li { white-space: pre-wrap; } Info - Info + Informações GDAL scripting is not supported for %1 transformation - Script GDAL não suportado para %1 a transformação + Script GDAL não é suportado para %1 transformação Load GCP points - Carregar pontos GCP + Carregar pontos GCP No GCP points to save - Sem pontos GCP para salvar + Sem pontos GCP para salvar Save GCP points - Salvar pontos GCP + Salvar pontos GCP Please load raster to be georeferenced - Carregue o raster para ser georreferenciado + Por favor, carregue o raster a ser georreferenciado @@ -22256,52 +22271,52 @@ p, li { white-space: pre-wrap; } Panels - Painéis + Painéis Toolbars - Barra de Ferramentas + Barra de Ferramentas Coordinate: - Coordenada: + Coordenada: Current map coordinate - Coordenada atual do mapa + Coordenada atual do mapa Current transform parametrisation - Transformação de parametrisação atual + Parametrização de transformação atual Unable to open GCP points file %1 - Impossível abrir arquivos de pontos GCP %1 + Impossível abrir arquivos de pontos GCP %1 Could not write to %1 - Não foi possível gravar para %1 + Não foi possível gravar para %1 Save GCPs - Salvar GCPs + Salvar GCPs Georeferencer - Georreferenciador + Georreferenciador Save GCP points? - Salvar pontos GCP? + Salvar pontos GCP? @@ -22311,13 +22326,13 @@ p, li { white-space: pre-wrap; } <p>The selected file already seems to have a world file! Do you want to replace it with the new world file?</p> - <p>O arquivo selecionado já parece ter um arquivo "world"! Deseja substituí-lo com o novo arquivo "world"?</p> + <p>O arquivo selecionado já parece ter um ficheiro "world"! Deseja substituí-lo com o novo ficheiro "world"?</p> Failed to compute GCP transform: Transform is not solvable - Falha ao calcular transformação GCP: Transformação não é solúvel + Falha ao calcular transformação GCP: Transformação não é solucionável @@ -22327,37 +22342,37 @@ p, li { white-space: pre-wrap; } Transformation parameters - Parâmetros de transformação + Parâmetros de transformação Translation x - Translação x + Translação x Translation y - Translação y + Translação y Scale x - Escala x + Escala x Scale y - Escala y + Escala y Rotation [degrees] - Rotação [graus] + Rotação [graus] Residuals - Residuais + Residuais @@ -22371,28 +22386,28 @@ p, li { white-space: pre-wrap; } GCP file - + Ficheiro GCP None - Nenhum + Nenhum Coordinate of image(column/line) - + Coordenada da imagem (coluna/linha) pixels - pixels + pixels Mean error [%1] - Erro médio [%1] + Erro médio [%1] @@ -22407,27 +22422,27 @@ p, li { white-space: pre-wrap; } Translation (%1, %2) - Translação (%1, %2) + Translação (%1, %2) Scale (%1, %2) - Escala (%1, %2) + Escala (%1, %2) Rotation: %1 - Rotação: %1 + Rotação: %1 Mean error: %1 - Erro médio: %1 + Erro médio: %1 Copy in clipboard - Copiar para a área de transferência + Copiar na área de transferência @@ -22437,47 +22452,47 @@ p, li { white-space: pre-wrap; } GDAL script - Script GDAL + Script GDAL Please set transformation type - Marque o tipo de transformação + Por favor, defina o tipo de transformação Please set output raster name - Coloque o nome do raster de saída + Por favor, defina nome do raster de saída %1 requires at least %2 GCPs. Please define more - %1 necessita pelo menos %2 GCPs. Defina mais + %1 necessita pelo menos %2 GCPs. Por favor, defina mais Linear - Linear + Linear Helmert - Helmert + Helmert Polynomial 1 - Polinomial 1 + Polinomial 1 Polynomial 2 - Polinomial 2 + Polinomial 2 Polynomial 3 - Polinomial 3 + Polinomial 3 @@ -22487,17 +22502,17 @@ p, li { white-space: pre-wrap; } Projective - Projetiva + Projetiva Not set - Não definido + Não definido World file exists - Arquivo "world" já existe + Ficheiro "world" já existe @@ -22505,7 +22520,7 @@ p, li { white-space: pre-wrap; } Georeferencer - Georreferenciador + Georreferenciador @@ -22517,23 +22532,23 @@ p, li { white-space: pre-wrap; } View - Ver + Ver Edit - Editar + Editar Settings - Opções + Configurações GCP table - Tabela GCP + Tabela GCP @@ -22544,18 +22559,18 @@ p, li { white-space: pre-wrap; } Open raster - Abrir raster + Abrir raster Ctrl+O - Ctrl+O + Ctrl+O Zoom In - Aproximar + Aproximar @@ -22566,7 +22581,7 @@ p, li { white-space: pre-wrap; } Zoom Out - Afastar + Afastar @@ -22577,7 +22592,7 @@ p, li { white-space: pre-wrap; } Zoom to Layer - Ver a camada + Aproximar à Camada @@ -22588,19 +22603,19 @@ p, li { white-space: pre-wrap; } Pan - Movimentar + Movimentar Transformation settings - Configurações de transformação + Configurações de transformação Add point - Adicionar ponto + Adicionar ponto @@ -22611,46 +22626,46 @@ p, li { white-space: pre-wrap; } Delete point - Excluir ponto + Apagar ponto Ctrl+D - Ctrl+D + Ctrl+D Quit - Sair + Sair Start georeferencing - Iniciar georreferenciamento + Iniciar georreferenciamento Ctrl+G - + Ctrl+G Generate GDAL script - Gera script GDAL + Gerar script GDAL Ctrl+C - Ctrl+C + Ctrl+C Link Georeferencer to QGis - Conexta Georreferenciador ao QGIS + Conecta Georreferenciador ao QGIS @@ -22662,64 +22677,64 @@ p, li { white-space: pre-wrap; } Save GCP points as... - Salvar pontos GCP como... + Salvar pontos GCP como... Ctrl+S - Ctrl+S + Ctrl+S Load GCP points - Carregar pontos GCP + Carregar pontos GCP Ctrl+L - Ctrl+L + Ctrl+L Configure Georeferencer - Configura o Georreferenciador + Configurar o Georreferenciador Ctrl+P - Ctrl+P + Ctrl+P Raster properties - Propriedades do raster + Propriedades do raster Move GCP point - Move ponto GCP + Mover ponto GCP Zoom Next - Próxima visualização + Próxima visualização Zoom Last - Última visualização + Última visualização Local histogram stretch - + Histograma local Full histogram stretch - Expansão de histrograma completa + Histograma completo @@ -25803,7 +25818,6 @@ na liha %2 coluna %3 unhandled layers - @@ -29374,7 +29388,7 @@ http://my.host.com/cgi-bin/mapserv.exe The calculations are based on: - + Os cálculos baseiam-se em: @@ -29419,7 +29433,7 @@ http://my.host.com/cgi-bin/mapserv.exe Segments [%1] - + Segmentos [%1] @@ -29427,12 +29441,12 @@ http://my.host.com/cgi-bin/mapserv.exe Incorrect measure results - Resultados de medidas incorretos + Resultados de medidas incorretos <p>This map is defined with a geographic coordinate system (latitude/longitude) but the map extents suggests that it is actually a projected coordinate system (e.g., Mercator). If so, the results from line or area measurements will be incorrect.</p><p>To fix this, explicitly set an appropriate map coordinate system using the <tt>Settings:Project Properties</tt> menu. - <p>Este mapa é definido com um sistema de coordenadas geográficas (latitude/longitude) porém os limites do mapa sugerem que este é efetivamente um sistema de coordenadas projetado (e.g., Mercator). Se for, os resultados de medida de de linhas ou áreas poderão estar incorretos.</p><p>Para definir este sistema de coordenadas, defina um mapa com sistema de coordenadas apropriado usando o menu<tt>Configurações:Propriedades do Projeto</tt>. + <p>Este mapa é definido com um sistema de coordenadas geográficas (latitude/longitude) porém os limites do mapa sugerem que este é efetivamente um sistema de coordenadas projetado (e.g., Mercator). Se for, os resultados de medida de linhas ou áreas poderão estar incorretos.</p><p>Para definir este sistema de coordenadas, defina um mapa com sistema de coordenadas apropriado usando o menu<tt>Configurações:Propriedades do Projeto</tt>. @@ -30215,7 +30229,7 @@ http://my.host.com/cgi-bin/mapserv.exe Create a new %1 connection - + Criar uma nova conexção de %1 @@ -30225,12 +30239,12 @@ http://my.host.com/cgi-bin/mapserv.exe Ignore axis orientation - + Ignorar orientação do eixo Save connection - Salvar conexão + Salvar conexão @@ -30240,7 +30254,7 @@ http://my.host.com/cgi-bin/mapserv.exe Saving passwords - + Salvar passwords @@ -30264,17 +30278,17 @@ Note: giving the password is optional. It will be requested interactivly, when n If the service requires basic authentication, enter a user name and optional password - Se o serviço requer autenticação básica, entre com um nome de usuário em uma senha opcional + Se o serviço requer autenticação básica, entre com um nome de utilizador e uma senha opcional Name of the new connection - Nome da nova conexão + Nome da nova conexão HTTP address of the Web Map Server - Endereço HTTP do Web Map Server + Endereço HTTP do Web Map Server @@ -30289,22 +30303,22 @@ Note: giving the password is optional. It will be requested interactivly, when n Ignore axis orientation (WMS 1.3/WMTS) - + Ignorar orientação do eixo (WMS 1.3/WMTS) Invert axis orientation - + Ignorar orientação do eix Create a new WMS connection - Cria uma nova conexão WMS + Criar uma nova conexão WMS Connection details - Detalhes da conexão + Detalhes da conexão If the WMS requires basic authentication, enter a user name and optional password @@ -30313,12 +30327,12 @@ Note: giving the password is optional. It will be requested interactivly, when n Password - Senha + Senha &User name - &Usuário + &Utilizador @@ -31004,7 +31018,7 @@ p, li { white-space: pre-wrap; } WMS Password for %1 - WMS senha para %1 + WMS senha para %1 @@ -31012,12 +31026,12 @@ p, li { white-space: pre-wrap; } Edit... - Editar... + Editar... Delete - Apagar + Apagar @@ -31025,7 +31039,7 @@ p, li { white-space: pre-wrap; } &Add - + &Adicionar @@ -31110,7 +31124,7 @@ p, li { white-space: pre-wrap; } Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. - Muitos servidores WMS foram adicionados a lista de servidores. Note que se você acessa a internet via proxy, será necessário acertar as configurações proxy no diálogo de opções do QGIS + Muitos servidores WMS foram adicionados a lista de servidores. Note que se você acessa a internet via proxy, será necessário acertar as configurações proxy no diálogo de opções do QGIS. @@ -31138,13 +31152,13 @@ p, li { white-space: pre-wrap; } Add Layer(s) from a Server - Adiciona camada(s) de um servidor + Adicionar camada(s) de um servidor Layers - Camadas + Camadas @@ -31154,89 +31168,89 @@ p, li { white-space: pre-wrap; } &New - &Novo + &Novo Edit - Editar + Editar Delete - Apagar + Apagar Load connections from file - + Carregar conexões a partir de ficheiro Load - + Carregar Save connections to file - + Salvar conexções para ficheiro Save - Salvar + Salvar Adds a few example WMS servers - Adiciona algum exemplo de servidor WMS + Adicionar alguns exemplos de servidores WMS Add default servers - Adicionar servidores padrões + Adicionar servidores padrão ID - ID + ID Name - Nome + Nome Title - Título + Título Abstract - Resumo + Resumo Time - + Tempo Format - Formato + Formato Options - Opções + Opções Layer name - Nome da camada + Nome da camada @@ -31246,18 +31260,18 @@ p, li { white-space: pre-wrap; } Feature limit for GetFeatureInfo - + Limite de recurso para GetFeatureInfo Coordinate Reference System - + Sistema de Referência de Coordenadas Change ... - Mudar ... + Mudar ... @@ -31281,37 +31295,37 @@ Always network: always load from network and do not check if the cache has a val Layer Order - Ordem de camada + Ordem da camada Move selected layer UP - + Mover camada selecionada para cima Up - Cima + Cima Move selected layer DOWN - + Mover camada selecionada para baixo Down - Baixo + Baixo Layer - Camada + Camada Style - Estilo + Estilo @@ -31321,47 +31335,47 @@ Always network: always load from network and do not check if the cache has a val Styles - Estilos + Estilos Size - Tamanho + Tamanho CRS - SRC + SRC Server Search - Busca de servidor + Pesquisa de servidor Search - + Pesquisa Description - Descrição + Descrição URL - URL + URL Add selected row to WMS list - Adicionar linha selecionada para lista WMS + Adicionar linha selecionada para lista WMS Ready - Pronto + Pronto @@ -34101,7 +34115,7 @@ Verifique se você tem privilégios para usar o SELECT na tabela que contém geo QgsPluginInstaller QGIS Python Plugin Installer - Instalador de Complementos Python + Instalador de Complementos Python Nothing to remove! Plugin directory doesn't exist: @@ -34125,23 +34139,23 @@ Verifique se você tem privilégios para usar o SELECT na tabela que contém geo Fetch Python Plugins... - Busca Complementos Python ... + Buscar Complementos Python ... Install more plugins from remote repositories - Instalar mais complementos de repositórios remotos + Instalar mais complementos de repositórios remotos Looking for new plugins... - Procurando por novos complementos... + Procurando por novos complementos... QGIS Plugin Installer update - Atualizar o Instalador de Complementos do QGIS + Atualizar o Instalador de Complementos do QGIS The Plugin Installer has been updated. Please restart QGIS prior to using it - O Instalador de Complementos foi atualizado. Por favor, reinicie o QGIS para usá-lo + O Instalador de Complementos foi atualizado. Por favor, reinicie o QGIS para usá-lo QGIS Plugin Conflict: @@ -34153,128 +34167,128 @@ Verifique se você tem privilégios para usar o SELECT na tabela que contém geo There is a new plugin available - Existe um novo complemento disponível + Existe um novo complemento disponível There is a plugin update available - Existe uma atualização do complemento disponível + Existe uma atualização do complemento disponível Error reading repository: - Erro ao ler o repositório: + Erro ao ler o repositório: QgsPluginInstallerDialog QGIS Python Plugin Installer - Instalador de Complemento Python + Instalador de Complemento Python all repositories - todos repositórios + todos os repositórios Install/upgrade plugin - Instala/atualiza complemento + Instalar/atualizar complemento Error reading repository: - Erro ao ler o repositório: + Erro ao ler o repositório: connected - conectado + conectado This repository is connected - Esse repositório está conectado + Esse repositório está conectado unavailable - Indisponível + Indisponível This repository is enabled, but unavailable - Este repositório está habilitado, mas não está disponível + Este repositório está ativado, mas não está disponível disabled - desabilitado + desativado This repository is disabled - Esse repositório está desabilitado + Esse repositório está desativado This repository is blocked due to incompatibility with your Quantum GIS version - Este repositório está bloqueado devido à incompatibilidade com sua versão do QGIS + Este repositório está bloqueado devido à incompatibilidade com sua versão do QGIS orphans - órfãos + órfãos any status - qualquer estado + qualquer estado not installed - não instalado + não instalado installed - Instalado + Instalado upgradeable and news - atualizações e notícias + atualizações e notícias This plugin is not installed - Este complemento não está instalado + Este complemento não está instalado This plugin is installed - Este complemento está instalado + Este complemento está instalado This plugin is installed, but there is an updated version available - Este complemento está instalado, mas existe uma versão atualizada disponível + Este complemento está instalado, mas existe uma versão atualizada disponível This plugin is installed, but I can't find it in any enabled repository - Este complemento está instalado, mas não está sendo encontrado em nenhum repositório habilitado + Este complemento está instalado, mas não está sendo encontrado em nenhum repositório ativado This plugin is not installed and is seen for the first time - Este complemento não está instalado e é visto pela primeira vez + Este complemento não está instalado e é visto pela primeira vez This plugin is installed and is newer than its version available in a repository - Este complemento está instalado e é mais recente que a versão disponível no repositório + Este complemento está instalado e é mais recente que a versão disponível no repositório This plugin is incompatible with your Quantum GIS version and probably won't work. - Este complemento é incompatível com a sua versão QGIS e provavelmente não funcionará. + Este complemento é incompatível com a sua versão QGIS e provavelmente não funcionará. The required Python module is not installed. For more information, please visit its homepage and Quantum GIS wiki. - O módulo Python necessário não está instalado. + O módulo Python necessário não está instalado. Para maiores informações, visite sua página no wiki QGIS. This plugin seems to be broken. It has been installed but can't be loaded. Here is the error message: - Este complemento parece estar quebrado. + Este complemento parece estar quebrado. Foi instalado, mas não pode ser carregado. Aqui está a mensagem de erro: upgradeable - Atualizável + Atualizável new! @@ -34282,7 +34296,7 @@ Aqui está a mensagem de erro: invalid - Inválido + Inválido Note that it's an uninstallable core plugin @@ -34290,39 +34304,39 @@ Aqui está a mensagem de erro: installed version - Versão instalada + Versão instalada available version - Versão disponível + Versão disponível That's the newest available version - Essa é a versão mais recente disponível + Essa é a versão mais recente disponível There is no version available for download - Não há versão disponível para baixar + Não há versão disponível para baixar This plugin is broken - Este complemento está quebrado + Este complemento está quebrado This plugin requires a newer version of Quantum GIS - Este complemento requer uma nova versão do QGIS + Este complemento requer uma nova versão do QGIS at least - pelo menos + pelo menos This plugin requires a missing module - Este complemento requer um módulo em falta + Este complemento requer um módulo em falta only locally available - apenas localmente disponível + apenas disponível localmente - %d plugins available @@ -34330,15 +34344,15 @@ Aqui está a mensagem de erro: Install plugin - Instalar complemento + Instalar complemento Reinstall plugin - Reinstalar complemento + Reinstalar complemento Upgrade plugin - Atualizar complemento + Atualizar complemento Downgrade plugin @@ -34350,11 +34364,11 @@ Aqui está a mensagem de erro: Plugin installation failed - A instalação do complemento falhou + A instalação do complemento falhou Plugin has disappeared - O complemento desapareceu + O complemento desapareceu The plugin seems to have been installed but I don't know where. Probably the plugin package contained a wrong named directory. @@ -34364,47 +34378,47 @@ Procure a lista de complementos instalados. Tenho quase certeza que você vai en Plugin installed successfully - Complemento instalado corretamente + Complemento instalado com sucesso Python plugin installed. Now you need to enable it in Plugin Manager. - Complemento Python instalado. -Agora você precisa habilitá-lo no Gerenciador de Complementos. + Complemento Python instalado. +Agora você precisa ativá-lo no Gerenciador de Complementos. Plugin reinstalled successfully - Complemento reinstalado com sucesso + Complemento reinstalado com sucesso Python plugin reinstalled. You need to restart Quantum GIS in order to reload it. - Complemento Python reinstalado. -Você precisará reiniciar QGIS para recarregá-lo. + Complemento Python reinstalado. +Você precisa reiniciar QGIS para recarregá-lo. The plugin is designed for a newer version of Quantum GIS. The minimum required version is: - O complemento é projetado para uma versão mais recente do QGIS. A versão mínima requerida é: + O complemento é projetado para uma versão mais recente do QGIS. A versão mínima requerida é: The plugin depends on some components missing on your system. You need to install the following Python module in order to enable it: - O complemento depende de alguns componentes que faltam no seu sistema. Você precisa instalar o módulo Python seguinte, a fim de habilitá-lo: + O complemento depende de alguns componentes que faltam no seu sistema. Você precisa instalar o módulo Python seguinte, a fim de habilitá-lo: The plugin is broken. Python said: - O complemento está quebrado. Python disse: + O complemento está quebrado. Python disse: Plugin uninstall failed - Falha na desinstalação do complemento + Falha na desinstalação do complemento Are you sure you want to uninstall the following plugin? - Você tem certeza que quer desinstalar o complemento a seguir? + Você tem certeza que quer desinstalar o complemento a seguir? Warning: this plugin isn't available in any accessible repository! - Atenção: este complemento não está disponível em qualquer repositório acessível! + Atenção: este complemento não está disponível em qualquer repositório acessível! Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation. @@ -34412,11 +34426,11 @@ Você precisará reiniciar QGIS para recarregá-lo. Plugin Installer update uninstalled. Please restart QGIS in order to load its primary version. - Atualização do Instalador de complementos desintalada. Por favor, reinicie o QGIS para carrgar em sua primeira versão. + Atualização do Instalador de complementos desintalada. Por favor, reinicie o QGIS para carregar em sua primeira versão. Plugin uninstalled successfully - Complemento desinstalado com sucesso + Complemento desinstalado com sucesso Python plugin uninstalled. Note that you may need to restart Quantum GIS in order to remove it completely. @@ -34428,11 +34442,11 @@ Você precisará reiniciar QGIS para recarregá-lo. Unable to add another repository with the same URL! - Não é possível adicionar outro repositório com a mesma URL! + Não é possível adicionar outro repositório com o mesmo URL! Are you sure you want to remove the following repository? - Tem certeza que deseja remover o seguinte repositório? + Tem certeza que deseja remover o seguinte repositório? @@ -34441,51 +34455,51 @@ Você precisará reiniciar QGIS para recarregá-lo. QGIS Python Plugin Installer - Instalador de Complementos Python + Instalador de Complementos Python Plugins - Complementos + Complementos List of available and installed plugins - Lista de complementos disponíveis e instalados + Lista de complementos disponíveis e instalados Filter: - Filtrar por: + Filtrar: Display only plugins containing this word in their metadata - Mostra apenas complementos que contenham esta palavra em suas informações + Mostra apenas complementos que contenham esta palavra em suas informações Display only plugins from given repository - Mostra apenas complementos do repositório fornecido + Mostra apenas complementos do repositório fornecido all repositories - todos repositórios + todos os repositórios Display only plugins with matching status - Mostra apenas complementos com situação combinada + Mostra apenas complementos com correspondência de estado Status - Situação + Estado @@ -34506,49 +34520,49 @@ Você precisará reiniciar QGIS para recarregá-lo. Author - Autor + Autor Repository - Repositório + Repositório Upgrade all - + Atualizar todos Install, reinstall or upgrade the selected plugin - Instalar, reinstalar ou atualizar o complemento selecionado + Instalar, reinstalar ou atualizar o complemento selecionado Install/upgrade plugin - Instalar/atualizar complemento + Instalar/atualizar complemento Uninstall the selected plugin - Desinstalar o complemento selecionado + Desinstalar o complemento selecionado Uninstall plugin - Desinstalar complemento + Desinstalar complemento Repositories - Repositórios + Repositórios List of plugin repositories - Lista de repositórios de complementos + Lista de repositórios de complementos @@ -34580,7 +34594,7 @@ Você precisará reiniciar QGIS para recarregá-lo. Check for updates on startup - Verificar por atualizações quando iniciar + Verificar por atualizações quando iniciar Add third party plugin repositories to the list @@ -34594,29 +34608,29 @@ Você precisará reiniciar QGIS para recarregá-lo. Add a new plugin repository - Adicionar um novo repositório de complementos + Adicionar um novo repositório de complementos Add... - Adicionar... + Adicionar... Edit the selected repository - Edita o repositório selecionado + Editar o repositório selecionado Edit... - Editar... + Editar... Remove the selected repository - Remove o repositório selecionado + Remover o repositório selecionado @@ -34626,7 +34640,7 @@ Você precisará reiniciar QGIS para recarregá-lo. The plugins will be installed to ~/.qgis/python/plugins - Os complementos serão instalados em + Os complementos serão instalados em ~/home/nome_do_usuário/.qgis/python/plugins (no Linux) @@ -34638,7 +34652,7 @@ Você precisará reiniciar QGIS para recarregá-lo. Close the Installer window - Fechar a janela do instalador + Fechar a janela do instalador @@ -34653,37 +34667,37 @@ Você precisará reiniciar QGIS para recarregá-lo. Configuration of the plugin installer - Configurações do instalador de complemento + Configurações do instalador de complemento every time QGIS starts - toda vez ao iniciar o QGIS + cada vez que o QGIS iniciar once a day - uma vez por dia + uma vez por dia every 3 days - a cada 3 dias + a cada 3 dias every week - a cada semana + a cada semana every 2 weeks - a cada 2 semanas + a cada 2 semanas every month - a cada mês + a cada mês @@ -34701,22 +34715,22 @@ p, li { white-space: pre-wrap; } Allowed plugins - Complementos permitidos + Complementos permitidos Only show plugins from the official repository - Apenas mostrar complementos do repositório oficial + Apenas mostrar complementos do repositório oficial Show all plugins except those marked as experimental - Mostrar todos os complementos, exceto aqueles marcados como experimentais + Mostrar todos os complementos, exceto aqueles marcados como experimentais Show all plugins, even those marked as experimental - Mostrar todos os complementos, mesmo aqueles marcados como experimentais + Mostrar todos os complementos, mesmo aqueles marcados como experimentais @@ -34736,23 +34750,23 @@ p, li { white-space: pre-wrap; } QgsPluginInstallerFetchingDialog Success - Sucesso + Sucesso Resolving host name... - Resolvendo nome da máquina... + Resolvendo nome da máquina... Connecting... - Conectando... + Conectando... Host connected. Sending request... - Máquina conectada. Enviando pedido... + Máquina conectada. Enviando pedido... Downloading data... - Baixando dados... + Transferindo dados... Idle @@ -34760,7 +34774,7 @@ p, li { white-space: pre-wrap; } Closing connection... - Fechando conexão... + Fechando conexão... Error @@ -34772,58 +34786,58 @@ p, li { white-space: pre-wrap; } Fetching repositories - Buscar repositórios + Buscar repositórios Overall progress: - Progresso global: + Progresso global: Abort fetching - Abortar busca + Abortar busca Repository - Repositório + Repositório State - Estado + Estado QgsPluginInstallerInstallingDialog Installing... - Instalando... + Instalando... Resolving host name... - Resolvendo nome da máquina... + Resolvendo nome da máquina... Connecting... - Conectando... + Conectando... Host connected. Sending request... - Máquina conectada. Enviando pedido... + Máquina conectada. Enviando pedido... Downloading data... - Baixando dados... + Transferindo dados... Idle - Desocupado + Desocupado Closing connection... - Fechando conexão... + Fechando conexão... Error @@ -34831,11 +34845,11 @@ p, li { white-space: pre-wrap; } Failed to unzip the plugin package. Probably it's broken or missing from the repository. You may also want to make sure that you have write permission to the plugin directory: - Falha ao descompactar o pacote de complemento. Provavelmente ele está quebrado ou faltando no repositório. Você também pode querer ter certeza de que você tem permissão de gravação para a pasta de complementos: + Falha ao descompactar o pacote de complemento. Provavelmente ele está quebrado ou faltando no repositório. Você também pode querer ter certeza de que tem permissão de gravação para a pasta de complementos: Aborted by user - Interrompido pelo usuário + Interrompido pelo utilizador @@ -34843,17 +34857,17 @@ p, li { white-space: pre-wrap; } QGIS Python Plugin Installer - Instalador de Complementos Python + Instalador de Complementos Python Installing plugin: - Instalando complementos: + Instalando complementos: Connecting... - Conectando... + Conectando... @@ -34861,7 +34875,7 @@ p, li { white-space: pre-wrap; } Plugin Installer - Instalador de complementos + Instalador de complementos @@ -34881,12 +34895,12 @@ p, li { white-space: pre-wrap; } Keep - Manter + Manter Ask me later - Pergunte-me mais tarde + Pergunte-me mais tarde @@ -34901,7 +34915,7 @@ p, li { white-space: pre-wrap; } Error loading plugin - Erro ao carregar complemento + Erro ao carregar complemento @@ -34911,7 +34925,7 @@ p, li { white-space: pre-wrap; } Do you want to uninstall this plugin now? If you're unsure, probably you would like to do this. - Você gostaria de desinstalar este complemento agora? Se você está em dúvida, desinstale-o. + Você gostaria de desinstalar este complemento agora? Se você não tiver certeza, desinstale-o. @@ -34919,7 +34933,7 @@ p, li { white-space: pre-wrap; } Repository details - Detalhes do repositório + Detalhes do repositório @@ -34930,7 +34944,7 @@ p, li { white-space: pre-wrap; } Enter a name for the repository - Entre com um nome para o repositório + Defina um nome para o repositório @@ -34941,18 +34955,18 @@ p, li { white-space: pre-wrap; } Enter the repository URL, beginning with "http://" - Entre com a URL do repositório, iniciar com "http://" + Defina o URL do repositório, iniciar com "http://" Enable or disable the repository (disabled repositories will be omitted) - Habilita ou desabilita o repositório (repositórios desabilitados serão omitidos) + Ativar ou desativar o repositório (repositórios desativos serão omitidos) Enabled - Habilitado + Ativado @@ -34965,12 +34979,12 @@ p, li { white-space: pre-wrap; } &Select All - &Marcar Todos + &Selecionar Todos &Clear All - &Desmarcar Todos + &Limpar Todos @@ -34981,7 +34995,7 @@ p, li { white-space: pre-wrap; } [ incompatible ] - [ incompatível ] + [ incompatível ] @@ -35010,32 +35024,32 @@ p, li { white-space: pre-wrap; } QGIS Plugin Manager - Gerenciador de Complementos do QGIS + Gerenciador de Complementos do QGIS To enable / disable a plugin, click its checkbox or description - Para habilitar/desabilitar um complemento, clique em sua caixa de seleção ou descrição + Para ativar/desativar um complemento, clique em sua caixa de seleção ou descrição &Filter - &Filtrar por: + &Filtrar Plugin Directory: - Pasta com o(s) complemento(s): + Pasta com o(s) complemento(s): Directory - Pasta + Pasta Plugin Installer - Instalador de complementos + Instalador de complementos @@ -35846,7 +35860,7 @@ Database error: %2 Unable to open %1 - Impossível abrir %1 + Impossível abrir %1 @@ -35889,7 +35903,7 @@ Database error: %2 Ignore - + Ignorar @@ -35945,12 +35959,12 @@ Tentar encontrar as camadas perdidas? Coordinate System Restriction - + Restrição de Sistema de Coordenadas No coordinate systems selected. Disabling restriction. - + Não há sistema de coordenadas selecionado. Desactivando restrição. @@ -35960,59 +35974,60 @@ Tentar encontrar as camadas perdidas? CRS %1 was already selected - + SRC %1 já foi selecionado Coordinate System Restrictions - + Restrições do Sistema de Coordenadas The current selection of coordinate systems will be lost. Proceed? - + O sistema de coordenadas corrente será perdido. +Proceder? Enter scale - + Entrar escala Scale denominator - + Denominador de escala Load scales - + Carregar escalas XML files (*.xml *.XML) - Arquivos XML (*.xml *.XML) + Arquivos XML (*.xml *.XML) Save scales - + Salvar escalas Transparency %1% - + Transparência %1% Select a valid symbol - + Selecione um símbolo válido Invalid symbol : - + Símbolo inválido : @@ -36020,22 +36035,22 @@ Proceed? Project Properties - Propriedades do Projeto + Propriedades do Projeto Meters - Metros + Metros Feet - Pés + Pés Decimal degrees - Graus Decimais + Graus Decimais @@ -36045,12 +36060,12 @@ Proceed? General - Geral + Geral Automatic - Automático + Automático @@ -36065,7 +36080,7 @@ Proceed? Manual - Manual + Manual @@ -36082,12 +36097,12 @@ Proceed? decimal places - casas decimais + casas decimais Precision - Precisão + Precisão Digitizing @@ -36109,37 +36124,37 @@ Proceed? Project title - Título do Projeto + Título do Projeto Selection color - Seleção de cor + Seleção de cor Background color - Cor do fundo + Cor do fundo Degree - + Graus Degree display - + Visualização de graus Degrees, Minutes - + Graus, Minutos Project scales - + Escalas do projeto @@ -36151,37 +36166,37 @@ Proceed? ... - ... + ... Coordinate Reference System (CRS) - Sistema de referência de coordenadas (SRC) + Sistema de referência de coordenadas (SRC) Enable 'on the fly' CRS transformation - Habilita transformação SRC "on the fly" + Habilita transformação SRC "on the fly" General settings - Definições gerais + Definições gerais absolute - absoluto + absoluto relative - relativo + relativo Save paths - Salvar caminhos + Salvar caminhos Layer units (only used when CRS transformation is disabled) @@ -36190,7 +36205,7 @@ Proceed? Degrees, Minutes, Seconds - Graus, Minutos, Segundos + Graus, Minutos, Segundos WMS @@ -36199,7 +36214,7 @@ Proceed? OWS Server - + Servidor OWS @@ -36209,37 +36224,37 @@ Proceed? Title - Título + Título Person - + Pessoa Phone - + Telefone Abstract - Resumo + Resumo E-Mail - + E-mail Organization - + Organização Online resource - + Recurso online @@ -36249,52 +36264,52 @@ Proceed? Advertised Extent - + Extensão Min. X - + Min. X Min. Y - + Min. Y Max. X - + Max. X Max. Y - + Max. Y Use Current Canvas Extent - + Usar extensão actual do mapa Coordinate Systems Restrictions - + Restrições do Sistema de Coordenadas Add - + Adicionar Remove - + Remover Used - + Usado @@ -36304,7 +36319,7 @@ Proceed? Used when CRS transformation is turned off - + Usado quando transformação de SRC está desligado @@ -36314,32 +36329,32 @@ Proceed? Default Styles - + Estilos por defeito Default Symbols - + Símbolos por defeito Marker - Marcador + Marcador Line - Linha + Linha Fill - + Preenchimento Color Ramp - Escala de cor + Rampa de cor @@ -36349,17 +36364,17 @@ Proceed? Options - Opções + Opções Assign random colors to symbols - + Atribuir cores aleatórias aos símbolos Opacity - Opacidade + Opacidade @@ -36369,12 +36384,12 @@ Proceed? Maximum width - + Largura máxima Maximum height - + Altura máxima @@ -36384,7 +36399,7 @@ Proceed? Published - + Publicado @@ -36403,7 +36418,7 @@ Proceed? Identifiable layers - Camadas identificáveis + Camadas identificáveis @@ -36419,7 +36434,7 @@ Proceed? Identifiable - Identificável + Identificável @@ -36431,17 +36446,17 @@ Proceed? User Defined Coordinate Systems - Sistema de coordenadas definida pelo usuário + Sistema de Coordenadas definido pelo usuário Geographic Coordinate Systems - Sistema de Soordenadas Geográficas + Sistema de Coordenadas Geográficas Projected Coordinate Systems - Sistema Projetado de Coordenadas + Sistema de Coordenadas Projectado Find projection @@ -36463,7 +36478,7 @@ Proceed? Because of this the projection selector will not work... Erro ao ler arquivo de base de dados de: %1 -Devido ao seletor de projeção não estar em funcionamento... +Devido a isso, o seletor de projeção não estar em funcionamento... @@ -36472,7 +36487,7 @@ Devido ao seletor de projeção não estar em funcionamento... Authority ID - Autoridade de ID + Autoridade ID Search @@ -36489,34 +36504,34 @@ Devido ao seletor de projeção não estar em funcionamento... Coordinate Reference System Selector - Seletor de Sistema de Referência de Coordenadas + Seletor de Sistema de Referência de Coordenadas Filter - Filtro + Filtro Recently used coordinate reference systems - + Sistemas de Referência de Coordenadas utilizados recentemente Coordinate Reference System - Sistema de Referência de Coordenadas + Sistema de Referência de Coordenadas ID - ID + ID Coordinate reference systems of the world - + Sistemas de Referência de Coordenadas do mundo Authority @@ -36529,7 +36544,7 @@ Devido ao seletor de projeção não estar em funcionamento... Hide deprecated CRSs - Ocultar SRCs obsoletos + Ocultar SRCs obsoletos Recently used coordinate references systems @@ -36541,12 +36556,12 @@ Devido ao seletor de projeção não estar em funcionamento... &Test - &Testar + &Testar &Clear - &Limpar + &Limpar Invalid Query @@ -36567,15 +36582,15 @@ Devido ao seletor de projeção não estar em funcionamento... Query Result - Resultado da Consulta + Resultado da Consulta The where clause returned %n row(s). returned test rows - - A cláusula onde retornou %n linha. - A cláusula onde retornou %n linhas. + + A cláusula Where retornou %n linha. + A cláusula Where retornou %n linhas. @@ -36583,14 +36598,14 @@ Devido ao seletor de projeção não estar em funcionamento... Query Failed - A Consulta Falhou + A Consulta falhou An error occurred when executing the query. - + Ocorreu um erro ao executar a consulta. @@ -36598,7 +36613,8 @@ Devido ao seletor de projeção não estar em funcionamento... The data provider said: %1 - + O fornecedor de dados disse: +%1 An error occurred when executing the query @@ -36607,12 +36623,12 @@ The data provider said: Error in Query - Erro na pergunta + Erro na Consulta The subset string could not be set - A sequência de subconjunto não poderia ser definida + A sequência de subconjunto não poderia ser definida @@ -36620,17 +36636,17 @@ The data provider said: Query Builder - Ferramenta de Consulta + Ferramenta de Consulta Datasource - Fonte de dados + Fonte de dados Fields - Campos + Campos @@ -36646,7 +36662,7 @@ p, li { white-space: pre-wrap; } Values - Valores + Valores @@ -36673,7 +36689,7 @@ p, li { white-space: pre-wrap; } Sample - Amostra + Amostra @@ -36689,27 +36705,27 @@ p, li { white-space: pre-wrap; } All - Tudo + Tudo Use unfiltered layer - + Use uma camada não filtrada Operators - Operadores + Operadores = - = + = < - < + < @@ -36774,7 +36790,7 @@ p, li { white-space: pre-wrap; } SQL where clause - Cláusula onde SQL + SQL cláusula Where @@ -36843,7 +36859,7 @@ p, li { white-space: pre-wrap; } Please wait while your report is generated COMMENTED OUT - Aguarde enquanto o seu relatório é gerado + Aguarde enquanto o seu relatório é gerado @@ -36856,12 +36872,12 @@ p, li { white-space: pre-wrap; } Expression valid - Expressão válida + Expressão válida Expression invalid - Expressão inválida + Expressão inválida @@ -40509,7 +40525,6 @@ por escala number of geometry errors - @@ -41019,24 +41034,24 @@ O erro foi: Snapping and Digitizing Options - + Opções de ressalto e digitalização to vertex - ao vértice + ao vértice to segment - ao segmento + ao segmento to vertex and segment - ao vértice e segmento + ao vértice e segmento @@ -41046,7 +41061,7 @@ O erro foi: pixels - pixels + pixels @@ -41069,12 +41084,12 @@ O erro foi: Mode - Modo + Modo Tolerance - Tolerância + Tolerância @@ -41084,12 +41099,12 @@ O erro foi: Avoid Int. - + Evitar Int. Avoid intersections of new polygons - + Evitar interseções de novos polígonos @@ -41099,7 +41114,7 @@ O erro foi: unknown error cause - Causa de erro desconhecida + Causa de erro desconhecido @@ -41153,7 +41168,8 @@ O erro foi: SQLite error: %2 SQL: %1 - + SQLite erro: %2 +SQL: %1 @@ -41192,7 +41208,7 @@ SQL: %1 unknown cause - + causa desconhecida @@ -41202,7 +41218,7 @@ SQL: %1 FAILURE: Field %1 not found. - + FALHA: Campo %1 não foi encontrado. @@ -41223,7 +41239,7 @@ SQL: %1 All - Tudo + Tudo @@ -41241,55 +41257,57 @@ SQL: %1 Geometry column - Coluna de geometria + Coluna de geometria Sql - Sql + Sql SpatiaLite DB - + BD SpatiaLite All files - + Todos os ficheiros SpatiaLite DB Open Error - Erro de abertura no SpatiaLite DB + Erro de abertura na DB SpatiaLite Database does not exist: %1 - + Base de dados não existe: %1 Failure while connecting to: %1 %2 - Falha ao conectar-se a: %1 + Falha ao conectar-se a: %1 %2 SpatiaLite Error - + Erro SpatiaLite Unexpected error when working with: %1 %2 - + Erro inesperado ao trabalhar com: %1 + +%2 seems to be a valid SQLite DB, but not a SpatiaLite's one ... @@ -41302,7 +41320,7 @@ SQL: %1 Choose a SpatiaLite/SQLite DB to open - Escolher uma SpatiaLite/SQLite DB para abrir + Escolher uma BD SpatiaLite/SQLite para abrir @@ -41312,24 +41330,24 @@ SQL: %1 Select Table - Selecionar Tabela + Selecionar Tabela You must select a table in order to add a Layer. - Você deve selecionar uma tabela para poder adicionar uma Camada. + Você deve selecionar uma tabela para poder adicionar uma Camada. SpatiaLite getTableInfo Error - Erro SpatiaLite getTableInfo + Erro SpatiaLite getTableInfo Failure exploring tables from: %1 %2 - Falha ao explorar tabelas de: %1 + Falha ao explorar tabelas de: %1 %2 @@ -41341,27 +41359,27 @@ SQL: %1 Add SpatiaLite Table(s) - Adicionar tabela(s) SpatiaLite + Adicionar tabela(s) SpatiaLite Databases - + Bases de dados &Add - &Adiciona + &Adicionar &Build Query - + &Criar Consulta @ - @ + @ @@ -41418,12 +41436,12 @@ SQL: %1 Geometry column - Coluna de geometria + Coluna de geometria Sql - Sql + Sql @@ -41873,7 +41891,7 @@ p, li { white-space: pre-wrap; } Query not executed - + Consulta não executada @@ -41905,33 +41923,33 @@ p, li { white-space: pre-wrap; } Select a Spatialite Spatial Reference System - Selecionar o SRC SpatiaLite + Selecionar o SRC SpatiaLite SRID - SRID + SRID Authority - Autoridade + Autoridade Reference Name - Nome de referência + Nome de referência Search - Burcar + Pesquisar Filter - Filtro + Filtro @@ -42202,7 +42220,7 @@ p, li { white-space: pre-wrap; } %1 Invalid table name. %1 -Nome de tabela inválido +Nome de tabela inválido. @@ -44024,7 +44042,7 @@ Existem classes que poderiam ser excluídas antes da classificação? Gradient color ramp - Rampa de gradiente de cor: + Rampa de gradiente de cor @@ -44193,7 +44211,6 @@ Existem classes que poderiam ser excluídas antes da classificação?not added features count - @@ -45363,17 +45380,17 @@ Existem classes que poderiam ser excluídas antes da classificação? Edit... - Editar... + Editar... Delete - Apagar + Apagar Modify WFS connection - Modificar ligação WFS + Modificar ligação WFS @@ -45385,13 +45402,14 @@ Existem classes que poderiam ser excluídas antes da classificação? Abort - Abortar + Abortar Loading WFS data %1 - + Carregando dados WFS +%1 @@ -45406,12 +45424,12 @@ Existem classes que poderiam ser excluídas antes da classificação? unknown - desconhecido + desconhecido received %1 bytes from %2 - recebidos %1 bytes de %2 + recebidos %1 bytes de %2 @@ -45424,12 +45442,12 @@ Existem classes que poderiam ser excluídas antes da classificação? New Connection... - + Nova conexão... Create a new WFS connection - Criar uma nova ligação WFS + Criar uma nova conexão WFS @@ -45447,22 +45465,22 @@ Existem classes que poderiam ser excluídas antes da classificação? Network Error - + Erro de rede Server Exception - + Excepção do servidor No Layers - Sem Camadas + Sem Camadas capabilities document contained no layers. - documento de capacidades não continham camadas. + documento de capacidades não continha camadas. @@ -45472,7 +45490,7 @@ Existem classes que poderiam ser excluídas antes da classificação? Capabilities document is not valid - Documento de capacidades não é válido + Documento de capacidades não é válido GetCapabilities Error @@ -45481,12 +45499,12 @@ Existem classes que poderiam ser excluídas antes da classificação? Load connections - Carregar conexões + Carregar conexões XML files (*.xml *XML) - Arquivos XML (*.xml *XML) + Arquivos XML (*.xml *XML) The capabilities document could not be retrieved from the server @@ -45523,12 +45541,12 @@ Existem classes que poderiam ser excluídas antes da classificação? Change ... - Mudar ... + Mudar ... &New - &Novo + &Novo @@ -45538,7 +45556,7 @@ Existem classes que poderiam ser excluídas antes da classificação? Edit - Editar + Editar @@ -45548,22 +45566,22 @@ Existem classes que poderiam ser excluídas antes da classificação? Load connections from file - + Carregar conexções a partir de ficheiro Load - + Carregar Save connections to file - + Salvar conexões para ficheiro Save - Salvar + Salvar @@ -45574,7 +45592,7 @@ Features Filter - Filtro + Filtro Only request features overlapping the current view extent @@ -45583,17 +45601,17 @@ Features Add WFS Layer from a Server - Adiciona camada WFS de um Servidor + Adicionar camada WFS de um Servidor Coordinate reference system - Sistema de Referência de Coordenadas + Sistema de Referência de Coordenadas Server connections - Conexões de servidor + Conexões de servidor @@ -45607,22 +45625,22 @@ Features 1 - 1 + 1 Attributes - Atributos + Atributos Add - Adicionar + Adicionar Remove - Remover + Remover @@ -45630,7 +45648,7 @@ Features WMS Password for %1 - WMS senha para %1 + WMS senha para %1 @@ -45638,12 +45656,12 @@ Features Edit... - Editar... + Editar... Delete - Apagar + Apagar @@ -45651,7 +45669,7 @@ Features New Connection... - + Nova conexão... @@ -45659,12 +45677,12 @@ Features &Add - &Adiciona + &Adicionar Add selected layers to map - Adicionar camadas selecionadas ao mapa + Adicionar camadas selecionadas ao mapa &Save @@ -45685,17 +45703,17 @@ Features Are you sure you want to remove the %1 connection and all associated settings? - Você quer realmente remover a conexão %1 e todas as configurações associadas? + Você quer realmente remover a conexão %1 e todas as configurações associadas? Confirm Delete - Confirme a exclusão + Confirme a exclusão encoding %1 not supported. - Codificação %1 não suportada. + codificação %1 não suportada. CRS %1 not supported. @@ -45708,17 +45726,17 @@ Features WMS Provider - Provedor WMS + Fornecedor WMS Load connections - Carregar conexões + Carregar conexões XML files (*.xml *XML) - Arquivos XML (*.xml *XML) + Arquivos XML (*.xml *XML) Advertised GetMap URL @@ -45761,13 +45779,13 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Could not open the WMS Provider - Impossível abrir o provedor WMS + Impossível abrir o fornecedor WMS Coordinate Reference System (%n available) crs count - + Sistema de Referência de Coordenadas (%n disponível) Sistema de Referência de Coordenadas (%n disponíveis) @@ -45775,21 +45793,21 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Select layer(s) - Selecionar camada(s) + Selecionar camada(s) Options (%n coordinate reference systems available) crs count - + Opções (%n sistema de seferência de soordenadas disponível) Select layer(s) or a tileset - Selecionar camada(s) ou um 'tileset' + Selecionar camada(s) ou um 'tileset' @@ -45799,17 +45817,17 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? No common CRS for selected layers. - Sem SRC normalmente usados para as camadas selecionadas. + Sem SRC comum para as camadas selecionadas. No CRS selected - Sem SRC selecionado + Sem SRC selecionado No image encoding selected - Sem imagem de codificação selecionada + Sem imagem de codificação selecionada @@ -45836,18 +45854,18 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Could not understand the response. The %1 provider said: %2 - Não foi possível entender a resposta. O provedor de %1 disse: + Não foi possível entender a resposta. O fornecedorr de %1 disse: %2 WMS proxies - WMS proxies + WMS proxies Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. - Muitos servidores WMS foram adicionados a lista de servidores. Note que se você acessa a internet via proxy, será necessário acertar as configurações proxy no diálogo de opções do QGIS + Vários servidores WMS foram adicionados a lista de servidores. Note que se você acessa a internet via proxy, será necessário acertar as configurações proxy no diálogo de opções do QGIS @@ -45857,12 +45875,12 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? network error: %1 - Erro na rede: %1 + Erro na rede: %1 The %1 connection already exists. Do you want to overwrite it? - A %1 conexão já existe. Deseja substituí-la? + A %1 conexão já existe. Deseja substituí-la? @@ -45875,27 +45893,27 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Add Layer(s) from a Server - Adiciona camada(s) de um servidor + Adiciona camada(s) de um servidor Save connections to file - + Salvar conexões para um ficheiro C&onnect - C&onectar + C&onectar &New - &Novo + &Novo Edit - Editar + Editar @@ -45905,17 +45923,17 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Adds a few example WMS servers - Adiciona algum exemplo de servidor WMS + Adicionar alguns exemplos de servidores WMS Add default servers - Adicionar servidores padrões + Adicionar servidores padrões ID - ID + ID @@ -45932,7 +45950,7 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Abstract - Resumo + Resumo Use base url instead of advertised GetFeatureInfo URL @@ -45949,22 +45967,22 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Save - Salvar + Salvar Load connections from file - + Carregar conexções a partir do ficheiro Load - + Carregar Layer Order - Ordem de camada + Ordem de camada @@ -45976,12 +45994,12 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Style - Estilo + Estilo Tileset - + Tileset @@ -45991,12 +46009,12 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Search - Procurar + Pesquisar URL - URL + URL @@ -46006,12 +46024,12 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Add selected row to WMS list - Adicionar linha selecionada para lista WMS + Adicionar linha selecionada para lista WMS Image encoding - Codificação da imagem + Codificação da imagem @@ -46026,17 +46044,17 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Layer name - Nome da camada + Nome da camada Coordinate Reference System - Sistema de coordenadas de Referência + Sistema de coordenadas de Referência Change ... - Mudar ... + Mudar ... @@ -46046,32 +46064,32 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? Feature limit for GetFeatureInfo - + Limite de elementos para GetFeatureInfo 10 - 10 + 10 Move selected layer UP - + Mover camada selecionada para cima Up - Cima + Cima Move selected layer DOWN - + Mover camada selecionada para baixo Down - Baixo + Baixo @@ -46094,12 +46112,12 @@ Isso pode ser um erro de configuração do servidor. Deveria a URL ser usada? CRS - SRC + SRC Ready - Pronto + Pronto @@ -49041,12 +49059,12 @@ additional algorithm providers Change - + Mudar Color - Cor + Cor @@ -49061,7 +49079,7 @@ additional algorithm providers SVG Groups - + Grupos SVG @@ -49079,62 +49097,62 @@ additional algorithm providers Form - Formulário + Formulário X attribute - + Atributo X Y attribute - + Atributo Y Scale - Escala + Escala Vector field type - + Tipo de campo vectorial Cartesian - + Cartesiano Polar - + Polar Height only - + Apenas altura Angle units - + Unidade de ângulo Degrees - Graus + Graus Radians - Radianos + Radianos Angle orientation - + Orentação de ângulo @@ -49169,13 +49187,13 @@ additional algorithm providers Converts DXF files in Shapefile format - Converte arquivos DXF em SHP + Converte arquivos DXF em SHP &Dxf2Shp - &Dxf2SHP + &Dxf2SHP @@ -49193,7 +49211,7 @@ additional algorithm providers Dxf Importer - Importador DXF + Importador DXF Input Dxf file @@ -49208,33 +49226,33 @@ additional algorithm providers Output file type - Tipo de arquivo de saída + Tipo de arquivo de saída Polyline - Polilinha + Polilinha Export text labels - Exportar rótulos de texto + Exportar rótulos de texto Warning - Aviso + Aviso Please specify a file to convert. - + Por favor, especifique um arquivo a ser convertido. Please specify an output file - + Pr favor, especifique um arquivo de saída @@ -49263,37 +49281,37 @@ Para suporte envie um email para scala@itc.cnr.it Choose a DXF file to open - Escolha um arquivo DXF para abrir + Escolha um arquivo DXF para abrir DXF files - + Ficheiros DXF Shapefile - + Shapefile Choose a file name to save to - Escolha um nome de arquivo para salvar como + Escolha um nome de arquivo para salvar como Input and output - Entrada e saída + Entrada e saída Input DXF file - + Ficheiro DXF de entrada Output file - Arquivo de saída + Arquivo de saída @@ -49564,7 +49582,7 @@ p, li { white-space: pre-wrap; } Output Console - Console de saída. + Console de saída diff --git a/i18n/qgis_sv.ts b/i18n/qgis_sv.ts index 3c6fc841adf6..cbf6db8166f3 100644 --- a/i18n/qgis_sv.ts +++ b/i18n/qgis_sv.ts @@ -1064,27 +1064,27 @@ Vill du lägga till det nya lagret till innehållsförteckningen? Standard distance - + (Optional) Weight field - + (Optional) Unique ID field - + Coordinate statistics - + No input vector layer specified - + Please specify at least one summary statistic - + CRS warning! @@ -1097,37 +1097,37 @@ This may cause unexpected results. Summary field - + Please specify valid extent coordinates - + Invalid extent coordinates entered - + Generate Vector Grid - + No input shapefile specified - + Cannot define projection for PostGIS data...yet! - + Defined Projection For: %1.shp - + Please select the projection system that defines the current layer. - + Layer CRS information will be updated to the selected CRS. @@ -1136,55 +1136,55 @@ This may cause unexpected results. Created output shapefiles in folder: %1 - + creating new selection - + adding to current selection - + removing from current selection - + Select features in: - + that intersect features in: - + Modify current selection by: - + Please specify input layer - + Please specify select layer - + Sum Line Lengths In Polyons - + Please specify input polygon vector layer - + Please specify input line vector layer - + Please specify output length field - + length field @@ -1192,47 +1192,47 @@ This may cause unexpected results. Please specify an input field - + Random Points - + unstratified - + stratified - + density - + field - + Unknown layer type... - + Please properly specify extent coordinates - + Finished - + Processing completed. - + Count Points in Polygon - + Missing or invalid CRS @@ -1240,15 +1240,15 @@ This may cause unexpected results. Count Points In Polygon - + Please specify input point vector layer - + Please specify output count field - + Please select a raster layer @@ -1256,15 +1256,15 @@ This may cause unexpected results. Unable to compute extents aligned on selected raster layer - + Densify geometries - + Vertices to add - + Warning @@ -1274,7 +1274,7 @@ This may cause unexpected results. Currently QGIS doesn't allow simultaneous access from different threads to the same datasource. Make sure your layer's attribute tables are closed. Continue? - + Error @@ -1282,43 +1282,43 @@ This may cause unexpected results. Create Point Distance Matrix - + Please specify input point layer - + Please specify output file - + Please specify target point layer - + Please specify target unique ID field - + Error loading output shapefile: %1 - + Merge shapefiles - + Select by layers in the folder - + Shapefile type - + @@ -1338,52 +1338,52 @@ This may cause unexpected results. Input directory - + Add result to map canvas - + Simplify geometries - + Input line or polygon layer - + Simplify tolerance - + Save to new file - + Add result to canvas - + Build spatial index - + Skapa spatialt index Select files from disk - + Select files... - + @@ -1393,12 +1393,12 @@ This may cause unexpected results. Select none - + Clear list - + Rensa listan @@ -1433,7 +1433,7 @@ This may cause unexpected results. geom - + geom @@ -1443,37 +1443,37 @@ This may cause unexpected results. POINT - + POINT LINESTRING - + LINESTRING POLYGON - + POLYGON MULTIPOINT - + MULTIPOINT MULTILINESTRING - + MULTILINESTRING MULTIPOLYGON - + MULTIPOLYGON GEOMETRYCOLLECTION - + GEOMETRYCOLLECTION @@ -1488,7 +1488,7 @@ This may cause unexpected results. -1 - + -1 @@ -1496,7 +1496,7 @@ This may cause unexpected results. Add constraint - + @@ -1506,12 +1506,12 @@ This may cause unexpected results. Primary key - + Primärnyckel Unique - + Unik @@ -1519,7 +1519,7 @@ This may cause unexpected results. Create index - + Skapa index @@ -1537,7 +1537,7 @@ This may cause unexpected results. Create Table - + @@ -1553,12 +1553,12 @@ This may cause unexpected results. Add field - + Delete field - + @@ -1573,52 +1573,52 @@ This may cause unexpected results. Primary key - + Primärnyckel Create geometry column - + Skapa geometrikolumn POINT - + POINT LINESTRING - + LINESTRING POLYGON - + POLYGON MULTIPOINT - + MULTIPOINT MULTILINESTRING - + MULTILINESTRING MULTIPOLYGON - + MULTIPOLYGON GEOMETRYCOLLECTION - + GEOMETRYCOLLECTION geom - + geom @@ -1633,12 +1633,12 @@ This may cause unexpected results. -1 - + -1 Create spatial index - + Skapa spatialt index @@ -1651,17 +1651,17 @@ This may cause unexpected results. An error occured: - + An error occured when executing a query: - + Query: - + @@ -1669,7 +1669,7 @@ This may cause unexpected results. Field properties - + @@ -1684,12 +1684,12 @@ This may cause unexpected results. Can be NULL - + Default value - + Standardvärde @@ -1702,7 +1702,7 @@ This may cause unexpected results. Import vector layer - + @@ -1712,7 +1712,7 @@ This may cause unexpected results. Table: - + @@ -1722,17 +1722,17 @@ This may cause unexpected results. Create new table - + Drop existing one - + Append data into table - + @@ -1742,7 +1742,7 @@ This may cause unexpected results. Primary key: - + @@ -1752,12 +1752,12 @@ This may cause unexpected results. Source SRID: - + Target SRID: - + @@ -1767,12 +1767,12 @@ This may cause unexpected results. Create single-part geometries instead of multi-part - + Create spatial index - + Skapa spatialt index @@ -1780,17 +1780,17 @@ This may cause unexpected results. SQL window - + SQL query: - + &Execute (F5) - + @@ -1800,23 +1800,23 @@ This may cause unexpected results. &Clear - + Result: - + Load as new layer - + Column with unique integer values - + @@ -1827,12 +1827,12 @@ integer values Retrieve columns - + Layer name (prefix) - + @@ -1852,26 +1852,26 @@ columns Load now! - + <html><head/><body><p>Avoid selecting feature by id. Sometimes - especially when running expensive queries/views - fetching the data sequentially instead of fetching features by id can be much quicker.</p></body></html> - + Avoid selecting by feature id - + Sorry - + You must fill the required fields: geometry column - column with unique integer values - + @@ -1890,7 +1890,7 @@ geometry column - column with unique integer values Table properties - + @@ -1900,7 +1900,7 @@ geometry column - column with unique integer values Table columns: - + @@ -1910,12 +1910,12 @@ geometry column - column with unique integer values Add geometry column - + Edit column - + @@ -1925,47 +1925,47 @@ geometry column - column with unique integer values Constraints - + Primary, foreign keys, unique and check constraints: - + Add primary key / unique - + Delete constraint - + Indexes - + Indexes defined for this table: - + Add index - + Add spatial index - + Delete index - + @@ -1973,12 +1973,12 @@ geometry column - column with unique integer values Add versioning support to a table - + Table is expected to be empty, with a primary key. - + @@ -1993,66 +1993,66 @@ geometry column - column with unique integer values create a view with current content (<TABLE>_current) - + New columns - + Prim. key - + id_hist - + Start time - + time_start - + End time - + time_end - + SQL to be executed: - + GdalTools The process failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program. - + The process crashed some time after starting successfully. - + An unknown error occurred. - + The selected file is not a supported OGR format - + Quantum GIS version detected: @@ -2061,27 +2061,27 @@ geometry column - column with unique integer values This version of Gdal Tools requires at least QGIS version 1.0.0 Plugin will not be enabled. - + Builds a VRT from a list of datasets - + Contour - + Builds vector contour lines from a DEM - + Burns vector geometries into a raster - + Produces a polygon feature layer from a raster - + Merge @@ -2089,39 +2089,39 @@ Plugin will not be enabled. Build a quick mosaic from a set of images - + Sieve - + Removes small raster polygons - + Produces a raster proximity map - + Near black - + Convert nearly black/white borders to exact value - + Warp an image into a new coordinate system - + Create raster from the scattered data - + Converts raster data between different formats - + Information @@ -2129,149 +2129,149 @@ Plugin will not be enabled. Lists information about raster dataset - + Assign projection - + Add projection info to the raster - + Build Virtual Raster (Catalog) - + Rasterize (Vector to raster) - + Polygonize (Raster to vector) - + Proximity (Raster distance) - + Warp (Reproject) - + Grid (Interpolation) - + Translate (Convert format) - + Build overviews (Pyramids) - + Builds or rebuilds overview images - + Clipper - + RGB to PCT - + Convert a 24bit RGB image to 8bit paletted - + PCT to RGB - + Convert an 8bit paletted image to 24bit RGB - + Tile index - + Build a shapefile as a raster tileindex - + DEM (Terrain models) - + Plugin error - + Unable to load %1 plugin. The required "%2" module is missing. Install it and try again. - + Projections - + Extract projection - + Extract projection information from raster(s) - + Conversion - + Extraction - + Analysis - + Fill nodata - + Fill raster regions by interpolation from edges - + Tool to analyze and visualize DEMs - + Miscellaneous - + GdalTools settings - + Various settings for Gdal Tools - + &Input directory - + &Output directory - + @@ -2279,12 +2279,12 @@ Install it and try again. About Gdal Tools - + GDAL Tools - + @@ -2298,7 +2298,7 @@ Install it and try again. p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></body></html> - + @@ -2315,11 +2315,11 @@ p, li { white-space: pre-wrap; } GdalToolsBaseBatchWidget Finished - + Operation completed. - + Warning @@ -2328,7 +2328,7 @@ p, li { white-space: pre-wrap; } The following files were not created: %1 - + @@ -2340,11 +2340,11 @@ p, li { white-space: pre-wrap; } The command is still running. Do you want terminate it anyway? - + Invalid parameters. - + @@ -2355,19 +2355,19 @@ Do you want terminate it anyway? No output file created. - + Finished - + Processing completed. - + %1 not created. - + @@ -2380,7 +2380,7 @@ Do you want terminate it anyway? &Load into canvas when finished - + @@ -2392,27 +2392,27 @@ Do you want terminate it anyway? Reset - + Select the input file for Proximity - + Select the raster file to save the results to - + Select the input file for Near Black - + Select the input file for Grid - + Select the input directory with files to Merge - + Warning @@ -2424,176 +2424,176 @@ Do you want terminate it anyway? Select the file to analyse - + Select the input directory with files to Assign projection - + Finished - + Processing completed. - + %1 not created. - + Assign projection - + This raster already found in map canvas - + Select the files for VRT - + Select where to save the VRT - + VRT (*.vrt) - + Select the input file for Warp - + Select the mask file - + Select the input directory with files to Warp - + Select the output directory to save the results to - + Select the input file for Sieve - + Select the files to Merge - + Select where to save the Merge output - + Select the input file for convert - + Select the input directory with files for convert - + Select the file for DEM - + Select the color configuration file - + Select the input file for Polygonize - + Select where to save the Polygonize output - + Select the input file for Contour - + Select where to save the Contour output - + Select the input file for Translate - + Select the input directory with files to Translate - + Translate - srcwin - + Image coordinates (pixels) must be integer numbers. - + Translate - prjwin - + Image coordinates (geographic) must be numbers. - + Select the files to analyse - + Output size required - + The output file doesn't exist. You must set up the output size to create it. - + Convert paletted image to RGB - + Select the input file for Rasterize - + Copy - + Copy all - + Select the input directory with files for VRT - + Select the input directory with raster files - + Select where to save the TileIndex output - + Error retrieving the extent - + GDAL was unable to retrieve the extent from any file. The "Use intersected extent" option will be unchecked. - + Empty extent @@ -2602,40 +2602,40 @@ The "Use intersected extent" option will be unchecked. The computed extent is empty. Disable the "Use intersected extent" option to have a nonempty output. - + Select the input file - + Select the input directory with files - + Extract projection - + Batch mode (for processing whole directory) - + &Input file - + Recurse subdirectories - + Create also prj file - + @@ -2643,12 +2643,12 @@ Disable the "Use intersected extent" option to have a nonempty output. Select the extent by drag on canvas - + or change the extent coordinates - + @@ -2675,7 +2675,7 @@ Disable the "Use intersected extent" option to have a nonempty output. Re-Enable - + @@ -2683,7 +2683,7 @@ Disable the "Use intersected extent" option to have a nonempty output. Select... - + @@ -2714,12 +2714,12 @@ Disable the "Use intersected extent" option to have a nonempty output. Gdal Tools settings - + Path to the GDAL executables - + @@ -2733,22 +2733,22 @@ Disable the "Use intersected extent" option to have a nonempty output. Path to the GDAL python modules - + GDAL help path - + GDAL data path - + GDAL driver path - + A list of colon-separated (Linux and MacOS) or @@ -2757,29 +2757,29 @@ and python executables. MacOS users usually need to set it to something like /Library/Frameworks/GDAL.framework/Versions/1.8/Programs - + A list of colon-separated (Linux and MacOS) or semicolon-separated (Windows) paths to python modules. - + Useful to open local GDAL documentation instead of online help when pressing on the tool dialog's Help button. - + Select directory with GDAL executables - + Select directory with GDAL python modules - + Select directory with the GDAL documentation - + @@ -2790,29 +2790,29 @@ when pressing on the tool dialog's Help button. Select... - + &Input files - + Build Virtual Raster (Catalog) - + Use visible raster layers for input - + Choose input directory instead of files - + @@ -2828,17 +2828,17 @@ when pressing on the tool dialog's Help button. &Output file - + &Resolution - + Highest - + @@ -2848,38 +2848,38 @@ when pressing on the tool dialog's Help button. Lowest - + &Source No Data - + Se&parate - + Allow projection difference - + Clipper - + &No data value - + Clipping mode - + @@ -2892,12 +2892,12 @@ when pressing on the tool dialog's Help button. Mask layer - + Create an output alpha band - + 1 @@ -2918,53 +2918,53 @@ when pressing on the tool dialog's Help button. Grab pseudocolor table from the first image - + Contour - + &Input file (raster) - + &Output directory for contour lines (shapefile) - + &Output file for contour lines (vector) - + I&nterval between contour lines - + &Attribute name - + If not provided, no elevation attribute is attached. - + ELEV - + Convert RGB image to paletted - + @@ -2974,7 +2974,7 @@ when pressing on the tool dialog's Help button. Batch mode (for processing whole directory) - + @@ -2987,57 +2987,57 @@ when pressing on the tool dialog's Help button. &Input file - + Number of colors - + Band to convert - + &Z Field - + &Algorithm - + Inverse distance to a power - + Moving average - + Nearest neighbor - + Data metrics - + Power - + Smoothing - + @@ -3045,7 +3045,7 @@ when pressing on the tool dialog's Help button. Radius1 - + @@ -3053,7 +3053,7 @@ when pressing on the tool dialog's Help button. Radius2 - + @@ -3080,19 +3080,19 @@ when pressing on the tool dialog's Help button. Max points - + Grid (Interpolation) - + Min points - + @@ -3101,12 +3101,12 @@ when pressing on the tool dialog's Help button. No data - + Metrics - + @@ -3131,17 +3131,17 @@ when pressing on the tool dialog's Help button. Raster info - + Suppress GCP printing - + Suppress metadata printing - + @@ -3151,165 +3151,165 @@ when pressing on the tool dialog's Help button. Layer stack - + Use intersected extent - + DEM (Terrain models) - + &Input file (DEM raster) - + &Band - + Compute &edges - + &Mode - + Hillshade - + Slope - + Aspect - + Color relief - + TRI (Terrain Ruggedness Index) - + TPI (Topographic Position Index) - + Roughness - + Use Zevenbergen&&Thorne formula (instead of the Horn's one) - + Z factor (vertical exaggeration) - + Scale (ratio of vert. units to horiz.) - + Azimuth of the light - + Altitude of the light - + Slope expressed as percent (instead of as degrees) - + Return trigonometric angle (instead of azimuth) - + Return 0 for flat (instead of -9999) - + Color configuration file - + Matching mode - + Exact color (otherwise "0,0,0,0" RGBA) - + Nearest color - + Add alpha channel - + &Creation Options - + Near Black - + How &far from black (or white) - + Search for nearly &white (255) pixels instead of black ones - + Build overviews (Pyramids) - + @@ -3319,17 +3319,17 @@ when pressing on the tool dialog's Help button. nearest - + average - + gauss - + @@ -3339,123 +3339,123 @@ when pressing on the tool dialog's Help button. average_mp - + average_magphase - + mode - + Levels (space delimited) - + Remove all overviews. - + Clean - + In order to generate external overview (for GeoTIFF especially). - + Open in read-only mode - + Create external overviews in TIFF format, compressed using JPEG. - + Overviews in TIFF format with JPEG compression - + For JPEG compressed external overviews, the JPEG quality can be set. - + JPEG Quality (1-100) - + Alternate overview format using Erdas Imagine format, placing the overviews in an associated .aux file suitable for direct use with Imagine,ArcGIS, GDAL. - + Use Imagine format (.aux file) - + Polygonize (Raster to vector) - + &Output file for polygons (shapefile) - + &Field name - + DN - + Use mask - + Assign projection - + WARNING: current projection definition will be cleared - + Desired SRS - + Output will be: - new GeoTiff if input file is not GeoTiff - overwritten if input is GeoTiff - + @@ -3463,47 +3463,47 @@ suitable for direct use with Imagine,ArcGIS, GDAL. Recurse subdirectories - + Proximity (Raster distance) - + &Values - + &Dist units - + GEO - + PIXEL - + &Max dist - + &No data - + &Fixed buf val - + @@ -3514,42 +3514,42 @@ suitable for direct use with Imagine,ArcGIS, GDAL. Rasterize (Vector to raster) - + &Input file (shapefile) - + &Attribute field - + &Output file for rasterized vectors (raster) - + New size (required if output file doens't exist) - + Sieve - + &Threshold - + &Pixel connections - + @@ -3565,7 +3565,7 @@ suitable for direct use with Imagine,ArcGIS, GDAL. Percentage to resize image. This will change pixel size/image resolution accordingly: 25% will create an image with pixels 4x larger. - + @@ -3576,7 +3576,7 @@ suitable for direct use with Imagine,ArcGIS, GDAL. Assign a specified nodata value to output bands. - + @@ -3584,64 +3584,64 @@ suitable for direct use with Imagine,ArcGIS, GDAL. To expose a dataset with 1 band with a color table as a dataset with 3 (RGB) or 4 (RGBA) bands. Useful for output drivers such as JPEG, JPEG2000, MrSID, ECW that don't support color indexed datasets. The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a color table that only contains gray levels to a gray indexed dataset. - + Fill Nodata - + &Input Layer - + Search distance - + Smooth iterations - + Band to operate on - + Validity mask - + Do not use the default validity mask - + Translate (Convert format) - + &Target SRS - + Outsize - + Expand - + @@ -3651,60 +3651,60 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a RGB - + RGBA - + Selects a subwindow from the source image for copying based on pixel/line location. (Enter Xoff Yoff Xsize Ysize) - + Srcwin - + Prjwin - + Selects a subwindow from the source image for copying (like -srcwin) but with the corners given in georeferenced coordinates. (Enter ulx uly lrx lry) - + Copy all subdatasets of this file to individual output files. Use with formats like HDF or OGDI that have subdatasets. - + Sds - + Output format - + Near - + Bilinear - + @@ -3714,7 +3714,7 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a Cubic spline - + @@ -3724,53 +3724,53 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a No data values - + MB - + &Source SRS - + Warp (Reproject) - + &Resampling method - + &Memory used for caching - + Resize - + Use m&ultithreaded warping implementation - + Raster tile index - + Input directory - + @@ -3780,22 +3780,22 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a Tile index field - + location - + Write absolute path - + Skip files with different projection ref - + @@ -3862,7 +3862,7 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a Ellipsoid - + Polygon centroids @@ -3882,15 +3882,15 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a Voronoi polygon - + Buffer region - + Lines to polygons - + Input line vector layer @@ -3916,7 +3916,7 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a Currently QGIS doesn't allow simultaneous access from different threads to the same datasource. Make sure your layer's attribute tables are closed. Continue? - + Unable to delete incomplete shapefile. @@ -3925,12 +3925,12 @@ The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a At least two features must have same attribute value! Please choose another field... - + One or more features in the output layer may have invalid geometry, please check using the check validity tool - + Created output shapefile: @@ -3947,7 +3947,7 @@ Vill du lägga till det nya lagret till innehållsförteckningen? {1 Layer '%1' updated - + Error writing output shapefile. @@ -3959,7 +3959,7 @@ Vill du lägga till det nya lagret till innehållsförteckningen? {1 Geometry - + Geoprocessing @@ -3972,12 +3972,12 @@ Vill du lägga till det nya lagret till innehållsförteckningen? {1 Error processing specified tolerance! Please choose larger tolerance... - + Error loading output shapefile: %1 - + @@ -4024,7 +4024,7 @@ Please choose larger tolerance... Create convex hulls based on input field - + Convex hull(s) @@ -4085,7 +4085,7 @@ Please choose larger tolerance... No output created. File creation error: %1 - + @@ -4114,121 +4114,132 @@ Vill du lägga till det nya lagret till innehållsförteckningen? Input CRS error: Different input coordinate reference systems detected, results may not be as expected. - + Input CRS error: One or more input layers missing coordinate reference information, results may not be as expected. - + Feature geometry error: One or more output features ignored due to invalid geometry. - + GEOS geoprocessing error: One or more input features have invalid geometry. - + Created output shapefile: %1 %2%3 - + Error loading output shapefile: %1 - + GlobePlugin - + Launch Globe - + - + Globe Settings + + + + + Unload Globe - + Overlay data on a 3D globe - + - + Settings for 3D globe - + - - &Globe + Unload globe + + + + + &Globe + + Heatmap Heatmap - + Creates a heatmap raster for the input point vector. - + &Heatmap - + GDAL driver error - + Cannot open the driver for the specified format - + Raster update error - + Could not open the created raster for updating. The heatmap was not generated. - + Point layer error - + Could not identify the vector data provider. - + Heatmap generation aborted - + QGIS will now load the partially-computed raster. - + @@ -4236,37 +4247,37 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Save Heatmap as: - + No valid layers found! - + Advanced options cannot be enabled. - + Invalid output filename - + Please enter a valid output file path and name. - + Layer not found - + Layer %1 not found. - + @@ -4274,17 +4285,17 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Heatmap Plugin - + Input Point Vector - + Output Raster - + @@ -4294,12 +4305,12 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Output Format - + Radius - + @@ -4321,7 +4332,7 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Decay Ratio - + @@ -4336,12 +4347,12 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Row - + Cell Size X - + @@ -4351,17 +4362,17 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Cell Size Y - + Use Radius from field - + Use Weight from field - + @@ -4374,12 +4385,12 @@ GEOS geoprocessing error: One or more input features have invalid geometry. Symbol layer type - + Typ av symbollager This layer doesn't have any editable properties - + Detta lagret har inga redigeringsbara inställningar @@ -5027,22 +5038,22 @@ Fungerar på alla redigerbara lager Local Cumulative Cut Stretch - + Local cumulative cut stretch using current extent, default limits and estimated values. - + Full Dataset Cumulative Cut Stretch - + Cumulative cut stretch using full dataset extent, default limits and estimated values. - + @@ -5064,7 +5075,7 @@ Fungear på aktuellt redigerbart lager Html Annotation - + HTML-etikett Add PostGIS Layer... @@ -5147,7 +5158,7 @@ Fungear på aktuellt redigerbart lager Stretch Histogram to Full Dataset - + @@ -5157,12 +5168,12 @@ Fungear på aktuellt redigerbart lager mActionCatchForCustomization - + mActionCatchForCustomization This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization - + This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization @@ -5408,12 +5419,12 @@ Fungear på aktuellt redigerbart lager Local Histogram Stretch - + Stretch histogram of active raster to view extents - + @@ -5484,7 +5495,7 @@ Fungear på aktuellt redigerbart lager Full histogram stretch - + @@ -5588,12 +5599,12 @@ Fungear på aktuellt redigerbart lager Create OSM relation - + Relation type: - + @@ -5612,7 +5623,7 @@ Fungear på aktuellt redigerbart lager Members - + @@ -5627,57 +5638,57 @@ Fungear på aktuellt redigerbart lager Show type description - + Shows brief description of selected relation type. - + Generate tags - + Fills tag table with tags that are typical for relation of specified type. - + Remove all selected tags - + Removes all selected tags. - + Select member on map - + Starts process of selecting next relation member on map. - + Remove all selected members - + Removes all selected members. - + Save @@ -5685,31 +5696,31 @@ Fungear på aktuellt redigerbart lager Edit OSM relation - + for grouping boundaries and marking enclaves / exclaves - + to put holes into areas (might have to be renamed, see article) - + any kind of turn restriction - + like bus routes, cycle routes and numbered highways - + traffic enforcement devices; speed cameras, redlight cameras, weight checks, ... - + OSM Information - + @@ -5852,40 +5863,40 @@ Fungear på aktuellt redigerbart lager OsmFeatureDW OSM Plugin - + The 'Create OSM Relation' dialog was closed automatically because current OSM database was changed. - + OSM Feature Dock Widget - + Choose OSM feature first. - + Choose relation for editing first. - + Snapping ON. Hold Ctrl to disable it. - + Hide OSM Edit History - + Show OSM Edit History - + OSM Feature - + @@ -5909,22 +5920,22 @@ Fungear på aktuellt redigerbart lager Create point - + Create line - + Create polygon - + Create relation - + @@ -5945,27 +5956,27 @@ Fungear på aktuellt redigerbart lager Show/Hide OSM Edit History - + Feature: - + TYPE, ID: - + CREATED: - + USER: - + @@ -5984,38 +5995,38 @@ Fungear på aktuellt redigerbart lager Remove selected tags - + Relations - + Add relation - + Edit relation - + Remove relation - + Relation tags: - + @@ -6025,28 +6036,28 @@ Fungear på aktuellt redigerbart lager Relation members: - + Identify feature - + Move feature - + Remove this feature - + @@ -6054,12 +6065,12 @@ Fungear på aktuellt redigerbart lager Import data to OSM - + In this dialog you can import a layer loaded in QGIS into active OSM data. - + @@ -6069,19 +6080,19 @@ Fungear på aktuellt redigerbart lager Import only current selection - + Layer doesn't exist - + The selected layer doesn't exist anymore! - + Importing features... - + Cancel @@ -6093,7 +6104,7 @@ Fungear på aktuellt redigerbart lager Import has been completed. - + @@ -6101,12 +6112,12 @@ Fungear på aktuellt redigerbart lager Load OSM - + OpenStreetMap file to load: - + @@ -6116,7 +6127,7 @@ Fungear på aktuellt redigerbart lager Add columns for tags: - + @@ -6126,11 +6137,11 @@ Fungear på aktuellt redigerbart lager Replace current data (current layers will be removed) - + Choose an Open Street Map file - + OSM Files (*.osm) @@ -6138,15 +6149,15 @@ Fungear på aktuellt redigerbart lager OSM Load - + Please enter path to OSM data file. - + Path to OSM file is invalid: %1. - + Error @@ -6154,54 +6165,54 @@ Fungear på aktuellt redigerbart lager Layers of OSM file "%1" are loaded already. - + Failed to load polygon layer. - + Failed to load line layer. - + Failed to load point layer. - + Could not connect to setRenderer signal. - + Failed to load layers: %1 - + OsmPlugin Load OSM from file - + Load OpenStreetMap from file - + Import data from a layer - + Import data from a layer to OpenStreetMap - + Save OSM to file - + Save OpenStreetMap to file - + Download OSM data @@ -6209,69 +6220,69 @@ Fungear på aktuellt redigerbart lager Download OpenStreetMap data - + Upload OSM data - + Upload OpenStreetMap data - + Show/Hide OSM Feature Manager - + Show/Hide OpenStreetMap Feature Manager - + Sorry - + You don't have OSM provider installed! - + OSM Save to file - + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. Please change this situation first, because OSM Plugin doesn't know what to save. - + OSM Upload - + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. Please change this situation first, because OSM Plugin doesn't know what to upload. - + OSM Import - + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. Please change this situation first, because OSM Plugin doesn't know what layer will be destination of the import. - + There are currently no available vector layers. - + OsmSaveDlg Choose an Open Street Map file - + OSM Files (*.osm) @@ -6279,7 +6290,7 @@ Please change this situation first, because OSM Plugin doesn't know what la Save OSM to file - + Unable to save the file %1: %2. @@ -6287,33 +6298,33 @@ Please change this situation first, because OSM Plugin doesn't know what la Initializing... - + Saving nodes... - + Saving lines... - + Saving polygons... - + Saving relations... - + Save OSM - + Where to save: - + @@ -6323,7 +6334,7 @@ Please change this situation first, because OSM Plugin doesn't know what la Features to save: - + @@ -6338,17 +6349,17 @@ Please change this situation first, because OSM Plugin doesn't know what la Polygons - + Relations - + Tags - + @@ -6356,14 +6367,14 @@ Please change this situation first, because OSM Plugin doesn't know what la OSM Edit History - + Clear all - + @@ -6391,11 +6402,11 @@ Please change this situation first, because OSM Plugin doesn't know what la OsmUploadDlg Upload - + OSM Upload - + Uploading data... @@ -6403,77 +6414,77 @@ Please change this situation first, because OSM Plugin doesn't know what la Node addition failed. - + Node update failed. - + Node deletion failed. - + Way addition failed. - + Way update failed. - + Way deletion failed. - + Relation addition failed. - + Relation update failed. - + Relation deletion failed. - + Connection to OpenStreetMap server cannot be established. Please check your proxy settings, firewall settings and try again. - + Changeset closing failed. - + Upload process failed. OpenStreetMap server response: %1 - %2. - + Authentication failed. Please try again with correct login and password. - + Setting host failed. - + Setting user and password failed. - + Setting proxy failed. - + Upload OSM data - + Ready for upload - + @@ -6503,39 +6514,39 @@ Please change this situation first, because OSM Plugin doesn't know what la Comment on your changes: - + OSM account - + Username: - + Password: - + Show password - + Save password - + PointsInPolygonThread point count field - + @@ -6562,7 +6573,7 @@ Please change this situation first, because OSM Plugin doesn't know what la Couldn't load plugin '%1' from ['%2'] - + Couldn't load plugin %1 @@ -6587,6 +6598,10 @@ Please change this situation first, because OSM Plugin doesn't know what la Clear console + + Settings + Inställningar + Import Class @@ -6798,7 +6813,7 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS? - + @@ -6890,7 +6905,7 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS?Lägger till ett WFS-lager till kartbladet - + Python error Pythonfel @@ -7298,7 +7313,6 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS? - @@ -7310,12 +7324,11 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS? - - - - - - + + + + + Warning Varning @@ -7468,73 +7481,73 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS?Ett fel inträffade vid exekvernig av följande kod: - + Python is not enabled in QGIS. Python är ej påslaget i QGIS. - - - - - - - + + + + + + + - + Plugins Insticksprogram - + Loaded %1 (package: %2) Läste in %1 (paket: %2) - + Library name is %1 Biblioteksnamn är %1 - - + + Failed to load %1 (Reason: %2) Kunde inte läsa in %1(anledning: %2) - + Attempting to resolve the classFactory function Kunde inte lösa upp classFactory-funktionen - + Loaded %1 (Path: %2) Läste in %1 (sökväg: %2) - + Error Loading Plugin Fel vid läsning av insticksprogram - + There was an error loading a plugin.The following diagnostic information may help the QGIS developers resolve the issue: %1. Det uppstod ett fel när insticksprogram skulle laddas. Informationen nedan kan hjälpa QGIS-utvecklarna att rätta till felet: %1. - + Unable to find the class factory for %1. Kunde inte hitta klassfabriken för %1. - + Plugin %1 did not return a valid type and cannot be loaded Issticksprogrammet %1 returnerade inte ett giltigt värde och kan inte läsas in @@ -7544,7 +7557,7 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS?Var är '%1 (ursprunglig plats: %2)? - + Error when reading metadata of plugin %1 Fel vid läsning av metadata för insticksprogram %1 @@ -7615,63 +7628,63 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS? Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module). - + Cannot open vector %1 in mapset %2 - + Cannot open GISRC file - + Cannot start module - + command: %1 %2 - + Cannot run module - + command: %1 %2<br>%3<br>%4 - + Cannot get projection - + Cannot get raster extent - + Cannot get map info - + Cannot get colors - + Cannot query raster - + @@ -7721,51 +7734,51 @@ Vill du specificera sökväg (GISBASE) till installationen av GRASS? Estimating normal derivatives... - + - + Could not open CRS database %1 Error(%2): %3 - + - - + + CRS CRS - + Generated CRS A CRS automatically generated from layer info get this prefix for description Genererad projektion - + Saved user CRS [%1] - + - + Imported from GDAL - + Raster Terrain Analysis plugin - + A plugin for raster based terrain analysis - + infinite - + @@ -7799,7 +7812,7 @@ Error(%2): %3 A plugin for placing diagrams on vector layers - + @@ -7818,27 +7831,27 @@ Error(%2): %3 Categorized - + Graduated - + Rule-based - + Point displacement - + Georeferencing rasters using GDAL - + @@ -7857,33 +7870,33 @@ Error(%2): %3 invalid line - + segment %1 of ring %2 of polygon %3 intersects segment %4 of ring %5 of polygon %6 at %7 - + ring %1 with less than four points - + ring %1 not closed - + line %1 with less than two points - + line %1 contains %n duplicate node(s) at %2 number of duplicate nodes - + @@ -7891,29 +7904,29 @@ Error(%2): %3 segments %1 and %2 of line %3 intersect at %4 - + ring %1 of polygon %2 not in exterior ring - + GEOS error:could not produce geometry for GEOS (check log window) - + GEOS error:%1 - + polygon %1 inside polygon %2 - + @@ -7923,289 +7936,288 @@ Error(%2): %3 Unknown geometry type %1 - + Geometry validation was aborted. - + Geometry is valid. - + Geometry has %1 errors. - + OGR driver for '%1' not found (OGR error: %2) - + trimming attribute name '%1' to ten significant characters produces duplicate column name. - + creation of data source failed (OGR error:%1) - + creation of layer failed (OGR error:%1) - + unsupported type for field %1 - + creation of field %1 failed (OGR error: %2) - + created field %1 not found (OGR error: %2) - + Invalid variant type for field %1[%2]: received %3 with type %4 - + Feature geometry not imported (OGR error: %1) - + Feature creation error (OGR error: %1) - + Failed to transform a point while drawing a feature of type '%1'. Writing stopped. (Exception: %2) - + Feature write errors: - + Stopping after %1 errors - + Only %1 of %2 features written. - + Arc/Info ASCII Coverage - + Arc/Info ASCII Coverage Atlas BNA - + Atlas BNA Comma Separated Value - + Kommaseparerade värden ESRI Shapefile - + ESRI Shapefil FMEObjects Gateway - + FMEObjects Gateway GeoJSON - + GeoJSON GeoRSS - + GeoRSS Geography Markup Language [GML] - + Geography Markup Language [GML] Generic Mapping Tools [GMT] - + Generic Mapping Tools [GMT] GPS eXchange Format [GPX] - + GPS eXchange Format [GPX] Keyhole Markup Language [KML] - + Keyhole Markup Language [KML] Spatial Data Transfer Standard [SDTS] - + Spatial Data Transfer Standard [SDTS] ESRI FileGDB - + ESRI FileGDB INTERLIS 1 - + INTERLIS 1 INTERLIS 2 - + INTERLIS 2 Mapinfo File - + Mapinfo File Microstation DGN - + Microstation DGN S-57 Base file - + S-57 Base file SQLite - + SQLite AutoCAD DXF - + AutoCAD DXF Geoconcept - + Geoconcept - Groups not yet supported - + Grupper stöds ännu inte - - - + + + Cannot draw raster - + Kan inte rita raster - + CRS undefined - defaulting to project CRS - + Referenskoordinatsystem odefinierad - sätter projektets standardreferenskoordinatsystem - + CRS undefined - defaulting to default CRS: %1 - + Referenskoordinatsystem odefinierad - sätter standardreferenskoordinatsystem: %1 - + Reading raster - + Läser in raster QGIS rocks! - + QGIS Rockar FETT! <html>QGIS rocks!</html> - + <html>QGIS Rockar FETT!</html> Processing 1/2 - %p% - + Processar 1/2 - %p% Processing 2/2 - %p% - + Processar 2/2 - %p% Intersects - + Skär Is disjoint - + Touches - + @@ -8217,110 +8229,110 @@ Only %1 of %2 features written. Within - + Contains - + Equals - + Overlaps - + Spatial Query Plugin - + A plugin that makes spatial queries on vector layers - + QGIS starting in non-interactive mode not supported. You are seeing this message most likely because you have no DISPLAY environment variable set. - + Simple line - + Marker line - + Line decoration - + Simple marker - + SVG marker - + Font marker - + Ellipse marker - + Vector Field marker - + Simple fill - + SVG fill - + Centroid fill - + Line pattern fill - + Point pattern fill - + No active vector layer - + @@ -8342,17 +8354,17 @@ You are seeing this message most likely because you have no DISPLAY environment Raster Histogram - + Pixel Value - + Frequency - + Choose a file name to save the map image as @@ -8361,27 +8373,27 @@ You are seeing this message most likely because you have no DISPLAY environment OfflineEditing - + Allow offline editing and synchronizing with database - + Road graph plugin - + It solves the shortest path problem. - + SQL Anywhere plugin - + @@ -8391,7 +8403,7 @@ You are seeing this message most likely because you have no DISPLAY environment OGR[%1] error %2: %3 - + @@ -8408,83 +8420,83 @@ You are seeing this message most likely because you have no DISPLAY environment OGR - + Unable to create the datasource. %1 exists and overwrite flag is false. - + Unable to get driver %1 - + Arc/Info Binary Coverage - + DODS - + ESRI Personal GeoDatabase - + ESRI ArcSDE - + ESRI Shapefiles - + Grass Vector - + Informix DataBlade - + Ingres - + MySQL - + MSSQL - + Oracle Spatial - + ODBC - + OGDI Vectors - + @@ -8494,22 +8506,22 @@ You are seeing this message most likely because you have no DISPLAY environment UK. NTF2 - + U.S. Census TIGER/Line - + VRT - Virtual Datasource - + X-Plane/Flightgear - + @@ -8519,203 +8531,202 @@ You are seeing this message most likely because you have no DISPLAY environment Duplicate field (10 significant characters): %1 - + Creating the data source %1 failed: %2 - + Unknown vector type of %1 - + Creation of OGR data source %1 failed: %2 - + creation of field %1 failed - + Couldn't create file %1.qpj - + - - + Cannot get GDAL raster band: %1 - + Cannot open GDAL MEM dataset %1: %2 - + Cannot GDALCreateGenImgProjTransformer: - + Cannot inittialize GDALWarpOperation : - + Cannot ChunkAndWarpImage: %1 - + - + [GDAL] All files (*) - + - + GDAL/OGR VSIFileHandler - + - + This raster file has no bands and is invalid as a raster layer. - + day Note: Word is part matched in code - + days Note: Word is part matched in code - + week Note: Word is part matched in code - + weeks Note: Word is part matched in code - + month Note: Word is part matched in code - + months Note: Word is part matched in code - + year Note: Word is part matched in code - + years Note: Word is part matched in code - + second Note: Word is part matched in code - + seconds Note: Word is part matched in code - + minute Note: Word is part matched in code - + minutes Note: Word is part matched in code - + hour Note: Word is part matched in code - + hours Note: Word is part matched in code - + Cannot convert '%1' to double - + Cannot convert '%1' to int - + Cannot convert '%1' to DateTime - + Cannot convert '%1' to Date - + Cannot convert '%1' to Time - + Cannot convert '%1' to Interval - + Cannot convert '%1' to boolean - + Invalid regular expression '%1': %2 - + Index is out of range - + @@ -8732,7 +8743,7 @@ You are seeing this message most likely because you have no DISPLAY environment Math - + @@ -8743,7 +8754,7 @@ You are seeing this message most likely because you have no DISPLAY environment Conversions - + @@ -8761,7 +8772,7 @@ You are seeing this message most likely because you have no DISPLAY environment Date and Time - + @@ -8780,7 +8791,7 @@ You are seeing this message most likely because you have no DISPLAY environment String - + @@ -8791,7 +8802,7 @@ You are seeing this message most likely because you have no DISPLAY environment Geometry - + @@ -8799,7 +8810,7 @@ You are seeing this message most likely because you have no DISPLAY environment Record - + @@ -8810,169 +8821,169 @@ You are seeing this message most likely because you have no DISPLAY environment No root node! Parsing failed? - + (no root) - + Unary minus only for numeric values. - + Can't preform /, *, or % on DateTime and Interval - + [unsupported type;%1; value:%2] - + Column '%1' not found - + Unable to load %1 provider - + Provider %1 has no createEmptyLayer method - + Loading of layer failed - + Creation error for features from #%1 to #%2. Provider errors was: %3 - + Vector import - + Only %1 of %2 features written. - + - + Globe - + - + Overlay data on a 3D globe - + Zonal statistics plugin - + A plugin to calculate count, sum, mean of rasters for each polygon of a vector layer - + no result buffer - + - - + + - + Connection to database failed - + - + Creation of data source %1 failed: %2 - + - + Loading of the layer %1 failed - + - - + + Unable to delete layer %1: %2 - + Loading of the MSSQL provider failed - + - + Unsupported type for field %1 - + - + Creation of fields failed - + creation of data source %1 failed. %2 - + loading of the layer %1 failed - + creation of fields failed - + - + Unable to initialize SpatialMetadata: - + - + Could not create a new database - + - + Unable to activate FOREIGN_KEY constraints [%1] - + - + Unable to delete table %1: - + @@ -8982,7 +8993,7 @@ You are seeing this message most likely because you have no DISPLAY environment Shows a QtSensors compass reading - + @@ -8992,142 +9003,142 @@ You are seeing this message most likely because you have no DISPLAY environment Heatmap - + Creates a Heatmap raster for the input point vector - + - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + Exception: %1 - + - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + GEOS - + - + GEOS prior to 3.2 doesn't support GEOSInterpolate - + Console - + - - + + Reading raster part %1 of %2 - + - + Building pyramids failed - write access denied - + - + Write access denied. Adjust the file permissions and try again. Skrivåtkomst nekad. Justera filrättigheterna och försök igen. - - - - + + + + Building pyramids failed. Kunde ej skapa pyramider. - + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. Filen var inte skrivbar. Vissa format stödjer inte pyramider. Kontrollera med GDAL-dokumentation om du är osäker. - - + + Building pyramid overviews is not supported on this type of raster. Denna typ av raster stödjer ej att bygga pyramider. - + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. Nuvarande libtiff-bibliotek stödjer inte att bygga pyramider från lager med JPEG-kompression. Multiband color - + Paletted - + Singleband gray - + Singleband pseudocolor - + Singleband color data - + @@ -9135,82 +9146,82 @@ You are seeing this message most likely because you have no DISPLAY environment No Error has occurred - + Invalid file descriptor (port was not opened correctly) - + Unable to allocate memory tables (POSIX) - + Caught a non-blocked signal (POSIX) - + Operation timed out (POSIX) - + The file opened by the port is not a valid device - + The port detected a break condition - + The port detected a framing error (usually caused by incorrect baud rate settings) - + There was an I/O error while communicating with the port - + Character buffer overrun - + Receive buffer overflow - + The port detected a parity error in the received data - + Transmit buffer overflow - + General read operation failure - + General write operation failure - + Unknown error: %1 - + @@ -9235,7 +9246,7 @@ You are seeing this message most likely because you have no DISPLAY environment QgisApp - + Layers Lager @@ -9244,128 +9255,131 @@ You are seeing this message most likely because you have no DISPLAY environment Version - - - + + + Invalid Data Source Ogiltig datakälla - - + + No Layer Selected Inget Lager Markerat - + There is a new version of QGIS available Det finns en ny version av QGIS tillgänglig - + You are running a development version of QGIS Du använder en utvecklingsversion av QGIS - + You are running the current version of QGIS Du använder den senaste versionen av QGIS - + Would you like more information? Vill du ha mer information? - - - - + + + + QGIS Version Information Versionsinformation för QGIS - + Unable to get current version information from server Kan inte hämta senaste versionen från servern - + Connection refused - server may be down Anslutning nekad - servern kanske är nere - + QGIS server was not found QGIS-servern hittades inte - + + + + Invalid Layer Ogiltigt Lager - + %1 is an invalid layer and cannot be loaded. %1 är ett ogiltigt lager och kan inte laddas. - + Problem deleting features Problem med att ta bort objekt - + A problem occured during deletion of features Ett problem uppstod under radering av objekt - + No Vector Layer Selected Inget Vektorlager Markerat - + Deleting features only works on vector layers Radering av objekt fungerar bara på vektorlager - + To delete features, you must select a vector layer in the legend För att ta bort ett objekt så måste du markera ett vektorlager i teckenförklaringen - + Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties. Teckenförklaring som visar alla lager i kartvyn. Klicka på en checkbox för att aktivera eller inaktivera ett lager. Dubbelklicka på ett lager i teckenförklaringen för att ställa in dess utseende och ändra andra inställningar. - + Map overview canvas. This canvas can be used to display a locator map that shows the current extent of the map canvas. The current extent is shown as a red rectangle. Any layer on the map can be added to the overview canvas. Översiktskarta. Denna kartvy kan användas för att visa en översikt där den nuvarande kartvyn syns som en röd rektangel. Alla lager i kartan kan läggas till i översiktskartan. - + Map canvas. This is where raster and vector layers are displayed when added to the map Kartvy. Det är här som raster- och vektorlager visas när de adderas till kartan - + Progress bar that displays the status of rendering layers and other time-intensive operations Förloppsindikator som visar statusen för rendering av lager och andra tidsintensiva operationer - + Displays the current map scale Visar den nuvarande kartskalan - + Render Rendera - + When checked, the map layers are rendered in response to map navigation commands and other events. When not checked, no rendering is done. This allows you to add a large number of layers and symbolize them before rendering. När den här rutan är markerad så renderas kartlagren vid navigationskommandon och andra händelser com kräver en uppdatering av kartan. När den inte är markerad så renderas ingenting. Detta låter dig addera ett stort antal lager och ställa in deras symbologi innan du renderar dem. @@ -9374,7 +9388,7 @@ You are seeing this message most likely because you have no DISPLAY environment QGis-filer (*.qgs) - + Choose a QGIS project file Välj en QGIS-projektfil @@ -9383,43 +9397,43 @@ You are seeing this message most likely because you have no DISPLAY environment Insticks&program - + Reading settings Läser inställningar - + Setting up the GUI Ställer in GUI - + Checking database Kollar databas - + Quantum GIS Quantum GIS - + Restoring loaded plugins Återställer laddade plugin - + Initializing file filters Initialiserar filfilter - + Restoring window state Återställer fönstertillstånd - - + + QGIS Ready! QGIS Klar! @@ -9812,12 +9826,12 @@ You are seeing this message most likely because you have no DISPLAY environment Insticksprogram - + Toggle map rendering Toggla kartritande - + Ready Klar @@ -9826,18 +9840,18 @@ You are seeing this message most likely because you have no DISPLAY environment Spara som - + Calculating... Beräknar... - - + + Abort... Avbryt... - + Choose a QGIS project file to open Välj en QGIS-projektfil att öppna @@ -9846,46 +9860,44 @@ You are seeing this message most likely because you have no DISPLAY environment QGIS-projekt läsfel - + Unable to open project Kan inte öppna projekt - - + + To perform a full histogram stretch, you need to have a raster layer selected. För att sträcka ut histogrammet måste du ha valt ett lager. - + No Raster Layer Selected Inget rasterlager valt - - - + + Layer is not valid Lager är ej giltigt - - + The layer is not a valid layer and can not be added to the map Lagret är inte ett giltigt lager och kan inte läggas till kartan - + Save? Spara? - + Open a GDAL Supported Raster Data Source Öppna ett rasterlager som GDAL stöder - + Unsupported Data Source Datakälla som ej stöds @@ -9894,13 +9906,13 @@ You are seeing this message most likely because you have no DISPLAY environment Skriv in ett namn för det nya bokmärket: - - - - - - - + + + + + + + Error Fel @@ -9946,34 +9958,34 @@ You are seeing this message most likely because you have no DISPLAY environment Okänt nätverksfel - + Checking provider plugins Kollar plugin för datakällor - + Starting Python Startar Python - + Provider does not support deletion Datapluginet stödjer inte radering - + Data provider does not support deleting features Datapluginet stödjer inte radering av objekt - - - + + + Layer not editable Lagret kan inte redigeras - + The current layer is not editable. Choose 'Start editing' in the digitizing toolbar. Nuvarande lager är ej redigerbart. Välj 'Tillåt redigering' i verktygsraden för digitalisering. @@ -9990,17 +10002,17 @@ You are seeing this message most likely because you have no DISPLAY environment Lägg till ring - + Scale Skala - + Current map scale (formatted as x:y) Aktuell kartskala (i format x:y) - + Map coordinates at mouse cursor position Kartkoordinater vid musens läge @@ -10009,7 +10021,7 @@ You are seeing this message most likely because you have no DISPLAY environment Ogiltig skala - + Do you want to save the current project? Vill du spara aktivt projekt? @@ -10018,33 +10030,33 @@ You are seeing this message most likely because you have no DISPLAY environment Dela objekt - + Current map scale Nuvarande kartskala - + GPS Information GPS Information - + Extents: Utsträckning: - + Project file is older Projektiflen är föråldrad - + <tt>Settings:Options:General</tt> Menu path to setting options <tt>Inställningar : Alternativ : Allmänt</tt> - + Warn me when opening a project file saved with an older version of QGIS Varna mig när jag öppnar en projektifl som sparades med en äldre version av QGIS @@ -10057,12 +10069,12 @@ You are seeing this message most likely because you have no DISPLAY environment Visa objektets information när musen är över objektet - + Multiple Instances of QgisApp Flera QgisApp-instanser - + Multiple instances of Quantum GIS application object detected. Please contact the developers. @@ -10227,43 +10239,43 @@ Kontakta utvecklarna. Hantera anpassade Coordinate Reference Systems - + Minimize Minimera - + Ctrl+M Minimize Window Ctrl+M - + Minimizes the active window to the dock Minimera aktivt fönster till dockan - + Zoom Zooma - + Toggles between a predefined size and the window size set by the user Togglar mellan fördefinerad storlek och användarvald storlek på fönstret - + Bring All to Front Flytta allt överst - + Bring forward all open windows Flytta alla öppna fönster framåt - + Failed to open Python console: Kunde inte öppna python-konsolen: @@ -10272,12 +10284,12 @@ Kontakta utvecklarna. Redigera - + Panels Paneler - + Toolbars Verktygsrader @@ -10290,12 +10302,12 @@ Kontakta utvecklarna. Fönster - + Toggle extents and mouse position display Toggla visning av utsträckning och pekarposition - + Stop map rendering Stanna kartrendering @@ -10312,22 +10324,22 @@ Kontakta utvecklarna. Avslutar... - + This icon shows whether on the fly coordinate reference system transformation is enabled or not. Click the icon to bring up the project properties dialog to alter this behaviour. Denna ikon visar om transformation mellan koordinatsystem är påslagen eller ej. Klicka ikonen föra att öppna projekegenskaper och ändra beteendet. - + CRS status - Click to open coordinate reference system dialog CRS status - Klicka för att öppna dialog för koordinatsystem - + Overview Översikt - + Always ignore these errors? @@ -10336,7 +10348,7 @@ Always ignore these errors? Ignorera alltid dessa fel? - + %n SSL errors occured number of errors @@ -10345,321 +10357,327 @@ Ignorera alltid dessa fel? - + Select raster layers to add... Välj rasterlager att lägga till... - + Security warning: Säkerhetsvarning: - + macros have been disabled. makron har stängts av. - + Enable Tillåt - + Log Messages Loggmeddelande - + QGIS starting... QGIS startar... - + Window Fönster - + Vect&or Vekt&or - + &Web &Web - + Shows the map coordinates at the current cursor position. The display is continuously updated as the mouse is moved. It also allows editing to set the canvas center to a given position. The format is lat,lon or east,north - + Visar kartans koordinater vid markörens position. Positionen ändras när musen flyttas. Du kan också redigera positionen, för att sätta kartans centrum vid en specifik position. Formatet är lat,lon eller öst,norr - + Current map coordinate (lat,lon or east,north) Aktuell koordinat (lat/lon eller nord/ost) - + Control rendering order Styr renderingsordning - + Map layer list that displays all layers in drawing order. - + Lista över kartlager som visar alla lager i den ordning de ritas. - + Layer order Lagerordning - + [ERROR] Can not make qgis.db private copy - + [FEL] Kan inte skapa en privata kopia av qgis.db - + Update of view in private qgis.db failed. %1 - + Kunde inte uppdatera vyn i den privata qgis.db. +%1 - - + + < Blank > < Blank > - + QGIS version QGIS-version - + QGIS code revision QGIS kodrevision - + Compiled against Qt Kompilerad för Qt - + Running against Qt Kör med Qt - + GEOS Version GEOS-version - + PostgreSQL Client Version PostgreSQL-klientversion - - + + No support. Inget stöd. - + SpatiaLite Version SpatiaLite-version - + QWT Version QWT-version - + PROJ.4 Version + PROJ.4 Version + + + + QScintilla2 Version - + This copy of QGIS writes debugging output. Den här kopian av Qgis skriver ut felsökningsinformation. - + Select zip layers to add... - + Välj ziplager att lägga till... - + Vector Vektor - + Raster Raster - + Select vector layers to add... Välj vektorlager att lägga till... - + PostgreSQL PostgreSQL - + Cannot get PostgreSQL select dialog from provider. - + Kan inte hämta PostgreSQL-dialog från datakällan. - + %1 is an invalid layer - not loaded - + %1 är ett ogiltigt lager - läses inte in - + SpatiaLite - + Cannot get SpatiaLite select dialog from provider. - + Kan inte hämta SpatiaLite-dialog från datakällan. - + MSSQL - + WMS - + Cannot get WMS select dialog from provider. - Kan inte få WMS-dialogen från datakällan. + Kan inte få WMS-dialogen från datakällan. - + WCS - + Cannot get WCS select dialog from provider. - + Kan inte få WCS-dialogen från datakällan. - + WFS - + Cannot get WFS select dialog from provider. - + Kan inte få WFS-dialogen från datakällan. - - - + + + QGis files QGis-filer - + Unable to load %1 - + Kan inte läsa in %1 - + Please select a vector layer first. - + Välj ett vektorlager först. - + Layer labeling settings - + Lagrets etikettinställningar - - - + + + Not enough features selected - + Inte tillräckligt med objekt valda - + Union operation canceled - + Unionsoperation avbruten - + Couldn't load Python support library: %1 - + Kunde inte läsa in Python-bibliotek: %1 - + Couldn't resolve python support library's instance() symbol. - + Kunde inte lösa ut python-bibliotekets instance()-symbol. - + Python support ENABLED :-) - + Pythonstöd på - + QGIS - Changes since last release - + QGIS - Ändringar förra utgåvan - + Unknown network socket error: %1 - + Okänt nätverksfel: %1 - + Current CRS: %1 (OTFR enabled) - + Nuvarande referenskoordinatsystem: %1 (transformering är på) - + Current CRS: %1 (OTFR disabled) - + Nuvarande referenskoordinatsystem: %1 (transformering är av) - + This project file was saved by an older version of QGIS - + Den här projektfilen sparades med en äldre version av QGIS - + Warning - Varning + Varning - + This layer doesn't have a properties dialog. - + det här lagret har inte en egenskaps-dialog. - + Authentication required - + Autenticering krävs - + Proxy authentication required - + Mellanvärdsautentisering krävs You are using QGIS version %1 built against code revision %2. @@ -10672,37 +10690,37 @@ This binary was compiled against Qt %1,and is currently running against Qt %2 - + Choose a file name to save the QGIS project file as Välj ett namn för att spara QGIS projektfil - + Choose a file name to save the map image as Välj ett filnamn att spara kartbilden som - + Start editing failed Misslyckades att påbörja redigering - + Provider cannot be opened for editing Källan kan inte öppnas för redigering - + Stop editing Sluta redigera - + Do you want to save the changes to layer %1? Vill du spara ändringarna till lager %1? - + Problems during roll back Problem vid återgång @@ -10711,17 +10729,17 @@ Denna binärfil kompilerades mot Qt %1 och kärs just nu mot Qt %2 Python konsol - + Map coordinates for the current view extents Kartkoordinater för aktuell vys utsträckning - + Maptips require an active layer Karttips kräver ett aktivt lager - + Quantum GIS - %1 ('%2') Quantum GIS - %1 ('%2') @@ -10761,9 +10779,9 @@ Denna binärfil kompilerades mot Qt %1 och kärs just nu mot Qt %2 Ctrl+Shift+B - + Labeling - Etiketter + Etiketter Ctrl+Shift+V @@ -10815,220 +10833,222 @@ Denna binärfil kompilerades mot Qt %1 och kärs just nu mot Qt %2 Ny - + &Database - + &Databas Label Etikett - - + + Coordinate: - + Koordinat: - + Current map coordinate - + Nuvarande kartkoordinat - - - + + + Private qgis.db - + Privat qgis.db - + Could not open qgis.db - + Kunde inte öppna qgis.db - + Migration of private qgis.db failed. %1 - + Överföring av privat qgis.db misslyckades. +%1 - + Compiled against GDAL/OGR - + Kompilerad mot GDAL/OGR - + Running against GDAL/OGR - + Körs mot GDAL/OGR - + %1 doesn't have any layers - + %1 har inga lager - + %1 is not a valid or recognized data source %1 är inte en giltig eller känd datakälla - + Cannot get MSSQL select dialog from provider. - + Kan inte få MSSQL-dialogen från datakällan. - - + + Saved project to: %1 Sparade projekt i: %1 - - + + Unable to save project %1 Kunde inte spara projekt %1 - + Saved map image to %1 Sparade kartbild till %1 - + Saving done - Spara klart + Spara klart - + Export to vector file has been completed - + Export till verktorlager fullföljdes - + Save error - Kunde inte spara + Kunde inte spara - + Export to vector file failed. Error: %1 - + Export till verktorlager misslyckades. +Fel: %1 - + Features deleted Objekt borttagna - + Merging features... Slår ihop objekt... - + Abort Avbryt - - + + Composer %1 - + Komponerare %1 - - + + No active layer Inget aktivt lager - - + + No active layer found. Please select a layer in the layer list Inget aktivt lager hittades. Välj ett lager i listan - - + + Active layer is not vector Aktivt lager är inte ett vektorlager - - + + The merge features tool only works on vector layers. Please select a vector layer from the layer list Verktyget för att slå ihop objekt fungerar endast på vektorlager. Välj ett vektorlager från listan - - + + Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing Verktyget för att slå ihop objekt fungerar endast på lager i redigeringsläge. För att använda verktyget gå till Lager->Toggla redigering - - - + + + The merge tool requires at least two selected features Verktyget för att slå ihop objekt kräver minst två valda objekt - + Merged feature attributes - + Ihopslagna objektattribut - - + + Merge failed - + Ihopslagning misslyckades - - + + An error occured during the merge operation - + Ett fel upstod under ihopslagningen - - + + The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled Unionen skulle resultera i en geometri som inte stödjs av nuvarande lager, och avbröts därför - + Merged features Ihopslagna objekt - + Features cut Objekt utklippta - + Features pasted Objekt inklistrade - + Cannot copy style: %1 - + Kan inte kopiera stil: %1 - + Cannot parse style: %1:%2:%3 - + Kan inte tolka stil: %1:%2:%3 - + Cannot read style: %1 - + Kan inte läsa stil: %1 - - + + Could not commit changes to layer %1 Errors: %2 @@ -11043,19 +11063,19 @@ Fel: %2 QGIS - Ändringar i SVN sedan förra utgåvan - + Unable to communicate with QGIS Version server %1 Kan inte skapa en uppkopling mot QGIS versionsserver %1 - + The layer %1 is not a valid layer and can not be added to the map Lagret %1 är inte ett giltigt lager och kan inte läggas till kartan - + %n feature(s) selected on layer %1. number of selected features @@ -11064,32 +11084,32 @@ Fel: %2 - + %1 is not a valid or recognized raster data source %1 är inte en giltig eller igenkänd källa till rasterdata - + %1 is not a supported raster data source %1 är inte en rasterkälla som stöds - + <p>This project file was saved by an older version of QGIS. When saving this project file, QGIS will update it to the latest version, possibly rendering it useless for older versions of QGIS.<p>Even though QGIS developers try to maintain backwards compatibility, some of the information from the old project file might be lost. To improve the quality of QGIS, we appreciate if you file a bug report at %3. Be sure to include the old project file, and state the version of QGIS you used to discover the error.<p>To remove this warning when opening an older project file, uncheck the box '%5' in the %4 menu.<p>Version of the project file: %1<br>Current version of QGIS: %2 <p>Denna projektfil sparades av en äldre version av QGIS. När du sparar denna projektifl, kommer QGIS att skriva den med senaste versionen, vilket kan göra den oanvändbar för äldre versioner av QGIS. Även om QGIS utvecklare försöker bibehålla bakåtkompabilitet, så kan en del av information i den gamla projektfilen eventuellt försvinna. För att förbättra kvaliteten på QGIS, uppskattar vi om du skapar en felrapport på %3. Inkludera den gamla projektiflen, och tala om vilken version av QGIS du använde när du upptäckte felet.<p>För att ta bort denna varning när du öppnar gamla projekfiler, avmarkera rutan '%5' i meny %4.<p>Projektfilens version: %1<br>QGIS nuvarande version: %2 - + SSL errors occured accessing URL %1: SSL-fel inträffade vid åtkomst av URL %1: - + Delete features Borttagna objekt - + Delete %n feature(s)? number of features to delete @@ -11563,7 +11583,7 @@ Användaredatabas-sökväg: %8 % - + % @@ -12483,157 +12503,157 @@ felet var: %2 Attributredigeringsdialog - + Line edit Linjeredigering - + Classification Klassificering - + Range Intervall - + Unique values Unika värden - + File name Filnamn - + Value map Värdekarta - + Enumeration Uppräkning - + Immutable Oförstörbara - + Hidden Gömd - + Checkbox Kryssruta - + Text edit Textredigering - + Calendar Kalender - + Value relation Värderelation - + UUID generator UUID-generator - + Simple edit box. This is the default editation widget. Enkelt redigeringsruta. Detta är standard redigeringsfunktion. - + Displays combo box containing values of attribute used for classification. Visar meny med attributevärden som används för klassificering. - + Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box. Gör det möjligt att ställa in numeriska värden från ett intervall. Redigeringsfunktionen kan vara antingen ett dragreglage eller en snurra. - + Minimum Minimum - + Maximum Maximum - + Step Steg - + A calendar widget to enter a date. Kalenderfunktion för att ange ett datum. - + Layer Lager - + Key column Nyckelkolumn - + Value column Värdekolumn - + Select layer, key column and value column Välj lager, nyckelkolum och värdekolumn - + Allow null value Tillåt noll-värde - + Order by value Sortera efter värde - + Allow multiple selections Tillåt flera markeringar - + Filter column Filterkolumn - + Filter value Filtervärde - + Read-only field that generates a UUID if empty. Skrivskyddat fält som skapar ett UUID om det lämnas tomt. @@ -12644,84 +12664,84 @@ felet var: %2 Dragreglage - + Editable Redigerbart - + Local minimum/maximum = 0/0 Lokalt minimum/maximum = 0/0 - + The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used. Anävndaren kan välja ett av värden som redan används i attributet. Om redigerbart så visas en linjeredigeringsfunktion som kan ge förslag, annars används en meny. - + Simplifies file selection by adding a file chooser dialog. Förenklar val av filer genom att lägga till en filväljare. - + Combo box with predefined items. Value is stored in the attribute, description is shown in the combo box. Meny med förutbestämda värden. Värdet sparas i attributet, beskrivningen syns i menyn. - + Load Data from layer Läs in data från lager - + Value Värde - + Description Beskrivning - + Remove Selected Ta bort valda - + Load Data from CSV file Läs in data från CVS-fil - + Combo box with values that can be used within the column's type. Must be supported by the provider. Meny med värden som kan användas för kolumnens typ. Måste stödjas av datakällan. - + An immutable attribute is read-only - the user is not able to modify the contents. Ett oföränderligt attribu kan bara läsas, användaren kan inte modifiera innehållet. - + A hidden attribute will be invisible - the user is not able to see it's contents. Ett gömt attribut är osynligt, användaren kan inte se dess värde. - + Representation for checked state Representerar markerat tillstånd - + Representation for unchecked state Representerar avmarkerat tillstånd - + A text edit field that accepts multiple lines will be used. Ett redigeringsfält som tillåter flera rader kommer att användas. @@ -13167,13 +13187,13 @@ Databas: %2 QgsCategorizedSymbolRendererV2Widget - + Value Värde - + Label Etikett @@ -13183,28 +13203,28 @@ Databas: %2 Symbolnivåer... - - + + Error Fel - + There are no available color ramps. You can add them in Style Manager. Finns inga tillgängliga färgramper. Du kan lägga till dem i Stilhanteraren. - + The selected color ramp is not available. Vald färgramp är inte tillgänglig. - + Confirm Delete Bekräfta borttagning - + The classification field was changed from '%1' to '%2'. Should the existing classes be deleted before classification? Klassificeringsfältet ändrades från '%1' till '%2'. @@ -13223,7 +13243,7 @@ Skall existerande klasser tas bort före klassificering? - + Symbol Symbol @@ -13308,18 +13328,18 @@ Skall existerande klasser tas bort före klassificering? QgsComposer - + Big image Stor bild - + SVG warning SVG varning - - + + Don't show this message again Visa inte detta meddelande igen @@ -13328,7 +13348,7 @@ Skall existerande klasser tas bort före klassificering? Karta 1 - + SVG Format SVG-format @@ -13389,15 +13409,15 @@ Skall existerande klasser tas bort före klassificering? - - + + Empty filename pattern Tomt filnamnsmönster - - + + The filename pattern is empty. A default one will be used. Filnamnsmönstret är tomt. Ett standarvärde kommer användas. @@ -13408,49 +13428,49 @@ Skall existerande klasser tas bort före klassificering? - - + + Unable to write into the directory Kunde inte skriva till katalogen - - + + The given output directory is not writeable. Cancelling. Den givna katalogen är ej skrivbara. Avbryter. - - - - + + + + Rendering maps... Rendererar kartor... - - - - + + + + Abort Avbryt - - - - + + + + Atlas processing error Atlas processfel - + To create image %1x%2 requires about %3 MB of memory. Proceed? Att skapa bild %1x%2 krävs ungefär %3 MB minne. Fortsätta? - + Choose a file name to save the map image as Välj ett filnamn att spara kartbilden som @@ -13460,52 +13480,52 @@ Skall existerande klasser tas bort före klassificering? - + Choose a file name to save the map as Välj ett filnamn att spara kartan som - + Directory where to save image files Katalog där bildfilerna skall sparas - + Image format: Bildformat: - + <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the <p>SVG exportfunktionen i QGIS har flera fel beroende på buggar och begränsningar i - + Directory where to save SVG files Katalog där SVG-filerna skall sparas - + Save template Spara mall - + Composer templates Komponeringsmall - + Composer Komponerare - + Project contains WMS layers Projektet innehåller WMS-lager - + Some WMS servers (e.g. UMN mapserver) have a limit for the WIDTH and HEIGHT parameter. Printing layers from such servers may exceed this limit. If this is the case, the WMS layer will not be printed En del WMS-servrar (tex UMN mapserver) har begränsningar för parametrarna WIDTH och HEIGHT. Skriver du ut sådana lager kan de gränserna överskridas. Om så är fallet, skrivs WMS-lagret inte ut @@ -13514,7 +13534,7 @@ Skall existerande klasser tas bort före klassificering? %1-format (*.%2 *.%3) - + Qt4 svg code. In particular, there are problems with layers not being clipped to the map bounding box.</p> Qt4 SVG kod. T.ex. är det problem med lager som inte klipps av kartans begränsningslinjer.</p> @@ -13523,7 +13543,7 @@ Skall existerande klasser tas bort före klassificering? För att skapa bild %1 x %2 behövs ca %3 MB minne - + If you require a vector-based output file from Qgis it is suggested that you try printing to PostScript if the SVG output is not satisfactory.</p> Om du behöver en vektorbaserad utskrift från QGIS, föreslår vi att du försöker skriva till PostScript, om du inte är nöjd med resultatet från SVG.</p> @@ -13532,27 +13552,27 @@ Skall existerande klasser tas bort före klassificering? Spara mall - + Save error Kunde inte spara - + Error, could not save file Kunde inte spara fil - + Load template Läs in mall - + Read error Läsfel - + Error, could not read file Kunde inte läsa filen @@ -16605,12 +16625,12 @@ Fel: %5 QgsCptCityBrowserModel - + Name Namn - + Info Info @@ -16618,27 +16638,27 @@ Fel: %5 QgsCptCityColorRampItem - + colors färger - + continuous kontinuerlig - + continuous (multi) kontinuerlig (multipel - + discrete diskret - + variants varianter @@ -16646,12 +16666,12 @@ Fel: %5 QgsCptCityColorRampV2Dialog - + %1 directory details %1 katalogdetaljer - + %1 gradient details %1 gradientdetaljer @@ -16668,7 +16688,7 @@ You can install the entire cpt-city archive or a selection for QGIS. This file can be found at [%2] and current file is [%3] - + @@ -16685,7 +16705,7 @@ and current file is [%3] You can download a more complete set of cpt-city gradients by installing the "Color Ramp Manager" plugin (you must enable Experimental plugins in the plugin manager). - + @@ -17101,7 +17121,7 @@ and current file is [%3] Add PostGIS layers - + @@ -17126,7 +17146,7 @@ and current file is [%3] Delete - + @@ -17147,12 +17167,12 @@ and current file is [%3] Also list tables with no geometry - + Search options - + @@ -17162,12 +17182,12 @@ and current file is [%3] Search mode - + Search in columns - + @@ -18764,42 +18784,35 @@ p, li { white-space: pre-wrap; } QgsEmbedLayerDialog - Select project file - Välj projektfil + Välj projektfil - QGis files - QGis-filer + QGis-filer - Recursive embeding not possible - Rekursiv inbäddning ej tillåten + Rekursiv inbäddning ej tillåten - It is not possible to embed layers / groups from the current project - Man kan inte bädda in lager/grupper från nuvaraned projekt + Man kan inte bädda in lager/grupper från nuvaraned projekt QgsEmbedLayerDialogBase - Select layers and groups to embed - Välj lager och grupper för att bädda in + Välj lager och grupper för att bädda in - Project file - Projektfil + Projektfil - ... - ... + ... @@ -18896,6 +18909,50 @@ p, li { white-space: pre-wrap; } Visa alla etikettkandidater (för felsökning) + + QgsErrorDialog + + + Error + Fel + + + + QgsErrorDialogBase + + + Dialog + Dialog + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Summary</p></body></html> + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Detailed report.</p></body></html> + + + + + Always show details + + + + + Details >> + + + QgsExpressionBuilderDialogBase @@ -19464,7 +19521,7 @@ Uttrycket är ogiltigt, se (mer information) för detaljer p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> <p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:</span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%babel</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the path to GPSBabel<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%in</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the GPX filename when uploading or the port when downloading<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%out</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the port when uploading or the GPX filename when downloading</span></p></body></html> - + @@ -19967,17 +20024,17 @@ grå: ingen data quality of the position fix: Differential, Non-differential or No position - + Quality - + position fix status: Valid or Invalid - + @@ -19987,52 +20044,52 @@ grå: ingen data number of satellites used in the position fix - + Satellites - + H accurancy - + V accurancy - + Connection - + Serial device - + Refresh serial device list - + 00000; - + gpsd - + Internal - + @@ -20042,12 +20099,12 @@ grå: ingen data Automatically add points - + Track width in pixels - + @@ -20057,52 +20114,52 @@ grå: ingen data save layer after every feature added - + Automatically save added feature - + save GPS data (NMEA sentences) to a file - + Log File - + browse for log file - + Map centering - + when leaving - + % of map extent - + Cursor - + width - + @@ -20143,7 +20200,7 @@ grå: ingen data Unable to create a GPX file with the given name. Try again with another name or in another directory. - + @@ -20261,13 +20318,13 @@ Please reselect a valid file. &GPS Tools - + &GPS - + @@ -20334,27 +20391,27 @@ Please reselect a valid file. GPS eXchange format - + Waypoints from a route - + Waypoints from a track - + Route from waypoints - + Track from waypoints - + @@ -20372,12 +20429,12 @@ Please reselect a valid file. File - + Filhantering Feature types - + @@ -20400,13 +20457,13 @@ Please reselect a valid file. File to import - + Feature type - + @@ -20419,17 +20476,17 @@ Please reselect a valid file. GPX output file - + GPX input file - + Conversion - + @@ -20474,7 +20531,7 @@ Please reselect a valid file. GPS device - + @@ -20490,7 +20547,7 @@ Please reselect a valid file. Data layer - + @@ -20529,35 +20586,40 @@ Please reselect a valid file. QgsGdalProvider - + Dataset Description Beskrivning av dataset - + Band %1 Band %1 - + Dimensions: Dimensioner: - + X: %1 Y: %2 Bands: %3 X: %1 Y: %2 Band: %3 - + Origin: Origo: - + Pixel Size: Pixelstorlek: + + + Cannot get GDAL raster band: %1 + + out of extent utanför utsträckning @@ -20567,22 +20629,22 @@ Please reselect a valid file. null (ingen data) - + Gauss Gauss - + Cubic Kubisk - + Mode Läge - + None Ingen @@ -20591,7 +20653,7 @@ Please reselect a valid file. Average Magphase - + Average Average @@ -20871,12 +20933,12 @@ p, li { white-space: pre-wrap; } All other files (*) - + Open raster - + @@ -20891,19 +20953,19 @@ p, li { white-space: pre-wrap; } Raster loaded: %1 - + Georeferencer - %1 - + Transform: - + @@ -20923,28 +20985,28 @@ p, li { white-space: pre-wrap; } GDAL scripting is not supported for %1 transformation - + Load GCP points - + No GCP points to save - + Save GCP points - + Please load raster to be georeferenced - + @@ -20965,27 +21027,27 @@ p, li { white-space: pre-wrap; } Coordinate: - + Current map coordinate - + Nuvarande kartkoordinat Current transform parametrisation - + Unable to open GCP points file %1 - + Could not write to %1 - + @@ -21000,23 +21062,23 @@ p, li { white-space: pre-wrap; } Save GCP points? - + Failed to get linear transform parameters - + <p>The selected file already seems to have a world file! Do you want to replace it with the new world file?</p> - + Failed to compute GCP transform: Transform is not solvable - + @@ -21026,37 +21088,37 @@ p, li { white-space: pre-wrap; } Transformation parameters - + Translation x - + Translation y - + Scale x - + Scale y - + Rotation [degrees] - + Residuals - + @@ -21070,7 +21132,7 @@ p, li { white-space: pre-wrap; } GCP file - + @@ -21080,7 +21142,7 @@ p, li { white-space: pre-wrap; } Coordinate of image(column/line) - + @@ -21091,7 +21153,7 @@ p, li { white-space: pre-wrap; } Mean error [%1] - + @@ -21106,47 +21168,47 @@ p, li { white-space: pre-wrap; } Translation (%1, %2) - + Scale (%1, %2) - + Rotation: %1 - + Mean error: %1 - + Copy in clipboard - + %1 - + GDAL script - + Please set transformation type - + Please set output raster name - + @@ -21191,7 +21253,7 @@ p, li { white-space: pre-wrap; } Not set - + @@ -21210,7 +21272,7 @@ p, li { white-space: pre-wrap; } File - + Filhantering @@ -21232,7 +21294,7 @@ p, li { white-space: pre-wrap; } GCP table - + @@ -21243,7 +21305,7 @@ p, li { white-space: pre-wrap; } Open raster - + @@ -21299,7 +21361,7 @@ p, li { white-space: pre-wrap; } Add point - + @@ -21310,7 +21372,7 @@ p, li { white-space: pre-wrap; } Delete point - + @@ -21327,18 +21389,18 @@ p, li { white-space: pre-wrap; } Start georeferencing - + Ctrl+G - + Generate GDAL script - + @@ -21349,19 +21411,19 @@ p, li { white-space: pre-wrap; } Link Georeferencer to QGis - + Link QGis to Georeferencer - + Save GCP points as... - + @@ -21372,7 +21434,7 @@ p, li { white-space: pre-wrap; } Load GCP points - + @@ -21392,13 +21454,13 @@ p, li { white-space: pre-wrap; } Raster properties - + Move GCP point - + @@ -21413,12 +21475,12 @@ p, li { white-space: pre-wrap; } Local histogram stretch - + Full histogram stretch - + @@ -21426,48 +21488,48 @@ p, li { white-space: pre-wrap; } GDAL files - + DEM files - + - + All files Alla filer Open raster file - + Invalid Path: The file is either unreadable or does not exist - + Invalid URL: - + Do you want to add the datasource anyway? - + - + Open 3D model file - + - + Model files - + @@ -21475,12 +21537,12 @@ p, li { white-space: pre-wrap; } Globe Settings - + Elevation - + @@ -21496,12 +21558,12 @@ p, li { white-space: pre-wrap; } TMS - + URL/File - + @@ -21542,72 +21604,72 @@ p, li { white-space: pre-wrap; } Model - + Point Layer - + 3D Model - + Stereo - + Stereo Mode - + Screen distance (m) - + Screen width (m) - + Split stereo horizontal separation (px) - + Split stereo vertical separation (px) - + Split stereo vertical eye mapping - + Screen height (m) - + Eye separation (m) - + Reset to defaults - + Split stereo horizontal eye mapping - + @@ -21675,13 +21737,13 @@ p, li { white-space: pre-wrap; } QgsGraduatedSymbolRendererV2Widget - + Range Intervall - + Label Etikett @@ -21710,7 +21772,7 @@ p, li { white-space: pre-wrap; } Renderer creation has failed. - + @@ -21724,7 +21786,7 @@ p, li { white-space: pre-wrap; } - + Symbol Symbol @@ -21751,12 +21813,12 @@ p, li { white-space: pre-wrap; } Quantile - + Natural Breaks (Jenks) - + @@ -21766,7 +21828,7 @@ p, li { white-space: pre-wrap; } Pretty Breaks - + @@ -21934,7 +21996,7 @@ p, li { white-space: pre-wrap; } Remove the selected layer(s) from QGis canvas before continue. - + @@ -21945,7 +22007,7 @@ p, li { white-space: pre-wrap; } Are you sure you want to delete %n selected layer(s)? number of layers to delete - + @@ -21964,19 +22026,19 @@ p, li { white-space: pre-wrap; } Cannot copy map %1@%2 - + <br>command: %1 %2<br>%3<br>%4 - + Cannot rename map %1 - + @@ -22184,27 +22246,27 @@ p, li { white-space: pre-wrap; } Cannot check orphan record: %1 - + Cannot describe table for field %1 - + Left: %1 - + -- Middle: %1 - + -- Right: %1 - + @@ -22424,7 +22486,7 @@ p, li { white-space: pre-wrap; } Undo last vertex - + New point @@ -22876,39 +22938,39 @@ p, li { white-space: pre-wrap; } Cannot check region of map %1 - + Cannot get region of map %1 - + The file already exists. Overwrite? - + The mapcalc schema (%1) not found. - + Cannot open mapcalc schema (%1) - + Cannot read mapcalc schema (%1): - + %1 at line %2 column %3 - + @@ -22986,23 +23048,23 @@ at line %2 column %3 Module: %1 - + The module file (%1) not found. - + Cannot open module file (%1) - + Cannot read module file (%1) - + @@ -23010,52 +23072,52 @@ at line %2 column %3 %1 at line %2 column %3 - + Module %1 not found - + Cannot find man page %1 - + Not available, description not found (%1) - + Not available, cannot open description (%1) - + Not available, incorrect description (%1) - + Input %1 outside current region! - + Output %1 exists! Overwrite? - + Cannot find module %1 - + Cannot start module: %1 - + @@ -23116,7 +23178,7 @@ at line %2 column %3 'layer' attribute in field tag with key= %1 is missing. - + @@ -23129,12 +23191,12 @@ at line %2 column %3 %1:&nbsp;missing value - + %1:&nbsp;directory does not exist - + @@ -23142,7 +23204,7 @@ at line %2 column %3 OGR/PostGIS/GDAL Input - + @@ -23159,12 +23221,12 @@ at line %2 column %3 Cannot find layeroption %1 - + Cannot find whereoption %1 - + @@ -23179,7 +23241,7 @@ at line %2 column %3 %1:&nbsp;no input - + @@ -23200,22 +23262,22 @@ at line %2 column %3 Cannot find typeoption %1 - + Cannot find values for typeoption %1 - + Cannot find layeroption %1 - + GRASS element %1 not supported - + @@ -23225,7 +23287,7 @@ at line %2 column %3 %1:&nbsp;no input - + @@ -23244,17 +23306,17 @@ at line %2 column %3 Cannot parse version_min %1 - + Cannot parse version_max %1 - + %1:&nbsp;missing value - + @@ -23262,7 +23324,7 @@ at line %2 column %3 Selected categories - + @@ -23270,17 +23332,17 @@ at line %2 column %3 Item with key %1 not found - + << Hide advanced options - + Show advanced options >> - + @@ -23305,49 +23367,49 @@ at line %2 column %3 Cannot find module %1 - + Cannot start module %1 - + <br>command: %1 %2<br>%3<br>%4 - + Cannot read module description (%1): - + %1 at line %2 column %3 - + Cannot find key %1 - + Item with id %1 not found - + Cannot check region of map %1 - + Cannot set region of map %1 - + @@ -23524,39 +23586,39 @@ at line %2 column %3 No writable locations, the database is not writable! - + Regions file (%1) not found. - + Cannot open locations file (%1) - + Cannot read locations file (%1): - + %1 at line %2 column %3 - + Cannot create new location: %1 - + New mapset successfully created, but cannot be opened: %1 - + @@ -23920,12 +23982,12 @@ p, li { white-space: pre-wrap; } Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module). - + Cannot open vector %1 in mapset %2 - + @@ -23958,12 +24020,12 @@ p, li { white-space: pre-wrap; } Cannot open GRASS vector: %1 - + Cannot create new vector: %1 - + @@ -23978,22 +24040,22 @@ p, li { white-space: pre-wrap; } Cannot open the mapset. %1 - + Cannot close mapset. %1 - + Cannot close current mapset. %1 - + Cannot open GRASS mapset. %1 - + @@ -24001,7 +24063,7 @@ p, li { white-space: pre-wrap; } GRASS vector map %1 does not have topology. Build topology? - + @@ -24010,6 +24072,16 @@ p, li { white-space: pre-wrap; } null (no data) null (ingen data) + + + cellhd file %1 does not exist + + + + + Groups not yet supported + Grupper stöds ännu inte + QgsGrassRegion @@ -24085,22 +24157,22 @@ p, li { white-space: pre-wrap; } Select the extent by dragging on canvas or change the following values - + Resolution - + Cell width - + Cell height - + @@ -24110,7 +24182,7 @@ or change the following values Border - + @@ -24227,7 +24299,7 @@ or change the following values Browse... - + Bläddra... OK @@ -24270,7 +24342,7 @@ or change the following values Cannot rename the lock file %1 - + @@ -24302,34 +24374,34 @@ or change the following values GRASS Tools: %1/%2 - + The config file (%1) not found. - + Cannot open config file (%1). - + Cannot read config file (%1): - + %1 at line %2 column %3 - + Cannot start command shell (%1) - + @@ -24385,50 +24457,50 @@ at line %2 column %3 New file - + New datasource - + none - + Select file to replace '%1' - + Please select exactly one file. - + Select new directory of selected files - + All files (*) - + Unhandled layer will be lost. - + There are still %n unhandled layer(s), that will be lost if you closed now. unhandled layers - + @@ -24439,7 +24511,7 @@ at line %2 column %3 Handle bad layers - + @@ -24459,22 +24531,22 @@ at line %2 column %3 Original filename - + New filename - + Original datasource - + New datasource - + @@ -24482,7 +24554,7 @@ at line %2 column %3 <h3>Oops! QGIS can't find help for this form.</h3>The help file for %1 was not found for your language<br>If you would like to create it, contact the QGIS development team - + @@ -24576,12 +24648,12 @@ at line %2 column %3 Delete - + html - + @@ -24669,119 +24741,119 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Distance coefficient P - + QgsIdentifyResults - - + + (Derived) (Härledd) - + Identify Results Identifiera Resultat - + Feature Objekt - + Value Värde - + (Actions) - + - - - + + + Edit feature form - + - - - + + + View feature form - + - + Layer properties... - + Attribute changes - + - + Could not open url - + - + Could not open URL '%1' - + - + Zoom to feature Zooma till objekt - + Copy attribute value Kopiera attributvärde - + Copy feature attributes Kopiera attribut - + Expand all - + - + Collapse all - + Attribute changed Attribut ändrats - + Clear results - + - + Clear highlights - + - + Highlight all - + - + Highlight layer - + @@ -24791,13 +24863,35 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern.Identify Results Identifiera Resultat + + + Expand tree. + + + + + + + ... + ... + + + + Collapse tree. + + + + + New results will be expanded by default. + + QgsImageWarper Progress indication - + @@ -24877,12 +24971,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Vector layers - + Interpolation attribute - + @@ -24938,12 +25032,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Cellsize X - + Cellsize Y - + @@ -24968,7 +25062,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Set to current extent - + @@ -25120,7 +25214,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Label Properties - + @@ -25205,19 +25299,19 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. In points - + In map units - + Transparency - + @@ -25252,27 +25346,27 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Basic label options - + Buffer labels - + Label only selected features - + Data defined placement - + Data defined properties - + @@ -25307,7 +25401,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Strikeout - + @@ -25351,17 +25445,17 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Label font - + Font color - + Buffer color - + @@ -25369,7 +25463,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Label properties - + @@ -25396,22 +25490,22 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Show label - + Max - + Min - + Scale-based - + @@ -25426,7 +25520,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Label distance - + @@ -25441,12 +25535,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Horizontal alignment - + Vertical alignment - + @@ -25461,54 +25555,54 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern.kartenheter - + Sample @ %1 pts (using map units) - + Exempel @ %1 pkter (satt i kartenheter) - + (not found!) - + (ej funnen!) - + Sample @ %1 pts (using map units, BUFFER IN MILLIMETERS) - + Exempel @ %1 pkter (satt i kartenheter, BUFFER ÄR SATT I MILLIMETER ) - + Sample Test - + Sample (BUFFER NOT SHOWN, in map units) - + Exempel (BUFFER VISAS INTE, är satt i kartenheter) - + Expression based label - + Uttrycksbaserad textsättning - + Mixed Case - + Blandat versaler/gemener - + All Uppercase - + Allt till versaler - + All Lowercase - + Allt till gemener - + Title Case - + Versal som första bokstav @@ -25516,42 +25610,42 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Layer labeling settings - + Lagrets etikettinställningar Expression - + Uttryck Label settings - + Textinställningar Size for sample text in map units - + Storlek i kartenheter för exempeltexten Sample background color - + Backgrundsfärg i exempelrutan Multiple lines - + Flerradig text Wrap on character - + Byt rad vid följande tecken Line height spacing for multi-line text - + Avstånd mellan raderna i flerradig text @@ -25561,85 +25655,85 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Paragraph style alignment of multi-line text - + Horisontell justering av flerradig text Available typeface styles - + Tillgängliga teckenformat Underlined Text - + Understruken text Strikeout text - + Genomstruken text Space in pixels or map units, relative to size unit choice - + Avstånd mellan ord i pixel eller kartenheter, baserat på vald enhet under storlek Type case - + Versalisering Capitalization style of text - + Typ av versalisering på texten Minimum - + Minimum Maximum - + Maximum Formatted numbers - + Formatera nummer Decimal places - + Antal decimaler Show plus sign - + Visa plus-symbol - + map units kartenheter Pen Join style - + Color area inside of pen stroke - + - + Transparency Genomskinlighet @@ -25647,7 +25741,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. % - + % @@ -25657,39 +25751,39 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Reset sample text - + Återställ exempeltext - + Multi-line align - + - + Word spacing - + Ordavstånd - + Letter spacing - + Teckenavstånd - + Line height - + Radavstånd line - + rad - + Left Vänster @@ -25700,14 +25794,14 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. - + Right Höger U - + U @@ -25717,7 +25811,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. points - + punkter @@ -25730,73 +25824,73 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern.Avancerad - + Options Inställningar - + Label every part of multi-part features - + Textsätt varje del av en flerdelad geometri - + Merge connected lines to avoid duplicate labels - + Slå ihop linjer med kontakt för att undvika duplicering av texter - + Add direction symbol - + Lägg till symbol i texten som visar linjens riktning - + Features don't act as obstacles for labels - + Geometriobjekt räknas inte som hinder för texten - + Placement Placering - - - + + + Label distance - + - + Capitalization - + Versalisering - + Add label columns to attribute table - + Lägg till textkolumner i attributtabellen - + About data defined values - + Om datadefinerad textsättning - + mm mm - - - + + + Rotation Rotation - - + + degrees grader @@ -25807,7 +25901,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Text style - + Textutseende @@ -25832,7 +25926,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. - + Color Färg @@ -25844,12 +25938,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. - + Size Storlek - + mm mm @@ -25862,37 +25956,37 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Lorem Ipsum - + Lorem Ipsum Font size Typsnittsstorlek - - + + In map units - + - + Priority - + Prioritet - + Low Låg - + High Hög Scale-based visibility - + Skalbaserad synlighet Enabled @@ -25907,270 +26001,290 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern.Maximum - + Suppress labeling of features smaller than - + Visa inte texter på objekt mindre än - - + + In mm - + I mm - + Line orientation dependent position - + Position baserat på linjens riktning - + Data defined settings Datadefinierade inställningar - + Buffer transparency - + Genomskinlighet på buffer - + Uncheck to write labeling engine derived rotation on pin and NULL on unpin - + - + Preserve existing rotation values during label pin/unpin operations - + Bevara nuvarande rotationsvärden när text sätts fast / tas loss - + Display properties - + Inställningar för synlighet - + Minimum scale - + Minimumskala - + Show label - + - + Maximum scale - + Maximumskala - + Font properties - + Inställningar för tecken - + Bold - + Fet - + Italic - + Kursiv - + Underline - + Understruken - + Font family Typsnittsfamilj - + Position Position - + Automated placement settings Automatiserad placering - + Show all labels for this layer (i.e. including colliding labels) - + Visa all text för detta lager (exempelvis så inkluderas kolliderande text) - + Around point - + Runt punkten - + Offset from point - + Exakt position från punkten - + Parallel - + Parallelt - + Curved - + Böjt - + Horizontal Horisontell - + Offset from centroid - + Exakt position från centroiden - + Around centroid - + Runt centroiden - + Horizontal (slow) - + Horisontellt (långsam) - + Free (slow) - + Fritt (långsamt) - + Using perimeter - + Längs kantlinje - + Centroid of - + Centroiden på - + visible polygon - + synlig polygon - + whole polygon - + hel polygon - + Above line Ovanför linje - + On line På linje - + Below line - + Under linje - + X - + X - + Y - + Y - + Above Right Ovanför Höger - + Above Left Ovanför Vänster - + Over Över - + Above Ovanför - + Below Left Nedanför Vänster - + Below Nedanför - + Below Right Nedanför Höger - + + Show upside-down labels + + + + + never + aldrig + + + + when rotation defined + + + + + always + alltid + + + X Coordinate X-koordinat - + Y Coordinate Y-koordinat - + Horizontal alignment - + - + Vertical alignment - + - + Strikeout - + Label this layer with - + Textsätt lagret från - + Buffer properties - + Inställningar för buffer - + Buffer size Buffertstorlek - + Buffer color - + @@ -26178,7 +26292,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Outline: %1 - + @@ -26187,7 +26301,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. sub-group - + undergrupp @@ -26198,12 +26312,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. &Make to Toplevel Item - + &Flytta överst i lagerstrukturen Zoom to Group - + Zooma till gruppens utbredning @@ -26213,42 +26327,42 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. &Set Group CRS - + &Definera gruppens koordinatsystem &Group Selected - + &Gruppera valda lager Copy Style - + Kopiera utseende Paste Style - + Klistra in utseende &Add New Group - + &Lägg till ny grupp &Expand All - + &Expandera alla &Collapse All - + &Kollapsa alla &Update Drawing Order - + &Uppdatera renderingsordning &Make to toplevel item @@ -26257,7 +26371,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Legend context - + @@ -26303,42 +26417,42 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. &Query... - + Skapa &urval... &Zoom to Layer Extent - + &Zooma till lagrets utbredning &Zoom to Best Scale (100%) - + Zooma till &optimal skala (100%) &Stretch Using Current Extent - + Sträck &kontrast utifrån synlig del &Show in Overview - + &Visa i översikt &Set Layer CRS - + &Definera koordinatsystem Set &Project CRS from Layer - + &Använd lagrets koord.sys. till projektet &Open Attribute Table - + &Öppna attributtabell @@ -26349,12 +26463,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Save Selection As... - + Spara valda objekt som... Show Feature Count - + Visa antal objekt @@ -26365,7 +26479,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Updating feature count for layer %1 - + Uppdaterar antal objekt för lager %1 @@ -26379,7 +26493,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Group - + Gruppera @@ -26425,12 +26539,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Save connections - + XML files (*.xml *.XML) - + @@ -26440,12 +26554,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Clear selection - + Select connections to import - + @@ -26460,17 +26574,17 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Export/import error - + You should select at least one connection from list. - + Saving connections - + @@ -26498,7 +26612,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Loading connections - + @@ -26519,35 +26633,35 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. The file is not an WMS connections exchange file. - + The file is not an WFS connections exchange file. - + The file is not an WCS connections exchange file. - + The file is not an PostGIS connections exchange file. - + The file is not an MSSQL connections exchange file. - + The file is not an %1 connections exchange file. - + @@ -26555,7 +26669,7 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Connection with name '%1' already exists. Overwrite? - + @@ -26563,12 +26677,12 @@ Detta kan vara ett problem med din nätverksanslutning eller WMS-servern. Manage connections - + Select connections to export - + Browse @@ -26739,14 +26853,14 @@ Y: QgsMapRenderer - - + + Transform error caught: %1 Koordinattransformeringsfel fångades: %1 - - + + CRS Referenskoordinatsystem @@ -26906,23 +27020,23 @@ Y: No feature selected. Please select a feature with the selection tool or in the attribute table - + Several features are selected. Please select only one feature to which an part should be added. - + Error. Could not add part. - + Fel. Kunde inte lägga till del. Part added - + Del tillagd @@ -26937,32 +27051,32 @@ Y: Selected feature is not multi part. - + Valt objekt är inte ett flerdelat objekt. New part's geometry is not valid. - + Den nya geometridelen är inte korrekt. New polygon ring not disjoint with existing polygons. - + Several features are selected. Please select only one feature to which an island should be added. - + Selected geometry could not be found - + Vald geometri kan inte hittas Error, could not add part - + Fel, kunde inte lägga till del @@ -26985,7 +27099,7 @@ Y: Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. - + @@ -27051,12 +27165,12 @@ Y: Validation started. - + Validation finished. - + @@ -27064,7 +27178,7 @@ Y: Label properties changed - + @@ -27112,116 +27226,106 @@ Y: No active vector layer - + To run an action, you must choose a vector layer by clicking on its name in the legend - + No actions available - + The active vector layer has no defined actions - + No features at this position found. - + QgsMapToolIdentify - - + + (clicked coordinate) (vald koordinat) - + No active layer Inget aktivt lager - + To identify features, you must choose an active layer by clicking on its name in the legend För att identifiera objekt måste du välja aktivt lager genom att klicka på namnet i teckenförklaringen - + Identifying on %1... - + Identiferar på %1... - + Identifying done. - + Identifiering klar. - + No features at this position found. - + - + Length Längd - + firstX attributes get sorted; translation for lastX should be lexically larger than this one förstaX - + firstY förstaY - + lastX attributes get sorted; translation for firstX should be lexically smaller than this one sistaX - + lastY sistaY - + Area Area - + feature id objekt-id - + new feature - - - - - WMS layer - - - - - Feature info - + nytt objekt - + Raster Raster @@ -27236,7 +27340,7 @@ Y: Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. - + @@ -27249,7 +27353,7 @@ Y: Label moved - + Text flyttad @@ -27282,22 +27386,22 @@ Y: Offset curve - + Offset: - + Geometry error - + Creating offset geometry failed - + @@ -27305,12 +27409,12 @@ Y: Label pinned - + Text fastsatt Label unpinned - + Text lossad @@ -27333,7 +27437,7 @@ Y: Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. - + @@ -27348,7 +27452,7 @@ Y: Reshape - + Omforma objekt @@ -27356,7 +27460,7 @@ Y: Label rotated - + Text roterad @@ -27364,27 +27468,27 @@ Y: No point feature - + No point feature was detected at the clicked position. Please click closer to the feature or enhance the search tolerance under Settings->Options->Digitizing->Serch radius for vertex edits - + No rotation Attributes - + The active point layer does not have a rotation attribute - + Rotate symbol - + @@ -27411,12 +27515,12 @@ Y: Label hidden - + Text dold Label shown - + Text synlig @@ -27465,7 +27569,7 @@ Y: Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. - + @@ -27505,12 +27609,12 @@ Y: Cut edges detected. Make sure the line splits features into multiple parts. - + The geometry is invalid. Please repair before trying to split it. - + Geometrin är ogiltig. Reparera den innan nytt försök görs. @@ -27577,32 +27681,32 @@ Y: Forces labels on, regardless of collisions. Available only for cached labels. - + Check to allow MapServer to return data in GML format. Useful when used with WMS GetFeatureInfo operations. - + Force - + MapServer Export: Save project to MapFile - + Use current project - + LAYER information only - + @@ -27615,77 +27719,77 @@ Y: For example: http://my.host.com/cgi-bin/mapserv.exe - + Inline - + Symbolset - + Use templates - + The file name of the fonts file. - + Fontset - + The file name of the symbols file. - + Layer/label options - + Should text be antialiased? Note that this requires more available colors, decreases drawing performance, and results in slightly larger output images. - + Anti-alias - + Can text run off the edge of the map? - + Partials - + Dump - + Paths - + MapServer url - + @@ -27746,7 +27850,7 @@ http://my.host.com/cgi-bin/mapserv.exe dd - + feet @@ -27754,15 +27858,15 @@ http://my.host.com/cgi-bin/mapserv.exe miles - + inches - + kilometers - + @@ -27896,12 +28000,12 @@ http://my.host.com/cgi-bin/mapserv.exe Decimal number (real) - + Decimaltal (real) Text (string) - + Text (string) @@ -27964,12 +28068,12 @@ http://my.host.com/cgi-bin/mapserv.exe Skip attribute - + Hoppa över attribut Skipped - + Slås ej ihop @@ -28003,18 +28107,18 @@ http://my.host.com/cgi-bin/mapserv.exe QGIS Log - + QGIS-logg No messages. - + Inga meddelanden. %1 message(s) logged. - + %1 meddelande(n) loggade. @@ -28024,17 +28128,17 @@ http://my.host.com/cgi-bin/mapserv.exe Timestamp - + Tidpunkt Message - + Meddelande Level - + Nivå @@ -28060,36 +28164,36 @@ http://my.host.com/cgi-bin/mapserv.exe Delete - + %1: Not a vector layer! - + %1: Är inte ett vektorlager! %1: OK! - + %1: OK! Import to MSSQL database - + Failed to import some layers! - + Import was successful. - + @@ -28097,23 +28201,23 @@ http://my.host.com/cgi-bin/mapserv.exe Saving passwords - + WARNING: You have opted to save your password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. - + VARNING: Du har valt att spara ditt lösenord. Det kommer att sparas som synlig text i projektfiler, i din hemkatalog på Unix-system eller i användarkatalogen på Windows. Om du inte vill spara lösenordet, tryck på Avbryt. Save connection - + Spara anslutning Should the existing connection %1 be overwritten? - + Vill du att existerande anslutning '%1' ska skrivas över? @@ -28128,14 +28232,14 @@ http://my.host.com/cgi-bin/mapserv.exe Connection failed - Host name hasn't been specified. - + Connection failed - Database name hasn't been specified. - + @@ -28148,7 +28252,7 @@ http://my.host.com/cgi-bin/mapserv.exe Create a New MSSQL connection - + Skapa en ny MSSQL-anslutning @@ -28163,7 +28267,7 @@ http://my.host.com/cgi-bin/mapserv.exe Provider/DSN - + Provider/DSN @@ -28188,22 +28292,22 @@ http://my.host.com/cgi-bin/mapserv.exe Name of the new connection - + Namn på den nya anslutningen Trusted Connection - + Betrodd anslutning Save Username - + Spara användarnamn &Test Connect - + &Testa anslutning @@ -28213,17 +28317,17 @@ http://my.host.com/cgi-bin/mapserv.exe Only look in the geometry_columns metadata table - + Also list tables with no geometry - + Use estimated table parameters - + Använd estimerade tabellparametrar @@ -28231,37 +28335,37 @@ http://my.host.com/cgi-bin/mapserv.exe 8 Bytes integer - + 4 Bytes integer - + 2 Bytes integer - + 1 Bytes integer - + Decimal number (numeric) - + Decimal number (decimal) - + Decimal number (real) - + Decimaltal (real) @@ -28271,32 +28375,32 @@ http://my.host.com/cgi-bin/mapserv.exe Text, fixed length (char) - + Text, limited variable length (varchar) - + Text, fixed length unicode (nchar) - + Text, limited variable length unicode (nvarchar) - + Text, unlimited length (text) - + Text, unlimited length unicode (ntext) - + @@ -28312,12 +28416,12 @@ http://my.host.com/cgi-bin/mapserv.exe %1 as %2 in %3 - + as geometryless table - + @@ -28325,7 +28429,7 @@ http://my.host.com/cgi-bin/mapserv.exe Add MSSQL Table(s) - + @@ -28335,7 +28439,7 @@ http://my.host.com/cgi-bin/mapserv.exe &Build query - + @@ -28388,7 +28492,7 @@ http://my.host.com/cgi-bin/mapserv.exe Primary key column - + @@ -28410,7 +28514,7 @@ http://my.host.com/cgi-bin/mapserv.exe Confirm Delete - + @@ -28438,7 +28542,7 @@ http://my.host.com/cgi-bin/mapserv.exe MSSQL Provider - + @@ -28456,7 +28560,7 @@ http://my.host.com/cgi-bin/mapserv.exe Select... - + @@ -28489,12 +28593,12 @@ http://my.host.com/cgi-bin/mapserv.exe Primary key column - + Select at id - + @@ -28504,7 +28608,7 @@ http://my.host.com/cgi-bin/mapserv.exe Detecting... - + @@ -28512,17 +28616,17 @@ http://my.host.com/cgi-bin/mapserv.exe Select... - + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). - + Enter... - + @@ -28557,12 +28661,12 @@ http://my.host.com/cgi-bin/mapserv.exe No Geometry - + Unknown Geometry - + @@ -28572,40 +28676,40 @@ http://my.host.com/cgi-bin/mapserv.exe Not set - + No enhancement - + Stretch to MinMax - + Stretch and clip to MinMax - + Clip to MinMax - + - + Red Röd - + Green Grön - + Blue Blå @@ -28653,12 +28757,12 @@ http://my.host.com/cgi-bin/mapserv.exe Network request %1 timed out - + Network - + @@ -28666,38 +28770,38 @@ http://my.host.com/cgi-bin/mapserv.exe Create a new %1 connection - + Ignore GetCoverage URI reported in capabilities - + Ignore axis orientation - + Save connection - + Spara anslutning Should the existing connection %1 be overwritten? - + Vill du att existerande anslutning '%1' ska skrivas över? Saving passwords - + WARNING: You have entered a password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. Note: giving the password is optional. It will be requested interactivly, when needed. - + @@ -28715,7 +28819,7 @@ Note: giving the password is optional. It will be requested interactivly, when n If the service requires basic authentication, enter a user name and optional password - + @@ -28730,22 +28834,22 @@ Note: giving the password is optional. It will be requested interactivly, when n Ignore GetFeatureInfo URI reported in capabilities - + Ignore GetMap URI reported in capabilities - + Ignore axis orientation (WMS 1.3/WMTS) - + Invert axis orientation - + @@ -28764,7 +28868,7 @@ Note: giving the password is optional. It will be requested interactivly, when n &User name - + @@ -28799,12 +28903,12 @@ Detaljerad felinformation: Save connection - + Spara anslutning Should the existing connection %1 be overwritten? - + Vill du att existerande anslutning '%1' ska skrivas över? @@ -28812,7 +28916,7 @@ Detaljerad felinformation: Create a New OGR Database connection - + Skapa en ny OGR-databasanslutning @@ -28832,7 +28936,7 @@ Detaljerad felinformation: &Test Connect - + &Testa anslutning @@ -28875,22 +28979,22 @@ Detaljerad felinformation: Text data - + Text Whole number - + Heltal Decimal number - + Decimaltal New SpatiaLite Database File - + Ny SpatiaLite-databasfil @@ -28903,12 +29007,12 @@ Detaljerad felinformation: SpatiaLite Database - + SpatiaLite-databas Unable to open the database - + Kan inte öppna databasen @@ -28918,55 +29022,58 @@ Detaljerad felinformation: Failed to load SRIDS: %1 - + Misslyckades att ladda SRIDS: %1 @ - + @ Registered new database! - + Registrerade ny databas! Unable to open the database: %1 - + Kan inte öppna databasen: %1 Error Creating SpatiaLite Table - + Fel vid skapande av SpatiaLite-tabell Failed to create the SpatiaLite table %1. The database returned: %2 - + Misslyckades att skapa SpatiaLite-tabellen %1. Databasen returnerade: +%2 Error Creating Geometry Column - + Fel vid skapande av geometrikolumn Failed to create the geometry column. The database returned: %1 - + Misslyckades med att skapa geometrikolumnen. Databasen returnerade: +%1 Error Creating Spatial Index - + Fel vid skapande av spatialt index Failed to create the spatial index. The database returned: %1 - + Misslyckades med att skapa det spatiala indexet. Databasen returnerade: +%1 @@ -28984,7 +29091,7 @@ Detaljerad felinformation: New Spatialite Layer - + Nytt SpatiaLite-lager @@ -28994,7 +29101,7 @@ Detaljerad felinformation: Create a new Spatialite database - + Skapa ny SpatiaLite-databas @@ -29010,7 +29117,7 @@ Detaljerad felinformation: Name for the new layer - + Namn på det nya lagret @@ -29020,7 +29127,7 @@ Detaljerad felinformation: geometry - + geometry @@ -29047,7 +29154,7 @@ Detaljerad felinformation: MultiPoint - + MultiPunkt @@ -29067,12 +29174,12 @@ Detaljerad felinformation: Remove attribute - + Ta bort attribut Spatial Reference Id - + Koordinatsystem-ID @@ -29083,12 +29190,12 @@ Detaljerad felinformation: Add an integer id field as the primary key for the new layer - + Skapa ett ID-attribut (integer) för att använda som primärnyckel i det nya lagret Create an autoincrementing primary key - + Skapa en automatiskt uppräknande primärnyckel @@ -29104,22 +29211,22 @@ Detaljerad felinformation: An attribute name - + Namn på attributet Attributes list - + Lista över attribut Add attribute to list - + Lägg till attribut i listan Add to attributes list - + Lägg till i lista @@ -29132,22 +29239,22 @@ Detaljerad felinformation: Text data - + Text Whole number - + Heltal Decimal number - + Decimaltal ESRI Shapefile - + ESRI Shapefil @@ -29215,17 +29322,17 @@ Detaljerad felinformation: Remove attribute - + Ta bort attribut Add attribute to list - + Lägg till attribut i listan Add to attributes list - + Lägg till i lista @@ -29241,7 +29348,7 @@ Detaljerad felinformation: Attributes list - + Lista över attribut @@ -29343,7 +29450,7 @@ Detaljerad felinformation: Layer ID - + Lager-ID @@ -29353,7 +29460,7 @@ Detaljerad felinformation: Nb of features - + Antal objekt @@ -29366,7 +29473,7 @@ Detaljerad felinformation: Select layers to load - + Välj lager att ladda @@ -29379,7 +29486,7 @@ Detaljerad felinformation: Open Street Map format - + @@ -29400,7 +29507,7 @@ Detaljerad felinformation: Delete - + @@ -29443,7 +29550,7 @@ Detaljerad felinformation: Confirm Delete - + @@ -29473,7 +29580,7 @@ Detaljerad felinformation: Could not understand the response: %1 - + @@ -29522,7 +29629,7 @@ Detaljerad felinformation: C&onnect - + @@ -29537,7 +29644,7 @@ Detaljerad felinformation: Delete - + @@ -29629,7 +29736,7 @@ Detaljerad felinformation: Feature limit for GetFeatureInfo - + Coordinate Reference System @@ -29667,7 +29774,7 @@ Always network: always load from network and do not check if the cache has a val Move selected layer UP - + @@ -29677,7 +29784,7 @@ Always network: always load from network and do not check if the cache has a val Move selected layer DOWN - + @@ -29697,7 +29804,7 @@ Always network: always load from network and do not check if the cache has a val Tilesets - + @@ -29750,80 +29857,80 @@ Always network: always load from network and do not check if the cache has a val Could not open the spatialite database - + Unable to initialize SpatialMetadata: - + Could not create a new database - + Unable to activate FOREIGN_KEY constraints - + Unknown data type %1 - + QGIS wkbType %1 not supported - + %v / %m features copied - + %v / %m features processed - + %v / %m fields added - + %v / %m features added - + %v / %m features removed - + %v / %m feature updates - + %v / %m feature geometry updates - + Offline Editing Plugin - + Could not open the spatialite logging database - + @@ -29831,12 +29938,12 @@ Always network: always load from network and do not check if the cache has a val Convert to offline project - + Create offline copies of selected layers and save as offline project - + @@ -29844,17 +29951,17 @@ Always network: always load from network and do not check if the cache has a val &Offline Editing - + Synchronize - + Synchronize offline project with remote layers - + @@ -29862,12 +29969,12 @@ Always network: always load from network and do not check if the cache has a val Select target database for offline data - + SpatiaLite DB - + @@ -29877,17 +29984,17 @@ Always network: always load from network and do not check if the cache has a val Offline Editing Plugin - + Converting to offline project. - + Offline database file '%1' exists. Overwrite? - + @@ -29895,27 +30002,27 @@ Always network: always load from network and do not check if the cache has a val Create offline project - + Offline data - + Browse... - + Bläddra... Select remote layers - + Show only editable layers - + @@ -29923,7 +30030,7 @@ Always network: always load from network and do not check if the cache has a val Layer %1 of %2.. - + @@ -29944,18 +30051,18 @@ Always network: always load from network and do not check if the cache has a val Couldn't open file %1.prj - + OGR - + Couldn't open file %1.qpj - + @@ -29963,7 +30070,7 @@ Always network: always load from network and do not check if the cache has a val Data source is invalid (%1) - + @@ -29972,12 +30079,12 @@ Always network: always load from network and do not check if the cache has a val OGR - + Data source is invalid, no layer found (%1) - + @@ -29987,120 +30094,120 @@ Always network: always load from network and do not check if the cache has a val Decimal number (real) - + Decimaltal (real) Text (string) - + Text (string) OGR[%1] error %2: %3 - + Unknown - + Read attempt on an invalid OGR data source - + OGR error creating wkb for feature %1: %2 - + type %1 for attribute %2 not found - + OGR error creating feature %1: %2 - + type %1 for field %2 not found - + OGR error creating field %1: %2 - + OGR error deleting field %1: %2 - + Deleting fields is not supported prior to GDAL 1.9.0 - + OGR error on feature %1: id too large - + Feature %1 for attribute update not found. - + Field %1 of feature %2 doesn't exist. - + Type %1 of attribute %2 of feature %3 unknown. - + OGR error setting feature %1: %2 - + OGR error changing geometry: feature %1 not found - + OGR error creating geometry for feature %1: %2 - + OGR error in feature %1: geometry is null - + OGR error setting geometry of feature %1: %2 - + OGR error deleting feature %1: %2 - + Shapefiles without attribute are considered read-only. - + @@ -30108,7 +30215,7 @@ Always network: always load from network and do not check if the cache has a val Choose a name of the raster - + @@ -30125,7 +30232,7 @@ Always network: always load from network and do not check if the cache has a val Choose a name for the modified raster - + @@ -30136,7 +30243,7 @@ Always network: always load from network and do not check if the cache has a val Open raster - + @@ -30152,7 +30259,7 @@ Always network: always load from network and do not check if the cache has a val Save raster as: - + @@ -30188,7 +30295,7 @@ Always network: always load from network and do not check if the cache has a val No database selected. - + @@ -30203,17 +30310,17 @@ Always network: always load from network and do not check if the cache has a val No protocol URI entered. - + No layers selected. - + No directory selected. - + @@ -30327,67 +30434,67 @@ Always network: always load from network and do not check if the cache has a val None / Planimetric - + Current layer - + Top down, stop at first - + Top down - + Show all features - + Show selected features - + Show features in current canvas - + Always - + If needed - + Never - + Load all - + Check file contents - + Check extension - + @@ -30397,43 +30504,43 @@ Always network: always load from network and do not check if the cache has a val Basic scan - + Full scan - + Parameters : - + Enter scale - + Scale denominator - + Load scales - + XML files (*.xml *.XML) - + Save scales - + @@ -30459,43 +30566,43 @@ Always network: always load from network and do not check if the cache has a val Parameters: - + Can only use ellipsoidal calculations when CRS transformation is enabled - + To vertex - + Cumulative pixel count cut - + Minimum / maximum - + Mean +/- standard deviation - + To segment - + To vertex and segment - + @@ -30507,7 +30614,7 @@ Always network: always load from network and do not check if the cache has a val Off - + @@ -30517,49 +30624,49 @@ Always network: always load from network and do not check if the cache has a val GEOS - + Round - + Mitre - + Bevel - + Save default project - + You must set a default project - + Current project saved as default - + Error saving current project as default - + Choose a directory to store project template files - + @@ -30569,12 +30676,12 @@ Always network: always load from network and do not check if the cache has a val Create Options - %1 Driver - + Create Options - pyramids - + @@ -30608,17 +30715,17 @@ Always network: always load from network and do not check if the cache has a val Popmusic tabu chain (slow) - + Popmusic tabu (slow) - + Popmusic chain (very slow) - + @@ -30794,12 +30901,12 @@ Always network: always load from network and do not check if the cache has a val Create raster icons in legend - + Open identify results in a dock window (QGIS restart required) - + Open attribute table in a dock window @@ -30813,7 +30920,7 @@ Always network: always load from network and do not check if the cache has a val Attribute table behaviour - + Attributtabellens beteende @@ -30833,7 +30940,7 @@ Always network: always load from network and do not check if the cache has a val Use render caching where possible to speed up redraws - + @@ -30843,52 +30950,52 @@ Always network: always load from network and do not check if the cache has a val SVG paths - + Sökvägar till SVG-symboler Path(s) to search for Scalable Vector Graphic (SVG) symbols - + Sökväg(ar) där sökning sker efter 'Scalable Vector Graphic (SVG)'-symboler Decimal places - + Antal decimaler Keep base unit - + Ändra inte mätenhet Timeout for network requests (ms) - + Compatibility - + Kompatibilitet Create new project from default project - + Skapa nya projekt från standardprojektmall Set current project as default - + Sätt nuvarande projekt som standardmall Reset default - + Återställ standardmall Template folder - + Katalog för projektmallar @@ -30898,47 +31005,47 @@ Always network: always load from network and do not check if the cache has a val Reset - + Enable macros - + Aktivera makron Never - + Ask - + Fråga For this session only - + Endast för den här sessionen Always (not recommended) - + Alltid (Rekommenderas ej) Application - + Applikation Style <i>(QGIS restart required)</i> - + Stil på gränssnitt<i>(Kräver omstart av QGIS)</i> Icon size - + Ikonstorlek @@ -30958,87 +31065,87 @@ Always network: always load from network and do not check if the cache has a val Double click action in legend - + Open layer properties - + Open attribute table - + Show tips at start up - + Open snapping options in a dock window (QGIS restart required) - + Open attribute table in a dock window (QGIS restart required) - + Add new layers to selected or current group - + Lägg till lager i markerad grupp Copy geometry in WKT representation from attribute table - + Ignore shapefile encoding - + Ignorera textkodning i shapefiler Attribute table row cache - + Antalet rader i attributtabellens cache Representation for NULL values - + Prompt for raster sublayers - + Scan for valid items in the browser dock - + Scan for contents of compressed files (.zip) in browser dock - + GDAL - + GDAL GDAL Drivers - + In some cases more than one GDAL driver can be used to load the same raster format. Use the list below to specify which to use. - + @@ -31048,12 +31155,12 @@ Always network: always load from network and do not check if the cache has a val ext - + Flags - + @@ -31063,17 +31170,17 @@ Always network: always load from network and do not check if the cache has a val GDAL Driver Options - + Edit Pyramids Options - + Edit Create Options - + @@ -31083,12 +31190,12 @@ Always network: always load from network and do not check if the cache has a val Plugin paths - + Sökvägar till insticksprogram Path(s) to search for additional C++ plugins libraries - + Sökväg(ar) där sökning sker efter externa C++ insticksprogram @@ -31098,22 +31205,22 @@ Always network: always load from network and do not check if the cache has a val Enable back buffer (Better graphics performance at the cost of loosing the possibility to cancel rendering and incremental feature drawing) - + Use new generation symbology for rendering - + Använd den nya hanteringen för symbolsättning Rasters - + RGB band selection - + @@ -31133,17 +31240,17 @@ Always network: always load from network and do not check if the cache has a val Semi-minor - + Halva lillaxeln Semi-major - + Halva storaxeln Default expiration period for WMS-C/WMTS tiles (hours) - + Use standard deviation @@ -31162,22 +31269,22 @@ Always network: always load from network and do not check if the cache has a val Multi band color (byte / band) - + Multi band color (> byte / band) - + Limits (minimum/maximum) - + Cumulative pixel count cut limits - + @@ -31187,12 +31294,12 @@ Always network: always load from network and do not check if the cache has a val Standard deviation multiplier - + Preferred angle units - + Enhet för vinklar @@ -31207,7 +31314,7 @@ Always network: always load from network and do not check if the cache has a val Gon - + Gon @@ -31237,52 +31344,52 @@ Always network: always load from network and do not check if the cache has a val Predefined scales - + Fördefinerade skalor Overlays - + Placement algorithm - + Other settings - + Övriga inställningar Reuse last entered attribute values - + Validate geometries - + Validera geometrier Join style for curve offset - + Quadrantsegments for curve offset - + Miter limit for curve offset - + Default Coordinate Reference System for new projects - + Standardinställningar för nya projekt @@ -31292,18 +31399,18 @@ Always network: always load from network and do not check if the cache has a val Automatically enable 'on the fly' reprojection if layers have different CRS - + Aktivera automatiskt 'on-the-fly' transformation om tillagda lager har olika koordinatsystem Enable 'on the &fly' reprojection by default - + &Låt 'on-the-fly' transformation vara aktiverat som standard Select... - + @@ -31323,17 +31430,17 @@ Always network: always load from network and do not check if the cache has a val Network - + Exclude URLs (starting with) - + Cache settings - + Cache-inställningar @@ -31354,12 +31461,12 @@ Always network: always load from network and do not check if the cache has a val WMS search address - + Open feature form, if a single feature is identified - + @@ -31439,7 +31546,7 @@ Always network: always load from network and do not check if the cache has a val Map tools - + Kartverktyg @@ -31516,12 +31623,12 @@ Always network: always load from network and do not check if the cache has a val Default snapping tolerance - + Standardsnapptolerans Search radius for vertex edits - + @@ -31589,12 +31696,12 @@ Always network: always load from network and do not check if the cache has a val Add Oracle GeoRaster Layer... - + Lägg till Oracle GeoRaster-lager... Add a Oracle Spatial GeoRaster... - + @@ -31612,7 +31719,7 @@ Always network: always load from network and do not check if the cache has a val Password for %1/<password>@%2 - + @@ -31622,12 +31729,12 @@ Always network: always load from network and do not check if the cache has a val Open failed - + The connection to %1 failed. Please verify your connection parameters. Make sure you have the GDAL GeoRaster plugin installed. - + @@ -31635,12 +31742,12 @@ Always network: always load from network and do not check if the cache has a val Failed to retrieve layers - + No layers found. - + @@ -31650,36 +31757,36 @@ Always network: always load from network and do not check if the cache has a val Delete - + %1: Not a vector layer! - + %1: Är inte ett vektorlager! %1: OK! - + %1: OK! Import to PostGIS database - + Failed to import some layers! - + Import was successful. - + @@ -31689,12 +31796,12 @@ Always network: always load from network and do not check if the cache has a val Delete layer - + Layer deleted successfully. - + @@ -31710,12 +31817,12 @@ Always network: always load from network and do not check if the cache has a val %1 as %2 in %3 - + as geometryless table - + @@ -31746,7 +31853,7 @@ Always network: always load from network and do not check if the cache has a val &Add New Transfer - + @@ -31777,17 +31884,17 @@ Always network: always load from network and do not check if the cache has a val Square - + Flat - + Round - + @@ -31795,17 +31902,17 @@ Always network: always load from network and do not check if the cache has a val Bevel - + Miter - + Round - + @@ -31813,32 +31920,32 @@ Always network: always load from network and do not check if the cache has a val Solid Line - + Dash Line - + Dot Line - + Dash Dot Line - + Dash Dot Dot Line - + No Pen - + @@ -31913,23 +32020,23 @@ Always network: always load from network and do not check if the cache has a val Saving passwords - + WARNING: You have opted to save your password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. - + VARNING: Du har valt att spara ditt lösenord. Det kommer att sparas som synlig text i projektfiler, i din hemkatalog på Unix-system eller i användarkatalogen på Windows. Om du inte vill spara lösenordet, tryck på Avbryt. Save connection - + Spara anslutning Should the existing connection %1 be overwritten? - + Vill du att existerande anslutning '%1' ska skrivas över? @@ -31947,7 +32054,7 @@ Always network: always load from network and do not check if the cache has a val Connection failed - Check settings and try again. - + Connection failed - Check settings and try again. @@ -32002,10 +32109,25 @@ Detaljerad felinformation: Password Lösenord + + + Restrict the displayed tables to those that are in the layer registries. + + + + + Restricts the displayed tables to those that are found in the layer registries (geometry_columns, geography_columns, topology.layer). This can speed up the initial display of spatial tables. + + + + + Only look in the layer registries + + Use estimated table statistics for the layer metadata. - + @@ -32018,12 +32140,12 @@ Detaljerad felinformation: <p>3) If the table geometry type is unknown and is not exclusively taken from the geometry_columns table, then it is determined from the first 100 non-null geometry rows in the table.</p> </body> </html> - + Use estimated table metadata - + @@ -32033,7 +32155,7 @@ Detaljerad felinformation: Name of the new connection - + Namn på den nya anslutningen @@ -32043,7 +32165,7 @@ Detaljerad felinformation: Save Username - + Spara användarnamn @@ -32053,27 +32175,24 @@ Detaljerad felinformation: &Test Connect - + &Testa anslutning Service - + - Restrict the displayed tables to those that are in the geometry_columns table - Begränsa visade tabeller till de som finns i tabellen geometry_columns + Begränsa visade tabeller till de som finns i tabellen geometry_columns - Restricts the displayed tables to those that are in the geometry_columns table. This can speed up the initial display of spatial tables. - Begränsa visade tabeller till de som finns i tabellen geometry_columns. Detta kan göra första visningen av rumsliga tabeller snabbare. + Begränsa visade tabeller till de som finns i tabellen geometry_columns. Detta kan göra första visningen av rumsliga tabeller snabbare. - Only look in the geometry_columns table - Leta bara i tabellen över 'geometry_columns' + Leta bara i tabellen över 'geometry_columns' @@ -32093,7 +32212,7 @@ Detaljerad felinformation: Also list tables with no geometry - + @@ -32106,7 +32225,7 @@ Detaljerad felinformation: &Build query - + @@ -32164,7 +32283,7 @@ Detaljerad felinformation: Primary key column - + @@ -32186,7 +32305,7 @@ Detaljerad felinformation: Confirm Delete - + @@ -32210,16 +32329,22 @@ Detaljerad felinformation: + Postgres/PostGIS Provider - + Could not open the Postgres/PostGIS Provider + + + + + No accessible tables or views found. Check the message log for possible errors. - + Connect Anslut @@ -32307,7 +32432,7 @@ Kontrollera att du har rättigheter för att göra SELECT på en tabell med Post Select... - + @@ -32340,12 +32465,12 @@ Kontrollera att du har rättigheter för att göra SELECT på en tabell med Post Primary key column - + Select at id - + @@ -32355,22 +32480,22 @@ Kontrollera att du har rättigheter för att göra SELECT på en tabell med Post Detecting... - + Select... - + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). - + Enter... - + @@ -32381,59 +32506,59 @@ Kontrollera att du har rättigheter för att göra SELECT på en tabell med Post Couldn't open the local plugin directory - + Nothing to remove! Plugin directory doesn't exist: - + Failed to remove the directory: - + Check permissions or remove it manually - + Fetch Python Plugins... - + Hämta insticksprogram... Install more plugins from remote repositories - + Looking for new plugins... - + QGIS Plugin Installer update - + The Plugin Installer has been updated. Please restart QGIS prior to using it - + QGIS Plugin Conflict: - + The Plugin Installer has detected an obsolete plugin which masks a newer version shipped with this QGIS version. This is likely due to files associated with a previous installation of QGIS. Please use the Plugin Installer to remove that older plugin in order to unmask the newer version shipped with this copy of QGIS. - + There is a new plugin available - + There is a plugin update available - + Error reading repository: - + @@ -32452,146 +32577,146 @@ Kontrollera att du har rättigheter för att göra SELECT på en tabell med Post Error reading repository: - + connected - + uppkopplad This repository is connected - + unavailable - + This repository is enabled, but unavailable - + disabled - + inaktiverad This repository is disabled - + This repository is blocked due to incompatibility with your Quantum GIS version - + orphans - + övergivna any status - + oavsett status not installed - + inte installerad installed - + installerad upgradeable and news - + This plugin is not installed - + This plugin is installed - + This plugin is installed, but there is an updated version available - + This plugin is installed, but I can't find it in any enabled repository - + This plugin is not installed and is seen for the first time - + This plugin is installed and is newer than its version available in a repository - + This plugin is incompatible with your Quantum GIS version and probably won't work. - + The required Python module is not installed. For more information, please visit its homepage and Quantum GIS wiki. - + This plugin seems to be broken. It has been installed but can't be loaded. Here is the error message: - + upgradeable - + new! - + ny! invalid - + Note that it's an uninstallable core plugin - + installed version - + installerad version available version - + That's the newest available version - + There is no version available for download - + This plugin is broken - + This plugin requires a newer version of Quantum GIS - + at least - + This plugin requires a missing module - + only locally available - + endast tillgängligt lokalt Experimental plugin. Use at own risk @@ -32599,106 +32724,106 @@ Here is the error message: - %d plugins available - + - %d plugin tillgängliga Install plugin - + Reinstall plugin - + Upgrade plugin - + Downgrade plugin - + Are you sure you want to downgrade the plugin to the latest available version? The installed one is newer! - + Plugin installation failed - + Installationen misslyckades Plugin has disappeared - + Insticksprogrammet har försvunnit The plugin seems to have been installed but I don't know where. Probably the plugin package contained a wrong named directory. Please search the list of installed plugins. I'm nearly sure you'll find the plugin there, but I just can't determine which of them it is. It also means that I won't be able to determine if this plugin is installed and inform you about available updates. However the plugin may work. Please contact the plugin author and submit this issue. - + Plugin installed successfully - + Installationen lyckades Python plugin installed. Now you need to enable it in Plugin Manager. - + Plugin reinstalled successfully - + Python plugin reinstalled. You need to restart Quantum GIS in order to reload it. - + The plugin is designed for a newer version of Quantum GIS. The minimum required version is: - + The plugin depends on some components missing on your system. You need to install the following Python module in order to enable it: - + The plugin is broken. Python said: - + Plugin uninstall failed - + Are you sure you want to uninstall the following plugin? - + Warning: this plugin isn't available in any accessible repository! - + Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation. - + Plugin Installer update uninstalled. Please restart QGIS in order to load its primary version. - + Plugin uninstalled successfully - + Python plugin uninstalled. Note that you may need to restart Quantum GIS in order to remove it completely. - + Unable to add another repository with the same URL! - + Are you sure you want to remove the following repository? - + @@ -32787,7 +32912,7 @@ You need to restart Quantum GIS in order to reload it. Upgrade all - + Uppgradera alla @@ -32830,23 +32955,23 @@ You need to restart Quantum GIS in order to reload it. Add the contributed repository to the list - + Add the contributed repository - + Remove depreciated repositories from the list - + Delete depreciated repositories - + @@ -32918,37 +33043,37 @@ You need to restart Quantum GIS in order to reload it. Configuration of the plugin installer - + every time QGIS starts - + varje gång QGIS startar once a day - + en gång om dagen every 3 days - + var tredje dag every week - + en gång i veckan every 2 weeks - + varannan vecka every month - + en gång i månaden @@ -32957,27 +33082,31 @@ You need to restart Quantum GIS in order to reload it. p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> If this function is enabled, Quantum GIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Installer window.</p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Obs:</span> Om denna funktion är aktiverad kommer QGIS att informera dig utifall ett nytt insticksprogram eller en uppdatering av ett insticksprogram finns tillgängligt. I annat fall så kommer denna kontroll utföras när Insticksprograminstalleraren öppnas.</p></body></html> Allowed plugins - + Tillåtna insticksprogram Only show plugins from the official repository - + Visa endast insticksprogram från den officiella centralkatalogen Show all plugins except those marked as experimental - + Visa alla insticksprogram förutom de som är markerade som experimentella Show all plugins, even those marked as experimental - + Visa alla plugin, även de som är markerade som experimentella @@ -32986,7 +33115,11 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> Experimental plugins are generally unsuitable for production use. These plugins are in early stages of development, and should be considered 'incomplete' or 'proof of concept' tools. QGIS does not recommend installing these plugins unless you intend to use them for testing purposes.</p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Obs:</span> Experimentella insticksprogram är överlag opassande i en produktionsmiljö- Dessa insticksprogram är i ett tidigt stadie av sin utveckling och ska ses som icke kompletta eller som bevis på ett koncept. QGIS rekommenderar inte att installera dessa förutom om du tänker använda dem i testsyfte.</p></body></html> @@ -32998,11 +33131,11 @@ p, li { white-space: pre-wrap; } QgsPluginInstallerFetchingDialog Success - + Resolving host name... - + Connecting... @@ -33010,7 +33143,7 @@ p, li { white-space: pre-wrap; } Host connected. Sending request... - + Downloading data... @@ -33018,11 +33151,11 @@ p, li { white-space: pre-wrap; } Idle - + Closing connection... - + Error @@ -33061,11 +33194,11 @@ p, li { white-space: pre-wrap; } QgsPluginInstallerInstallingDialog Installing... - + Installerar... Resolving host name... - + Connecting... @@ -33073,7 +33206,7 @@ p, li { white-space: pre-wrap; } Host connected. Sending request... - + Downloading data... @@ -33081,11 +33214,11 @@ p, li { white-space: pre-wrap; } Idle - + Closing connection... - + Error @@ -33093,11 +33226,11 @@ p, li { white-space: pre-wrap; } Failed to unzip the plugin package. Probably it's broken or missing from the repository. You may also want to make sure that you have write permission to the plugin directory: - + Misslyckades med att packa upp paketet. Förmodligen är det trasigt eller saknas i centralkatalogen. Kontrollera även att du har skrivrättigheter till mappen där insticksprogrammet installeras: Aborted by user - + Avbrutit av användare @@ -33123,12 +33256,12 @@ p, li { white-space: pre-wrap; } Plugin Installer - + The Plugin Installer has detected that your copy of QGIS is configured to use a number of plugin repositories around the world. It was a typical situation in older versions of the program, but from the version 1.5, external plugins are collected in one central Contributed Repository, and all the old repositories are not necessary any more. Do you want to drop them now? If you're unsure what to do, probably you don't need them. However, if you choose to keep them in use, you will be able to remove them manually later. - + @@ -33138,24 +33271,24 @@ p, li { white-space: pre-wrap; } Disable - + Keep - + Ask me later - + QgsPluginInstallerPluginErrorDialog no error message received - + @@ -33249,7 +33382,7 @@ p, li { white-space: pre-wrap; } Installed in %1 menu/toolbar - + Installerad under '%1' i menyn @@ -33297,7 +33430,7 @@ p, li { white-space: pre-wrap; } Plugin Installer - + @@ -33313,23 +33446,23 @@ p, li { white-space: pre-wrap; } Label Font - + Circle color - + Label color - + The point displacement renderer only applies to (single) point layers. '%1' is not a point layer and cannot be displayed by the point displacement renderer - + @@ -33342,42 +33475,42 @@ p, li { white-space: pre-wrap; } Center symbol: - + Renderer: - + Renderer settings... - + Displacement circles - + Circle pen width: - + Circle color: - + Circle radius modification: - + Point distance tolerance: - + @@ -33387,27 +33520,27 @@ p, li { white-space: pre-wrap; } Label attribute: - + Label font... - + Label color: - + Use scale dependent labelling - + max scale denominator: - + @@ -33415,7 +33548,7 @@ p, li { white-space: pre-wrap; } Connection to database failed - + @@ -33424,46 +33557,46 @@ p, li { white-space: pre-wrap; } - - - - + + - - - - - - - - - - - - - + + + + + + + + + + + + + + + PostGIS - + error in setting encoding - + undefined return value from encoding setting - + Your database has no working PostGIS support. - + Your PostGIS installation has no GEOS support. Feature selection and identification will not work properly. Please install PostGIS with GEOS support (http://geos.refractions.net) - + @@ -33471,156 +33604,156 @@ p, li { white-space: pre-wrap; } result:%2 error:%3 - + - + Database connection was successful, but the accessible tables could not be determined. - + - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 - + - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 - + - + Database connection was successful, but no accessible tables were found. Please verify that you have SELECT privilege on a table carrying PostGIS geometry. - + - + Unable to get list of spatially enabled tables from the database - + - + Retrieval of postgis version failed - + - + Could not parse postgis version string '%1' - + - + Connection error: %1 returned %2 [%3] - + - + Erroneous query: %1 returned %2 [%3] - + - + Query failed: %1 Error: no result buffer - + - + Not logged query failed: %1 Error: no result buffer - + - + Query: %1 returned %2 [%3] - + - + %1 cursor states lost. SQL: %2 Result: %3 (%4) - + - + resetting bad connection. - + - + retry after reset succeeded. - + - + retry after reset failed again. - + - + connection still bad after reset. - + - + bad connection, not retrying. - + - + Point Punkt - + Line Linje - + Polygon Polygon - + No Geometry - + - - + + Query could not be canceled [%1] - + - + PQgetCancel failed - + - + Multipoint Multipunkt - + Multiline Multilinje - + Multipolygon Multipolygon - + Unknown Geometry - + @@ -33683,14 +33816,14 @@ Please install PostGIS with GEOS support (http://geos.refractions.net) Duplicate field %1 found - + PostgreSQL is still in recovery after a database crash (or you are connected to a (read-only) slave). Write accesses will be denied. - + @@ -33698,7 +33831,7 @@ Write accesses will be denied. The error message from the database was: %1. SQL: %2 - + Error while deleting features @@ -33727,22 +33860,22 @@ SQL: %2 Whole number (integer - 32bit) - + Whole number (integer - 64bit) - + Text, limited variable length (varchar) - + Text, unlimited length (text) - + @@ -33750,7 +33883,7 @@ SQL: %2 The error message from the database was: %2. SQL: %3 - + @@ -33758,17 +33891,17 @@ SQL: %3 The error message from the database was: %2. SQL: %3 - + Whole number (smallint - 16bit) - + invalid PostgreSQL layer - + @@ -33796,24 +33929,24 @@ SQL: %3 - + PostGIS - + Decimal number (numeric) - + Decimal number (decimal) - + Decimal number (real) - + Decimaltal (real) @@ -33823,39 +33956,39 @@ SQL: %3 Text, fixed length (char) - + Couldn't get the feature geometry in binary form - + Read attempt on an invalid postgresql data source - + nextFeature() without select() - + Fetching from cursor %1 failed Database error: %2 - + feature %1 not found - + found %1 features instead of just one. - + @@ -33866,103 +33999,103 @@ Database error: %2 unexpected formatted field type '%1' for field %2 - + Field %1 ignored, because of unsupported type %2 - + The custom query is not a select query. - + The table has no column suitable for use as a key. Quantum GIS requires a primary key, a PostgreSQL oid column or a ctid for tables. - + Primary key field '%1' for view not unique. - + Type '%1' of primary key field '%2' for view invalid. - + Key field '%1' for view not found. - + No key field for view given. - + Unexpected relation type '%1'. - + No key field for query given. - + PostGIS error while adding features: %1 - + PostGIS error while deleting features: %1 - + PostGIS error while adding attributes: %1 - + PostGIS error while deleting attributes: %1 - + PostGIS error while changing attributes: %1 - + - + PostGIS error while changing geometry values: %1 - + - + result of extents query invalid: %1 - + - + Geometry type and srid for empty column %1 of %2 undefined. - + - + Feature type or srid for %1 of %2 could not be determined or was not requested. - + - + Editing and adding disabled for 2D+ layer (%1; %2) - + @@ -33975,7 +34108,7 @@ Database error: %2 Project File Read Error - + @@ -34013,7 +34146,7 @@ Database error: %2 Ignore - + Ignorera @@ -34024,113 +34157,170 @@ Database error: %2 Unable to open one or more project layers. Choose ignore to continue loading without the missing layers. Choose cancel to return to your pre-project load state. Choose OK to try to find the missing layers. + Kan inte öppna ett eller flera av projektets lager. +Välj 'Ignorera' för att fortsätta utan de saknade lagren. Välj 'Avbryt' för att återvända till föregående arbetsyta. Välj 'OK' för att försöka hitta de saknade lagren. + + + + QgsProjectLayerGroupDialog + + + Select project file + Välj projektfil + + + + QGis files + QGis-filer + + + + Recursive embedding not possible + + + + + It is not possible to embed layers / groups from the current project. + + QgsProjectLayerGroupDialogBase + + + Select layers and groups to embed + Välj lager och grupper för att bädda in + + + + Project file + Projektfil + + + + ... + ... + + QgsProjectProperties - + Layer Lager - + Type Typ - + Identifiable - + - + Vector Vektor - + WMS WMS - + Raster Raster - - + + Coordinate System Restriction - + - + No coordinate systems selected. Disabling restriction. - + - + Selection color Färg för valda - + CRS %1 was already selected Referenskoordinatsystem % var redan valt - + Coordinate System Restrictions - + - + The current selection of coordinate systems will be lost. Proceed? + + + + + Select print composer - - Enter scale + + Composer Title - - Scale denominator + + Select restricted layers and groups - + + Enter scale + + + + + Scale denominator + + + + Load scales - + - - + + XML files (*.xml *.XML) - + - + Save scales - + - + Transparency %1% - + - + Select a valid symbol - + - + Invalid symbol : - + @@ -34141,365 +34331,390 @@ Proceed? Projektegenskaper - + Meters Meter - + Feet Feet - + Decimal degrees Decimalgrader - + Default project title Standardtitel för projekt - + General Allmänt - + General settings - + Generella inställningar - + absolute - + absoluta - + relative - + relativa - + Save paths - + Länkar till lager Layer units (only used when CRS transformation is disabled) Lagrens enhet (används bara när koordinattransformation är avslagen) - + Degrees, Minutes, Seconds - + Grader, Minuter, Sekunder - + Precision Precision - + Automatically sets the number of decimal places in the mouse position display Sätter automatisk antal decimaler vid visning av musens position - + The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display Antalet decimaler som används vid visning av musens position sätts automatisk så att en förändring av musens läge med en pixel ändrar visad position - + Automatic Automatisk - - + + Sets the number of decimal places to use for the mouse position display Sätter antal decimaler vid visning av musens position - + Manual Manuell - - + + The number of decimal places for the manual option Antal decimaler vid val 'manuell' - + decimal places decimaler - + Project scales - + Projektskalor - - - - - - - - + + + + + + + + ... ... - + Default Styles - + Standardutseende - + Default Symbols - + Standardsymboler - + Marker arkör - + Line Linje - + Fill - + Ytsymbol - + Color Ramp Färgökning - + Style Manager - + Symbolhanteraren - + Options Inställningar - + Assign random colors to symbols - + Ge slumpvalda färger till symboler - + Opacity Ogenomskinlighet - + OWS Server - + OWS Server - + Service Capabilitities - + - + Title Titel - + Person - + Person - + Phone - + Telefon - + Abstract Sammanfattning - + E-Mail - + E-Mail - + Organization - + Organisation - + Online resource - + - + WMS Capabilitities - + - + Advertised Extent - + - + Min. X - + - + Min. Y - + - + Max. X - + - + Max. Y - + - + Use Current Canvas Extent + Använd kartfönstrets nuvarande utbredning + + + + Exclude composers + + + + + Exclude layers + + + + + Update + Uppdatera + + + + Insert - + + Delete + + + + Unselect all - + Select all Välj alla - + Macros - + Makron - + Python macros - + Python-makron - + Coordinate Systems Restrictions - + - + Add Lägg till - + Remove Ta bort - + Used - + - + Add WKT geometry to feature info response - + - + Canvas units - + Kartfönstrets mätenhet - + Degree - + Grader - + Degree display - + - + Degrees, Minutes - + Grader, Minuter - + Advertised WMS url - + - + Maximum width - + - + Maximum height - + - + WFS Capabilitities - + - + Published - + Digitizing Digitalisering - + Identifiable layers - + Identifieringsbara lager - - + + Layer Lager - + Type Typ - + Identifiable - + - + Descriptive project name Projektbeskrivning @@ -34512,32 +34727,32 @@ Proceed? Val för fästning... - + Project title Projekttitel - + Selection color Färg för valda - + Background color Bakgrundsfärg - + Used when CRS transformation is turned off Används när koordinattransformering är avslagen - + Coordinate Reference System (CRS) Koordinaternas referenssystem (CRS) - + Enable 'on the fly' CRS transformation Aktivera omedelbar koordinattransformation @@ -34610,7 +34825,7 @@ Därför fungerar inte projektionsväljaren... Recently used coordinate reference systems - + @@ -34622,7 +34837,7 @@ Därför fungerar inte projektionsväljaren... Authority ID - + @@ -34633,7 +34848,7 @@ Därför fungerar inte projektionsväljaren... Coordinate reference systems of the world - + @@ -34641,12 +34856,12 @@ Därför fungerar inte projektionsväljaren... &Test - + &Test &Clear - + No Query @@ -34684,7 +34899,7 @@ Därför fungerar inte projektionsväljaren... An error occurred when executing the query. - + Ett fel inträffade när frågan ställdes. @@ -34692,7 +34907,9 @@ Därför fungerar inte projektionsväljaren... The data provider said: %1 - + +Datakällan sa: +%1 @@ -34702,7 +34919,7 @@ The data provider said: The subset string could not be set - + Urvalsfrågan kunde inte sättas @@ -34772,7 +34989,7 @@ p, li { white-space: pre-wrap; } Use unfiltered layer - + @@ -34929,17 +35146,17 @@ p, li { white-space: pre-wrap; } Enter result file - + Ange mål för resultatfil Expression valid - + Uttrycket giltligt Expression invalid - + Uttrycket ogiltligt @@ -34947,22 +35164,22 @@ p, li { white-space: pre-wrap; } Raster calculator - + Rasterkalkylator Raster bands - + Rasterband Result layer - + Resultatlager Output layer - + Mål för utdatafil @@ -34972,7 +35189,7 @@ p, li { white-space: pre-wrap; } Current layer extent - + Nuvarande lagrets utbredning @@ -34982,7 +35199,7 @@ p, li { white-space: pre-wrap; } XMax - + X max @@ -35007,12 +35224,12 @@ p, li { white-space: pre-wrap; } Output format - + Add result to project - + Lägg till resultat i projektet @@ -35032,12 +35249,12 @@ p, li { white-space: pre-wrap; } sqrt - + sqrt sin - + sin @@ -35047,7 +35264,7 @@ p, li { white-space: pre-wrap; } acos - + acos @@ -35067,22 +35284,22 @@ p, li { white-space: pre-wrap; } cos - + cos asin - + asin tan - + tan atan - + atan @@ -35127,63 +35344,73 @@ p, li { white-space: pre-wrap; } Raster calculator expression - + Rasterkalkylator-uttryck QgsRasterDataProvider - + Identify Identifiera - + Build Pyramids - + Bygg pyramider - + Create Datasources - + - + Remove Datasources + + + + + no data - + + Feature info + Objektinformation + + + Band Band - + Average Average - + Nearest Neighbour Nearest Neighbour - + Gauss Gauss - + Cubic Kubisk - + Mode Läge - + None Ingen @@ -35199,32 +35426,32 @@ p, li { white-space: pre-wrap; } No compression - + Low compression - + High compression - + Lossy compression - + Create Options: %1 - + @@ -35243,12 +35470,12 @@ Click on help button to get valid creation options for this format Cannot get create options for driver %1 - + No help available - + @@ -35262,17 +35489,17 @@ Click on help button to get valid creation options for this format Profile name: - + Use simple interface - + Use table interface - + @@ -35295,12 +35522,12 @@ Click on help button to get valid creation options for this format Reset - + Profile - + @@ -35320,7 +35547,7 @@ Click on help button to get valid creation options for this format Validate - + @@ -35335,7 +35562,7 @@ Click on help button to get valid creation options for this format Insert KEY=VALUE pairs separated by spaces - + @@ -35348,32 +35575,32 @@ Click on help button to get valid creation options for this format Show min/max markers - + Show all bands - + Show RGB/Gray band(s) - + Show selected band - + Reset - + Load min/max - + @@ -35388,27 +35615,27 @@ Click on help button to get valid creation options for this format Current extent - + Use stddev (1.0) - + Use stddev (custom) - + Load for each band - + Recompute Histogram - + @@ -35441,7 +35668,7 @@ Click on help button to get valid creation options for this format Pick Min value on graph - + @@ -35457,63 +35684,60 @@ Click on help button to get valid creation options for this format Pick Max value on graph - + Prefs/Actions - + Save plot - + Save as image... - + Compute Histogram - + QgsRasterLayer - - - - - + + + + + Not Set Inte satt - + Could not reproject view extent: %1 - + - - - - - - - + + + + Raster Raster - + Could not reproject layer extent: %1 - + - + Driver: Drivrutin: @@ -35530,166 +35754,161 @@ Click on help button to get valid creation options for this format Pixelstorlek: - + Pyramid overviews: Pyramidöversikter: - - + + Band Band - + Band No Bandnr - + No Stats Ingen statistik - + No stats collected yet Ingen statistik har samlats in - + Min Val MinVärde - + Max Val MaxVärde - + Range Intervall - + Mean Medel - + Sum of squares Kvadratsumma - + Standard Deviation Standardavvikelse - + Sum of all cells Summa av alla celler - + Cell Count Cellantal - - Failed to load provider %1 (Reason: %2) - - - - - Cannot resolve the classFactory function - - - - - Cannot instantiate the data provider - - - - + <maplayer> not found. - + - + GDAL data type %1 is not supported - + - + Data Type: Datatyp: - + Cannot read data - + - + GDT_Byte - Eight bit unsigned integer GDT_Byte - Åttabitars ickenegativt heltal - + GDT_UInt16 - Sixteen bit unsigned integer GDT_UInt16 - Sextonbitars ickenegativt heltal - + GDT_Int16 - Sixteen bit signed integer GDT_Int16 - Sextonbitars heltal - + GDT_UInt32 - Thirty two bit unsigned integer GDT_UInt32 - Trettiotvåbitars ickenegativt heltal - + GDT_Int32 - Thirty two bit signed integer GDT_Int32 - Trettiotvåbitars heltal - + GDT_Float32 - Thirty two bit floating point GDT_Float32 - Trettiotvåbitars flyttal - + GDT_Float64 - Sixty four bit floating point GDT_Float64 - Sextiofyrabitars flyttal - + GDT_CInt16 - Complex Int16 GDT_CInt16 - Komplex Int16 - + GDT_CInt32 - Complex Int32 GDT_CInt32 - Komplex Int32 - + GDT_CFloat32 - Complex Float32 GDT_CFloat32 - Komplex Float32 - + GDT_CFloat64 - Complex Float64 GDT_CFloat64 - Komplex Float64 - + Could not determine raster data type. Kunde inte bestämma rastertyp. + + + Cannot instantiate the '%1' data provider + + + + + Provider is not valid (provider: %1, URI: %2 + + Average Magphase Average Magphase @@ -35703,22 +35922,22 @@ Click on help button to get valid creation options for this format Beskrivning av dataset - + No Data Value Inget datavärde - + Layer Spatial Reference System: Lagrets Spatial Reference System: - + Layer Extent (layer original source projection): - + Lagrets utbredning (i lagrets ursprungliga koordinatsystem): - + Project Spatial Reference System: Projektets Spatial Reference System: @@ -35727,12 +35946,12 @@ Click on help button to get valid creation options for this format utanför utsträckning - + null (no data) null (ingen data) - + NoDataValue not set Inget datavärde ej satt @@ -35745,12 +35964,12 @@ Click on help button to get valid creation options for this format X: %1 Y: %2 Band: %3 - + QgsRasterLayer created QgsRasterLayer skapat - + Retrieving stats for %1 Hämtar statistik för %1 @@ -35895,7 +36114,7 @@ Click on help button to get valid creation options for this format Bilinear - + @@ -35950,7 +36169,7 @@ Click on help button to get valid creation options for this format From - + @@ -35962,19 +36181,18 @@ Click on help button to get valid creation options for this format null (ingen data) - + Filter Filter - + Bands - + - Time - Tid + Tid User Defined @@ -35990,18 +36208,18 @@ Click on help button to get valid creation options for this format Spara fil - + Load layer properties from style file Läs in lageregenskaper från stilfil - - + + QGIS Layer Style File QGIS lager stilfil - + Save layer properties as style file Spara lageregenskaper som stilfil @@ -36023,12 +36241,12 @@ Click on help button to get valid creation options for this format Välj ett filnamn att spara kartbilden som - + Open file Öppna fil - + Import Error Fel vid import @@ -36045,12 +36263,12 @@ Click on help button to get valid creation options for this format - + Read access denied Läsåtkomst nekad - + Read access denied. Adjust the file permissions and try again. @@ -36122,8 +36340,8 @@ Click on help button to get valid creation options for this format Läs in färgkarta - - + + Default Style Standardstil @@ -36132,8 +36350,8 @@ Click on help button to get valid creation options for this format QGIS lager stilfil (*.qml) - - + + Saved Style Sparad stil @@ -36191,12 +36409,12 @@ Click on help button to get valid creation options for this format - + Textfile - + - + The following lines contained errors %1 @@ -36248,22 +36466,22 @@ Click on help button to get valid creation options for this format Render type - + Resampling - + Zoomed in - + Zoomed out - + @@ -36649,7 +36867,7 @@ Click on help button to get valid creation options for this format No Data - + @@ -36766,27 +36984,27 @@ p, li { white-space: pre-wrap; } Overview format - + External - + Internal (if possible) - + External (Erdas Imagine) - + Pipe - + @@ -36799,7 +37017,7 @@ p, li { white-space: pre-wrap; } From - + @@ -36809,54 +37027,54 @@ p, li { white-space: pre-wrap; } Select output directory - + Select output file - + layer - + user defined - + Resolution (current: %1) - + Extent (current: %1) - + Layer (%1, %2) - + Project (%1, %2) - + Selected (%1, %2) - + map view - + Extent @@ -36880,27 +37098,27 @@ p, li { white-space: pre-wrap; } Save raster layer as... - + Output mode - + Raw data - + Write out 3 bands RGB image rendered using current layer style. - + Rendered image - + @@ -36915,7 +37133,7 @@ p, li { white-space: pre-wrap; } Browse... - + Bläddra... @@ -36955,22 +37173,22 @@ p, li { white-space: pre-wrap; } Map view extent - + Layer extent - + Write out raw raster layer data. Optionally user defined no data values may be applied. - + Resolution - + @@ -36990,12 +37208,12 @@ p, li { white-space: pre-wrap; } Layer resolution - + Layer size - + @@ -37005,49 +37223,49 @@ p, li { white-space: pre-wrap; } Create Options - + Tiles - + Maximum number of columns in one tile. - + Max columns - + Maximum number of rows in one tile. - + Max rows - + Create VRT - + Additional no data values. The specified values will be set to no data in output raster. - + No data values - + @@ -37065,7 +37283,7 @@ p, li { white-space: pre-wrap; } Load user defined fully transparent (100%) values - + @@ -37075,7 +37293,7 @@ p, li { white-space: pre-wrap; } Clear all - + @@ -37089,17 +37307,17 @@ p, li { white-space: pre-wrap; } Use existing - + Resolutions - + Pyramid resolutions corresponding to levels given - + @@ -37112,7 +37330,7 @@ p, li { white-space: pre-wrap; } Load min/max values - + @@ -37132,12 +37350,12 @@ p, li { white-space: pre-wrap; } Min / max - + Mean +/- standard deviation × - + @@ -37147,7 +37365,7 @@ p, li { white-space: pre-wrap; } Full - + @@ -37157,7 +37375,7 @@ p, li { white-space: pre-wrap; } Accuracy - + @@ -37185,27 +37403,27 @@ p, li { white-space: pre-wrap; } Custom levels - + External - + Internal (if possible) - + External (Erdas Imagine) - + Insert positive integer values separated by spaces - + @@ -37220,17 +37438,17 @@ p, li { white-space: pre-wrap; } Overview format - + Create Options - + Levels - + @@ -37241,32 +37459,32 @@ p, li { white-space: pre-wrap; } QgsRasterRenderer - + Unknown - + - + User defined - + Estimated - + Exact Exakt - + min / max - + of @@ -37276,63 +37494,63 @@ p, li { white-space: pre-wrap; } Export Frequency distribution as csv - + Export Colors and elevations as xml - + Import Colors and elevations from xml - + Error opening file - + The relief color file could not be opened - + Error parsing xml - + The xml file could not be loaded - + Enter result file - + Ange mål för resultatfil Enter lower elevation class bound - + Elevation - + Enter upper elevation class bound - + Select color for relief class - + @@ -37344,12 +37562,12 @@ p, li { white-space: pre-wrap; } Output layer - + Mål för utdatafil Output format - + @@ -37364,47 +37582,47 @@ p, li { white-space: pre-wrap; } Elevation layer - + Z factor - + Add result to project - + Lägg till resultat i projektet Illumination - + Azimuth (horizontal angle) - + Vertical angle - + Relief colors - + Create automatically - + Export distribution... - + @@ -37429,12 +37647,12 @@ p, li { white-space: pre-wrap; } Lower bound - + Upper bound - + @@ -37444,12 +37662,12 @@ p, li { white-space: pre-wrap; } Export colors... - + Import colors... - + @@ -37457,41 +37675,41 @@ p, li { white-space: pre-wrap; } Terrain analysis - + Slope - + Aspect - + Hillshade - + Relief - + Ruggedness index - + Calculating hillshade... - + @@ -37505,27 +37723,27 @@ p, li { white-space: pre-wrap; } Calculating relief... - + Calculating slope... - + Calculating aspect... - + Ruggedness - + Calculating ruggedness... - + @@ -37533,7 +37751,7 @@ p, li { white-space: pre-wrap; } Rule properties - + @@ -37564,23 +37782,23 @@ p, li { white-space: pre-wrap; } Scale range - + Min. scale - + 1 : - + Max. scale - + @@ -37596,7 +37814,7 @@ p, li { white-space: pre-wrap; } Filter expression parsing error: - + @@ -37607,7 +37825,7 @@ p, li { white-space: pre-wrap; } Filter returned %n feature(s) number of filtered features - + @@ -37618,31 +37836,31 @@ p, li { white-space: pre-wrap; } Rotation field - + Size scale field - + Scale area - + Scale diameter - + - no field - - + @@ -37655,7 +37873,7 @@ p, li { white-space: pre-wrap; } Do you wish to use the original symbology implementation for this layer? - + @@ -37663,17 +37881,17 @@ p, li { white-space: pre-wrap; } Renderer settings - + Old symbology - + This renderer doesn't implement a graphical interface. - + @@ -37681,27 +37899,27 @@ p, li { white-space: pre-wrap; } Change color - + Change transparency - + Change output unit - + Change width - + Change size - + @@ -37711,17 +37929,17 @@ p, li { white-space: pre-wrap; } Change symbol transparency [%] - + Symbol unit - + Select symbol unit - + @@ -37742,7 +37960,7 @@ p, li { white-space: pre-wrap; } Change symbol width - + @@ -37752,7 +37970,7 @@ p, li { white-space: pre-wrap; } Change symbol size - + @@ -37760,7 +37978,7 @@ p, li { white-space: pre-wrap; } (no filter) - + @@ -37770,17 +37988,17 @@ p, li { white-space: pre-wrap; } Rule - + Min. scale - + Max.scale - + @@ -37801,7 +38019,7 @@ p, li { white-space: pre-wrap; } Rendering order... - + @@ -37816,48 +38034,48 @@ p, li { white-space: pre-wrap; } Refine current rules - + Add scales to rule - + Add categories to rule - + Add ranges to rule - + Refine a rule to categories - + Refine a rule to ranges - + Scale refinement - + Parent rule %1 must have a symbol for this operation. - + Please enter scale denominators at which will split the rule, separate them by commas (e.g. 1000,5000): - + @@ -37867,7 +38085,7 @@ p, li { white-space: pre-wrap; } "%1" is not valid scale denominator, ignoring it. - + @@ -37905,61 +38123,61 @@ p, li { white-space: pre-wrap; } Database does not exist - + Failed to open database - + Failed to check metadata - + Failed to get list of tables - + Unknown error - + Delete - + %1: Not a vector layer! - + %1: Är inte ett vektorlager! %1: OK! - + %1: OK! Import to SpatiaLite database - + Failed to import some layers! - + Import was successful. - + @@ -37969,12 +38187,12 @@ p, li { white-space: pre-wrap; } Delete layer - + Layer deleted successfully. - + @@ -37982,12 +38200,12 @@ p, li { white-space: pre-wrap; } Create database... - + New SpatiaLite Database File - + Ny SpatiaLite-databasfil @@ -38003,18 +38221,18 @@ p, li { white-space: pre-wrap; } Create SpatiaLite database - + The database has been created - + Failed to create the database: - + @@ -38062,9 +38280,9 @@ p, li { white-space: pre-wrap; } QgsSVGFillSymbolLayerWidget - + Select svg texture file - + @@ -38256,32 +38474,32 @@ p, li { white-space: pre-wrap; } &Test - + &Test &Clear - + &Save... - + Save query to an xml file - + &Load... - + Load query from xml file - + @@ -38305,7 +38523,7 @@ p, li { white-space: pre-wrap; } Save query to file - + @@ -38318,17 +38536,17 @@ p, li { white-space: pre-wrap; } Could not open file for writing - + Load query from file - + Query files - + @@ -38338,27 +38556,27 @@ p, li { white-space: pre-wrap; } Could not open file for reading - + File is not a valid xml document - + File is not a valid query document - + Select attribute - + There is no attribute '%1' in the current vector layer. Please select an existing attribute - + @@ -38366,13 +38584,13 @@ p, li { white-space: pre-wrap; } Validation started. - + Validation finished (%n error(s) found). number of geometry errors - + @@ -38380,32 +38598,32 @@ p, li { white-space: pre-wrap; } ring %1, vertex %2 - + polygon %1, ring %2, vertex %3 - + polyline %1, vertex %2 - + vertex %1 - + point %1 - + single point - + @@ -38454,22 +38672,22 @@ Felet var: No enhancement - + Stretch to MinMax - + Stretch and clip to MinMax - + Clip to MinMax - + @@ -38504,69 +38722,69 @@ Felet var: QgsSingleBandPseudoColorRendererWidget - - - - + + + + Discrete Diskret - - - - - + + + + + Linear Linjär - - + + Exact Exakt - + Equal interval Jämna intervall - + Custom color map entry Anpassad färgkarta fält - + Load Color Map Läs in färgkarta - + The color map for band %1 failed to load Färgkartan för band %1 kunde inte läsas in - + Open file Öppna fil - - + + Textfile (*.txt) Textfil (*.txt) - + Import Error Fel vid import - + The following lines contained errors @@ -38575,12 +38793,12 @@ Felet var: - + Read access denied Läsåtkomst nekad - + Read access denied. Adjust the file permissions and try again. @@ -38589,22 +38807,22 @@ Felet var: - + Save file Spara fil - + QGIS Generated Color Map Export File QGIS-genererad fil för export av färgkarta - + Write access denied Skrivåtkomst nekad - + Write access denied. Adjust the file permissions and try again. @@ -38761,12 +38979,12 @@ Felet var: Open File - + Images - + @@ -38784,12 +39002,12 @@ Felet var: In map units - + Drawing by field - + @@ -38799,7 +39017,7 @@ Felet var: Area scale - + @@ -38809,12 +39027,12 @@ Felet var: Fill options - + Outline options - + @@ -38855,7 +39073,7 @@ Felet var: The Symbol - + @@ -38863,12 +39081,12 @@ Felet var: Invalid name - + The smart group name field is empty. Kindly provide a name - + @@ -38876,27 +39094,27 @@ Felet var: Smart Group Editor - + Smart Group Name - + Condition matches - + Add Condition - + Conditions - + @@ -39023,24 +39241,24 @@ Felet var: - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + SQLite error: %2 SQL: %1 SQLite fel: %2 @@ -39056,19 +39274,19 @@ SQL: %1 - - - - - - - - - - - - - + + + + + + + + + + + + + SpatiaLite SpatiaLite @@ -39076,12 +39294,12 @@ SQL: %1 - - - - - - + + + + + + unknown cause okänd orsak @@ -39091,7 +39309,7 @@ SQL: %1 SQLite-fel vid läsning av objekt: %1 - + FAILURE: Field %1 not found. FEL: Fält %1 hittades inte. @@ -39101,12 +39319,12 @@ SQL: %1 Add SpatiaLite Table(s) - + Databases - + @@ -39116,7 +39334,7 @@ SQL: %1 &Build Query - + @@ -39163,7 +39381,7 @@ SQL: %1 SpatiaLite DB - + @@ -39174,41 +39392,41 @@ SQL: %1 SpatiaLite DB Open Error - + Database does not exist: %1 - + Failure while connecting to: %1 %2 - + SpatiaLite Error - + Unexpected error when working with: %1 %2 - + @ - + @ Choose a SpatiaLite/SQLite DB to open - + @@ -39228,14 +39446,14 @@ SQL: %1 SpatiaLite getTableInfo Error - + Failure exploring tables from: %1 %2 - + @@ -39321,7 +39539,7 @@ SQL: %1 %n selected geometries selected geometries - + @@ -39329,12 +39547,12 @@ SQL: %1 Selected geometries - + < %1 > - + @@ -39345,102 +39563,102 @@ SQL: %1 all = %1 - + %1)Query - + The spatial query requires at least two vector layers - + Begin at %L1 - + Total of features = %1 - + Total of invalid features: - + Finish at %L1 (processing time %L2 minutes) - + Using the field "%1" for subset - + Sorry! Only this providers are enable: OGR, POSTGRES and SPATIALITE. - + %1 of %2(selected features) - + Create new selection - + Add to current selection - + Remove from current selection - + Result query - + Invalid source - + Invalid reference - + %1 of %2 selected by "%3" - + user - + Map "%1" "on the fly" transformation. - + enable - + @@ -39469,48 +39687,48 @@ CRS of map is %1. Missing reference layer - + Select reference layer! - + Missing target layer - + Select target layer! - + Create new layer from items - + The query from "%1" using "%2" in field not possible. - + Create new layer from selected - + %1 of %2 identified - + DEBUG - + @@ -39518,22 +39736,22 @@ CRS of map is %1. Spatial Query - + Layer on which the topological operation will select geometries - + Select source features from - + Select the target layer - + @@ -39542,74 +39760,74 @@ CRS of map is %1. p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will only consider selected geometries of the target layer</span></p></body></html> - + Selected feature(s) only - + Where the feature - + Layer whose geometries will be used as reference by the topological operation - + Reference features of - + And use the result to - + Selected features - + Number of selected features in map - + Create layer with selected - + Select one FID to identify geometry of feature - + Create layer with list of items - + Zoom to item - + Log messages - + Select the reference layer - + @@ -39618,27 +39836,27 @@ p, li { white-space: pre-wrap; } p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will be only consider selected geometries of the reference layer</span></p></body></html> - + Result feature ID's - + Run query or close the window - + Select the topological operation - + Check to show log processing of query - + @@ -39648,17 +39866,17 @@ p, li { white-space: pre-wrap; } &Spatial Query - + Query not executed - + DEBUG - + @@ -39673,7 +39891,7 @@ p, li { white-space: pre-wrap; } Select a Spatialite Spatial Reference System - + @@ -39684,12 +39902,12 @@ p, li { white-space: pre-wrap; } Authority - + Reference Name - + @@ -39946,7 +40164,7 @@ p, li { white-space: pre-wrap; } Shapefiles - + @@ -40218,7 +40436,7 @@ p, li { white-space: pre-wrap; } <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.gfosservices.com"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Studio Associato Gfosservices</span></a></p> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://nextgis.org"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">NEXTGIS</span></a></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;"></p></body></html> - + @@ -40226,95 +40444,95 @@ p, li { white-space: pre-wrap; } Failed to load interface - + Failed to connect to database - + A connection to the SQL Anywhere database cannot be established. - + No suitable key column - + The source relation %1 has no column suitable for use as a unique key. Quantum GIS requires that the relation has an integer column no larger than 32 bits containing unique values. - + Error loading attributes - + Ambiguous field! - + Duplicate field %1 found - + Error describing bind parameters - + Error binding parameters - + Error inserting features - + Error deleting features - + Error adding attributes - + Error deleting attributes - + Attribute not found - + Error updating attributes - + Error updating features - + Error verifying geometry column %1 - + @@ -40324,49 +40542,49 @@ Quantum GIS requires that the relation has an integer column no larger than 32 b Column %1 has a geometry type of %2, which Quantum GIS does not currently support. - + Mixed Spatial Reference Systems - + Column %1 is not restricted to a single SRID, which Quantum GIS requires. - + Error checking database ReadOnly property - + Error loading SRS definition - + Because Quantum GIS supports only planar data, the SQL Anywhere data provider will transform the data to the compatible planar projection (SRID=%1). - + Because Quantum GIS supports only planar data and no compatible planar projection was found, the SQL Anywhere data provider will attempt to transform the data to planar WGS 84 (SRID=%1). - + Limited Support of Round Earth SRS - + Column %1 (%2) contains geometries belonging to a round earth spatial reference system (SRID=%3). %4 Updates to geometry values will be disabled, and query performance may be poor because spatial indexes will not be utilized. To improve performance, consider creating a spatial index on a new (possibly computed) column containing a planar projection of these geometries. For help, refer to the descriptions of the ST_SRID(INT) and ST_Transform(INT) methods in the SQL Anywhere documentation. - + @@ -40379,7 +40597,7 @@ Updates to geometry values will be disabled, and query performance may be poor b Clear selection - + @@ -40389,7 +40607,7 @@ Updates to geometry values will be disabled, and query performance may be poor b Select symbols to import - + @@ -40410,97 +40628,97 @@ Updates to geometry values will be disabled, and query performance may be poor b Export/import error - + You should select at least one symbol/color ramp. - + Save styles - + XML files (*.xml *.XML) - + Error when saving selected symbols to file: %1 - + Import error - + An error occured during import: %1 - + Group Name - + Please enter a name for new group: - + imported - + New Group - + New group cannot be created without a name. Kindly enter a name. - + New group - + Cannot create a group without name. Enter a name. - + Duplicate names - + Symbol with name '%1' already exists. Overwrite? - + Color ramp with name '%1' already exists. Overwrite? - + Load styles - + @@ -40510,12 +40728,12 @@ Overwrite? Downloading style ... - + HTTP Error! - + @@ -40528,12 +40746,12 @@ Overwrite? Styles import/export - + Import from - + @@ -40543,12 +40761,12 @@ Overwrite? Save to group - + Select symbols to export - + @@ -40556,28 +40774,28 @@ Overwrite? Marker symbol (%1) - + Line symbol (%1) - + Fill symbol (%1) - + Color ramp (%1) - + Type here to filter symbols ... - + @@ -40587,160 +40805,160 @@ Overwrite? Please enter a name for new symbol: - + new symbol - + new marker - + new line - + new fill symbol - + Save symbol - + Cannot save symbol without name. Enter a name. - + Symbol with name '%1' already exists. Overwrite? - + Gradient - + Random - + ColorBrewer - + cpt-city - + Color ramp type - + Please select color ramp type: - + new ramp - + new gradient ramp - + new random ramp - + Color Ramp Name - + Please enter a name for new color ramp: - + Save Color Ramp - + Cannot save color ramp without name. Enter a name. - + Save color ramp - + Color ramp with name '%1' already exists. Overwrite? - + Invalid Selection - + The parent group you have selected is not user editable. Kindly select a user defined group. - + Operation Not Allowed - + Creation of nested smart groups are not allowed Select the 'Smart Group' to create a new group. - + Invalid selection - + Cannot delete system defined categories. Kindly select a group or smart group you might want to delete. - + @@ -40751,7 +40969,7 @@ Kindly select a group or smart group you might want to delete. New group could not be created. There was a problem with your symbol database. - + @@ -40761,22 +40979,22 @@ There was a problem with your symbol database. There was a problem with the Symbols database while regrouping. - + You have not selected a Smart Group. Kindly select a Smart Group to edit. - + Database Error! - + There was some error while editing the smart group. - + @@ -40784,7 +41002,7 @@ There was a problem with your symbol database. Style Manager - + Symbolhanteraren @@ -40799,7 +41017,7 @@ There was a problem with your symbol database. Fill - + Ytsymbol @@ -40809,17 +41027,17 @@ There was a problem with your symbol database. Add item - + Share - + Tags - + Add @@ -40828,7 +41046,7 @@ There was a problem with your symbol database. Edit item - + @@ -40838,7 +41056,7 @@ There was a problem with your symbol database. Remove item - + Remove @@ -40848,14 +41066,14 @@ There was a problem with your symbol database. QgsSvgMarkerSymbolLayerV2Widget - + Select SVG file - + - + SVG files - + @@ -40863,7 +41081,7 @@ There was a problem with your symbol database. Layer %1 - + @@ -40871,17 +41089,17 @@ There was a problem with your symbol database. Symbol Levels - + Enable symbol levels - + Define the order in which the symbol layers are rendered. The numbers in the cells define in which rendering pass the layer will be drawn. - + @@ -40893,12 +41111,12 @@ There was a problem with your symbol database. Invalid Selection! - + Kindly select a symbol to add layer. - + @@ -40906,27 +41124,27 @@ There was a problem with your symbol database. Symbol selector - + Symbol layers - + Add symbol layer - + Remove symbol layer - + Lock layer's color - + @@ -40972,32 +41190,32 @@ There was a problem with your symbol database. Symbol name - + Please enter name for the symbol: - + New symbol - + Save symbol - + Symbol with name '%1' already exists. Overwrite? - + Transparency %1% - + @@ -41011,12 +41229,12 @@ There was a problem with your symbol database. Clough-Toucher (cubic) - + Save triangulation to file - + @@ -41034,7 +41252,7 @@ There was a problem with your symbol database. Export triangulation to shapefile after interpolation - + @@ -41106,172 +41324,172 @@ There was a problem with your symbol database. Quantum GIS is open source - + Quantum GIS is open source software. This means that the software source code can be freely viewed and modified. The GPL places a restriction that any modifications you make must be made available in source form to whoever you give modified versions to, and that you can not create a new version of Quantum GIS under a 'closed source' license. Visit <a href="http://qgis.org"> the QGIS home page (http://qgis.org)</a> for more information. - + QGIS Publications - + If you write a scientific paper or any other article that refers to QGIS we would love to include your work in the <a href="http://www.qgis.org/en/community/qgis-case-studies.html">case studies section</a> of the Quantum GIS home page (http://http://www.qgis.org/en/community/qgis-case-studies.html). - + Become an QGIS translator - + Would you like to see QGIS in your native language? We are looking for more translators and would appreciate your help! The translation process is fairly straight forward - instructions are available in the QGIS wiki <a href="http://www.qgis.org/wiki/GUI_Translation">translator's page (http://www.qgis.org/wiki/GUI_Translation).</a> - + QGIS Mailing lists - + If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our sofware. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://www.qgis.org/en/community/mailing-lists.html">community section</a> of the QGIS home page (http://www.qgis.org/en/community/mailing-lists.html). - + Is it 'QGIS' or 'Quantum GIS'? - + Both are correct. For articles we suggest you write 'Quantum GIS (QGIS) is ....' and then refer to it as QGIS thereafter. - + How do I refer to Quantum GIS? - + QGIS is spelled in all caps. We have various subprojects of the QGIS project and it will help to avoid confusion if you refer to each by its name:<ul><li>QGIS Library - this is the C++ library that contains the core logic that is used to build the QGIS user interface and other applications.</li><li>QGIS Application - this is the desktop application that you know and love so much :-).</li><li>QGIS Mapserver - this is a server-side application based on the QGIS Library that will serve up your .qgs projects using the WMS protocol.</li></ul> - + Add the current date to a map layout - + You can add a current date variable to your map layout. Create a regular text label and add the string $CURRENT_DATE(yyyy-MM-dd) to the text box. See the <a href="http://doc.qt.nokia.com/latest/qdate.html#toString">QDate::toString format documentation</a> for the possible date formats. - + Moving Elements and Maps in the Print Composer - + In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the <strong>Position and Size</strong> dialogue, which can be found in the tab <strong>Item &rarr; General Options &rarr; Position and Size</strong>. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame. - + Lock an element in the layout view - + By left clicking an element in the layout view you can select it, by right clicking an element you can lock it. A lock symbol will appear in the upper left corner of the selected element. This prevents the element from accidentally being moved with the mouse. While in a locked state, you cannot move an element with the mouse but you can still move it with the arrow keys or by absolutely positioning it by setting its <strong>Position and Size</strong>. - + Rotating a map and linking a north arrow - + You can rotate a map by setting its rotation value in the <strong>Item tab &rarr; Map</strong> section. To place a north arrow in your layout you can use the <strong>Add Image</strong> tool, the button with the little camera icon. QGIS comes with a selection of north arrows. After the placement of the north arrow in the layout you can link it with a specific map frame by activating the <strong>Sync with map</strong> checkbox and selecting a map frame. Whenever you change the rotation value of a linked map, the north arrow will now automatically adjust its rotation. - + Numeric scale value in map layout linked to map frame - + If you want to place a text label as a placeholder for the current scale, linked to a map frame, you need to place a scalebar and set the style to 'Numeric'. You also need to select the map frame, if there is more than one. - + Using the mouse scroll wheel - + You can use the scroll wheel on your mouse to zoom in, out and pan the map. Scroll forwards to zoom in, scroll backwards to zoom out and press and hold the scroll wheel down to pan the map. You can configure options for scroll wheel behaviour in the Options panel. - + Stopping rendering - + Sometimes you have a very large dataset which takes ages to draw. You can press 'esc' (the escape key), or click the small red 'X' icon in the status bar to the bottom right of the window at any time to halt rendering. If you are going to be performing several actions (e.g. modifying symbology options) and wish to temporarily disable map rendering while you do so, you can uncheck the 'Render' checkbox in the bottom right of the status bar. Don't forget to check it on again when you are ready to have the map draw itself again! - + Join intersected polylines when rendering - + When applying layered styles to a polyline layer, you can join intersecting lines together simply by enabling symbol levels. The image below shows a before (left) and after (right) view of an intersection when symbol levels are enabled. - + Auto-enable on the fly projection - + In the options dialog, under the CRS tab, you can set QGIS so that whenever you create a new project, 'on the fly projection' is enabled automatically and a pre-selected Coordinate Reference System of your choice is used. - + Sponsor QGIS - + If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of Quantum GIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project. Please see the <a href="http://qgis.org/en/sponsorship.html">QGIS Sponsorship Web Page</a> for more details. - + Quantum GIS has Plugins! - + Quantum GIS has plugins that extend its functionality. QGIS ships with some core plugins you can explore from the Plugins->Manage Plugins menu. In addition there are over 150 Python plugins contributed by the user community that can be installed from the Plugins->Fetch Python Plugins menu. Don't miss out on all QGIS has to offer---check out the plugins and see what they can do for you. - + @@ -41774,22 +41992,22 @@ Skall existerande klasser tas bort före klassificering? QgsVectorLayer - + ERROR: no provider FEL: ingen datakälla - + ERROR: layer not editable FEL: lager kan ej skrivas - + SUCCESS: attribute %1 was added. RÄTT: attribut %1 lades till. - + ERROR: attribute %1 not added FEL: attribut %1 lades inte till @@ -41804,17 +42022,17 @@ Skall existerande klasser tas bort före klassificering? Klassifikationsfält kunde ej hittas - + renderer failed to save renderare kunde inte spara - + no renderer ingen renderare - + SUCCESS: %n attribute(s) deleted. deleted attributes count @@ -41823,7 +42041,7 @@ Skall existerande klasser tas bort före klassificering? - + ERROR: %n attribute(s) not deleted. not deleted attributes count @@ -41832,7 +42050,7 @@ Skall existerande klasser tas bort före klassificering? - + SUCCESS: %n attribute(s) added. added attributes count @@ -41841,7 +42059,7 @@ Skall existerande klasser tas bort före klassificering? - + ERROR: %n new attribute(s) not added not added attributes count @@ -41850,7 +42068,7 @@ Skall existerande klasser tas bort före klassificering? - + SUCCESS: %n attribute value(s) changed. changed attribute values count @@ -41859,7 +42077,7 @@ Skall existerande klasser tas bort före klassificering? - + ERROR: %n attribute value change(s) not applied. not changed attribute values count @@ -41868,7 +42086,7 @@ Skall existerande klasser tas bort före klassificering? - + SUCCESS: %n feature(s) added. added features count @@ -41877,7 +42095,7 @@ Skall existerande klasser tas bort före klassificering? - + ERROR: %n feature(s) not added. not added features count @@ -41886,7 +42104,7 @@ Skall existerande klasser tas bort före klassificering? - + ERROR: %n feature(s) not added - provider doesn't support adding features. not added features count @@ -41895,7 +42113,7 @@ Skall existerande klasser tas bort före klassificering? - + SUCCESS: %n geometries were changed. changed geometries count @@ -41904,7 +42122,7 @@ Skall existerande klasser tas bort före klassificering? - + ERROR: %n geometries not changed. not changed geometries count @@ -41913,7 +42131,7 @@ Skall existerande klasser tas bort före klassificering? - + SUCCESS: %n feature(s) deleted. deleted features count @@ -41922,7 +42140,7 @@ Skall existerande klasser tas bort före klassificering? - + ERROR: %n feature(s) not deleted. not deleted features count @@ -41931,123 +42149,123 @@ Skall existerande klasser tas bort före klassificering? - + Provider errors: Datakällefel: - + Commit errors: %1 Commit-fel: %1 - + General: Allmänt: - + Layer comment: %1 Lagerkommentar: %1 - + Storage type of this layer: %1 Lagringstyp för detta lager: %1 - + Source for this layer: %1 Källa för detta lager : %1 - + Geometry type of the features in this layer: %1 Geometrityp på objekten i detta lager: %1 - + The number of features in this layer: %1 Antal objekt i detta lager: %1 - + Editing capabilities of this layer: %1 Möjlighet till redigering i detta lager: %1 - + Extents: Utsträckning: - + In layer spatial reference system units : I lagrets referenskoordinatsystemsenheter : - - + + xMin,yMin %1,%2 : xMax,yMax %3,%4 xMin,yMin %1,%2 : xMax,yMax %3,%4 - + unknown extent okänd utsträckning - - + + In project spatial reference system units : I projektets referenskoordinatsystemsenheter : - + Layer Spatial Reference System: Lagrets referenskoordinatsystem: - + Project (Output) Spatial Reference System: Projektets (visade) referenskoordinatsystem: - + (Invalid transformation of layer extents) (Ogiltig transformering av lagrets utsträckning) - + Attribute field info: Attributfält info: - + Field Fält - + Type Typ - + Length Längd - + Precision Precision - + Comment Kommentar @@ -42060,37 +42278,37 @@ Skall existerande klasser tas bort före klassificering? QgsVectorLayerProperties - - + + Single Symbol Enkel symbol - - + + Graduated Symbol Graderad Symbol - - + + Continuous Color Kontinuerlig Färg - - + + Unique Value Unik Symbol - - + + Spatial Index Rumsligt index - + Creation of spatial index failed Misslyckades skapa rumsligt index @@ -42127,28 +42345,28 @@ Skall existerande klasser tas bort före klassificering? Fält - + Type Typ - + Length Längd - + Precision Precision - + Comment Kommentar - - + + Default Style Standardstil @@ -42189,202 +42407,201 @@ Skall existerande klasser tas bort före klassificering? alias - + Name conflict Namnkonflikt - + The attribute could not be inserted. The name already exists in the table. Attributet kunde inte föras in. Namnet finns redan i tabellen. - + Added attribute La till attribut - + Deleted attribute Tog bort attribut - + Creation of spatial index successful Lyckades skapa rumsligt index - + Load layer properties from style file Läs in lageregenskaper från stilfil - - - + + + QGIS Layer Style File QGIS lager stilfil - - - + + + SLD File SLD-fil - + Load Style Läs in stil - + Save layer properties as style file Spara lageregenskaper som stilfil - + Saved Style Sparad stil - + Transparency: %1% Genomskinlighet: %1% - Overlay - Överlager + Överlager - + Layer Properties - %1 Lageregenskaper - %1 - + Id ID - + Name Namn - + Edit widget Redigeringssymbol - + Alias Alias - - + + Stop editing mode to enable this. Avsluta redigeringsläge för att tillåta detta. - + Insert expression Skriv in uttryck - + This button opens the query builder and allows you to create a subset of features to display on the map canvas rather than displaying all features in the layer Den här knappen öppnar Frågebyggaren som gör det möjligt att välja endast en delmängd av lagrets objekt för visning på kartbladet - + The query used to limit the features in the layer is shown here. To enter or modify the query, click on the Query Builder button Sökfrågan för att begränsa objekt i lagret visas här. För att ändra sökfrågan, klicka på på knappen Frågebyggare - + Line edit Linjeredigering - + Unique values Unika värden - + Unique values editable Unika värden (redigerbara) - + Classification Klassificering - + Value map Värdekarta - + Edit range Editera intervall - + Slider range Dragväljare intervall - + Dial range Snurrans intervall - + File name Filnamn - + Enumeration Uppräkning - + Immutable Oförstörbara - + Hidden Gömd - + Checkbox Kryssruta - + Text edit Textredigering - + Calendar Kalender - + Value relation Värderelation - + UUID generator UUID-generator @@ -42401,7 +42618,7 @@ Skall existerande klasser tas bort före klassificering? Kartenheter - + UI file UI-fil @@ -42442,12 +42659,12 @@ Skall existerande klasser tas bort före klassificering? Läs in lageregenskaper från stilfil (.qml) - + Select edit form Välj redigeringsformulär - + Symbology Symbologi @@ -42468,12 +42685,12 @@ Skall existerande klasser tas bort före klassificering? RuntPunkt - + Save Style Spara stil - + Save Style... Spara stil... @@ -42522,7 +42739,7 @@ Skall existerande klasser tas bort före klassificering? Spara lageregenskaper som stilfil (.qml) - + Do you wish to use the new symbology implementation for this layer? Vill du använda nya symbolimplementeringen för detta lager? @@ -43173,17 +43390,17 @@ Skall existerande klasser tas bort före klassificering? QgsWFSProvider - + unknown obekant - + received %1 bytes from %2 Tog emot %1 bytes av %2 - + Error Fel @@ -43651,7 +43868,7 @@ Objekt Feature limit for GetFeatureInfo - + @@ -43666,7 +43883,7 @@ Objekt Move selected layer UP - + @@ -43676,7 +43893,7 @@ Objekt Move selected layer DOWN - + @@ -43698,7 +43915,7 @@ Objekt Tilesets - + Styles @@ -43716,7 +43933,7 @@ Objekt Tileset - + @@ -43802,27 +44019,27 @@ Försökte med URL: %1 Capabilities request redirected. - + empty of capabilities: %1 - + Download of capabilities failed: %1 - + WCS - + WCS %1 of %2 bytes of capabilities downloaded. - + @@ -43832,7 +44049,7 @@ Försökte med URL: %1 Could not get WCS capabilities: %1 - + @@ -43851,17 +44068,17 @@ This might be due to an incorrect WCS Server URL. Tag:%3 Response was: %4 - + Version not supported - + WCS server version %1 is not supported by Quantum GIS (supported versions: 1.0.0, 1.1.0, 1.1.2) - + @@ -43870,289 +44087,288 @@ This is probably due to an incorrect WCS Server URL. Response was: %4 - + QgsWcsProvider - + Cannot describe coverage - + - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + WCS - + WCS - + Coverage not found - + - + Cannot calculate extent - + - + Cannot get test dataset. - + - + Received coverage has wrong extent %1 (expected %2) - + Rotating raster - + - + Block read OK - + - + Received coverage has wrong size %1 x %2 (expected %3 x %4) - + - + Getting map via WCS. - + - + Map request error (Status: %1; Reason phrase: %2; URL:%3) Kart-fel (status:%1; orsak:%2; URL: %3) - - + Map request error (Title:%1; Error:%2; URL: %3) Kart-fel (titel:%1; fel:%2; URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) Kart-fel (status:%1; svar:%2; URL: %3) - - Cannot find boundary in multipart content type + + Map request error:<br>Title: %1<br>Error: %2<br>URL: <a href='%3'>%3</a>) - + + Cannot find boundary in multipart content type + + + + Expected 2 parts, %1 received - + - + More than 2 parts (%1) received - + - + Map request error (Response: %1; URL:%2) - + - + Content-Transfer-Encoding %1 not supported - + - + No data received - + - + Cannot create memory file - + - + Map request failed [error:%1 url:%2] Kart-fel (fel:%1; URL:- %2) - + Not logging more than 100 request errors. Loggar ej mer än 100 fel. - + %1 of %2 bytes of map downloaded. - + - + Dom Exception DOM fel - + Could not get WCS Service Exception at %1: %2 at line %3 column %4 Response was: %5 - + - + Request contains a format not offered by the server. - + - + Request is for a Coverage not offered by the service instance. - + - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. Värdet på (frivilliga) UpdateSequence-parameter i GetCapabilities-förfrågan är samma som nuvarande värde på 'service metadata update' sekvensnummer. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. Värdet på (frivilliga) UpdateSequence-parameter i GetCapabilities-förfrågan är större än nuvarande värde på 'service metadata update' sekvensnummer. - + Request does not include a parameter value, and the server instance did not declare a default value for that dimension. - + - + Request contains an invalid parameter value. - + - + No other exceptionCode specified by this service and server applies to this exception. - + - + Operation request contains an output CRS that can not be used within the output format. - + - + Operation request specifies to "store" the result, but not enough storage is available to do this. - + - + (No error code was reported) (Ingen felkod) - + (Unknown error code) (Okänd felkod) - + The WCS vendor also reported: - + - + composed error message '%1'. - + - - + + Property Egenskap - - + + Value Värde - + Name (identifier) - + - - + + Title Titel - - + + Abstract Sammanfattning - + Fixed Width Fast bredd - + Fixed Height Fast höjd - + Native CRS - + - + Native Bounding Box - + - + WGS 84 Bounding Box WGS 84 begränsningsruta - - + + Available in CRS Tillgänglig i referenskoordinatsystem - - + + (and %n more) crs @@ -44161,76 +44377,76 @@ Response was: - - + + Available in format - + - - + + Coverages - + - + Cache Stats - + - + Server Properties - + - + Keywords Nyckelord - + Online Resource Online-resurser - + Contact Person Kontaktperson - + Fees Avgifter - + Access Constraints Åtkomstbegränsningar - + Image Formats Bildformat - + GetCapabilitiesUrl - + - + Get Coverage Url - + - + &nbsp;<font color="red">(advertised but ignored)</font> - + - + And %1 more coverages - + out of extent @@ -44256,308 +44472,338 @@ Response was: Förfrågan innehåller ett format som servern inte tillhandahåller. - + Request contains a CRS not offered by the server for one or more of the Layers in the request. Förfrågan innehåller ett referenskoordinatsystem för ett eller flera lager i anropet, som servern inte tillhandahåller. - + Request contains a SRS not offered by the server for one or more of the Layers in the request. Förfrågan innehåller en SRS för ett eller flera lager i anropet, som servern inte tillhandahåller. - + GetMap request is for a Layer not offered by the server, or GetFeatureInfo request is for a Layer not shown on the map. GetMap-förfrågan är för ett lager som serven inte tillhandahåller, eller GetFeatureInfo-anropet är avsett för ett lager som inte är med på kartan. - + Request is for a Layer in a Style not offered by the server. Förfrågan är för ett lager med en stil som servern inte stödjer. - + GetFeatureInfo request is applied to a Layer which is not declared queryable. GetFeatureInfo-förfrågan ställdes till ett lager som inte är definerat som frågbart. - + GetFeatureInfo request contains invalid X or Y value. GetFeatureInfo-förfrågan innehåller ogiltigt X- eller Y-värde. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. Värdet på (frivilliga) UpdateSequence-parameter i GetCapabilities-förfrågan är samma som nuvarande värde på 'service metadata update' sekvensnummer. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. Värdet på (frivilliga) UpdateSequence-parameter i GetCapabilities-förfrågan är större än nuvarande värde på 'service metadata update' sekvensnummer. - + Request does not include a sample dimension value, and the server did not declare a default value for that dimension. Förfrågan innehåller inte ett dimensionsvärde, och servern har inte angett ett standardvärde för dimensionen. - + Request contains an invalid sample dimension value. Förfrågan innehåller ett ogiltigt dimensionsvärde. - + Request is for an optional operation that is not supported by the server. Förfrågan gäller en frivillig operation som servern inte stödjer. - + The WMS vendor also reported: WMS-företaget sa också: - - - - + + + + Property Egenskap - - - - + + + + Value Värde - + WMS Version WMS version - - - + + + Title Titel - + Number of layers and styles don't match Antal lager och stil överensstämmer ej - + Getting tiles. Hämtar mosaik. - + Tile request error (Title:%1; Error:%2; URL: %3) Mosaik-fel (titel:%1; fel:%2; URL:- %3) - + Tile request error (Status:%1; Content-Type:%2; Length:%3; URL: %4) Mosaik-fel (status:%1; typ:%2; längd: %3; URL: %4) - + Tile request failed [error:%1 url:%2] Mosaik-fel (fel:%1; URL:- %2) - - + + Not logging more than 100 request errors. Loggar ej mer än 100 fel. - + Map request error (Status: %1; Reason phrase: %2; URL:%3) Kart-fel (status:%1; orsak:%2; URL: %3) - + Map request error (Title:%1; Error:%2; URL: %3) Kart-fel (titel:%1; fel:%2; URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) Kart-fel (status:%1; svar:%2; URL: %3) - + Map request failed [error:%1 url:%2] Kart-fel (fel:%1; URL:- %2) - - - + + + Abstract Sammanfattning - + Tile Layer Properties Egenskaper mosaiklager - + Keywords Nyckelord - + Online Resource Online-resurser - + Contact Person Kontaktperson - + Fees Avgifter - + Access Constraints Åtkomstbegränsningar - + Image Formats Bildformat - + Identify Formats Identifieringsformat - + Layer Count Antal lager - + Tile Layer Count Antal mosaiklager - + GetTileUrl GetTileUrl - + Tile templates Mosaik-mall - + FeatureInfo templates FeatureInfo-mall - + WMTS WMTS - + WMS-C WMS-C - + Selected Vald - - - - + + + + Yes Ja - - - - + + + + No Nej - + Visibility Synlighet - - - - - - - - - - - - - - - - - + + Cannot parse URI + + + + + Cannot calculate extent + + + + + Cannot set CRS + + + + + + + + + + + + + + + + + + + + WMS WMS - + + Number of tile layers must be one + + + + + Tile layer not found + + + + + Tile layer or tile matrix set not found + + + + image is NULL Bilden är tom - + unexpected image size Oväntad bildstorlek - + Tile request error Mosaik fel - + Status: %1 Reason phrase: %2 Status: %1 Orsak: %2 - - + + Returned image is flawed [%1] Returnerad bild är felaktig [%1] - + empty capabilities document Tomt dokument med förmågor - + Could not get WMS capabilities: %1 at line %2 column %3 This is probably due to an incorrect WMS Server URL. Response was: @@ -44570,7 +44816,7 @@ Svaret var: %4 - + Could not get WMS capabilities in the expected format (DTD): no %1 or %2 found. This might be due to an incorrect WMS Server URL. Tag:%3 @@ -44583,108 +44829,113 @@ Svaret var: %4 - + Could not get WMS Service Exception at %1: %2 at line %3 column %4 Response was: %5 - + - + Request contains a format not offered by the server. - + - + composed error message '%1'. + + + + + Extent for layer %1 not found in capabilities - + Visible Synlig - + Hidden Gömd - + Can Identify Kan identifieras - + Can be Transparent Kan vara transparent - + Can Zoom In Kan zooma in - + Cascade Count Kaskadnummer - + Fixed Width Fast bredd - + Fixed Height Fast höjd - + WGS 84 Bounding Box WGS 84 begränsningsruta - - + + Available in CRS Tillgänglig i referenskoordinatsystem - + Available in style Tilgänglig med stil - + Available Styles Tillgängliga stilar - + Available Tilesets Tillgängliga mosaiker - + Map getfeatureinfo error %1: %2 - + - + ERROR: GetFeatureInfo failed - + - + Map getfeatureinfo error: %1 [%2] - + - - + + Name Namn @@ -44693,128 +44944,126 @@ Response was: Stilar - + CRS Referenskoordinatsystem - + Bounding Box Begränsningsruta - + Hits Träffar - + Misses Missar - + Errors Fel - Layer cannot be queried in plain text. - Lagret kan inte förfrågas med text. + Lagret kan inte förfrågas med text. - Layer cannot be queried. - Lager kan inte utfrågas. + Lager kan inte utfrågas. - + identify request redirected. - + - - - + + + Dom Exception DOM fel - + Getting map via WMS. - + - - + + %n tile requests in background tile request count - + - - + + , %n cache hits tile cache hits - + - - + + , %n cache misses. tile cache missed - + - - + + , %n errors. errors - + - + Tried URL: %1 Försökte med URL: %1 - + Capabilities request redirected. - + - + empty of capabilities: %1 - + - + Download of capabilities failed: %1 - + - + %1 of %2 bytes of capabilities downloaded. - + - + %1 of %2 bytes of map downloaded. - + Could not get WMS capabilities: %1 at line %2 column %3 @@ -44829,17 +45078,17 @@ Försökte med URL: %1 - + (No error code was reported) (Ingen felkod) - + (Unknown error code) (Okänd felkod) - + (and %n more) crs @@ -44848,58 +45097,58 @@ Försökte med URL: %1 - - + + Server Properties - + - - + + Selected Layers - + - - + + Other Layers - + - + Tileset Properties - + - + Cache Stats - + - + GetCapabilitiesUrl - + - + GetMapUrl - + - - + + &nbsp;<font color="red">(advertised but ignored)</font> - + - + GetFeatureInfoUrl GetFeatureInfoUrl - + Cache stats - + @@ -44912,7 +45161,7 @@ Försökte med URL: %1 Dimension - + @@ -44941,17 +45190,17 @@ Försökte med URL: %1 Raster layer: - + Polygon layer containing the zones: - + Output column prefix: - + @@ -44961,12 +45210,12 @@ Försökte med URL: %1 &Zonal statistics - + Calculating zonal statistics... - + @@ -45044,17 +45293,17 @@ Försökte med URL: %1 Export feature - + Select destination layer - + New temporary layer - + @@ -45062,7 +45311,7 @@ Försökte med URL: %1 Transportation layer - + @@ -45072,37 +45321,37 @@ Försökte med URL: %1 Direction field - + Reverse direction - + Value for forward direction - + Value for reverse direction - + Value two-way direction - + Speed field - + Default settings - + @@ -45112,22 +45361,22 @@ Försökte med URL: %1 Two-way direction - + Forward direction - + Cost - + Line lengths - + @@ -45141,18 +45390,18 @@ Försökte med URL: %1 km/h - + m/s - + Always use default - + @@ -45160,42 +45409,42 @@ Försökte med URL: %1 Road graph plugin settings - + Time unit - + Distance unit - + Topology tolerance - + second - + hour - + meter - + kilometer - + @@ -45308,7 +45557,7 @@ Försökte med URL: %1 Road graph plugin settings - + @@ -45325,18 +45574,18 @@ Försökte med URL: %1 SEXTANTE Analysis - + - &SEXTANTE Toolbox + &SEXTANTE toolbox - &SEXTANTE Modeler + &SEXTANTE modeler - &SEXTANTE History and log + &SEXTANTE history and log @@ -45381,7 +45630,7 @@ Försökte med URL: %1 Line Interpretation - + @@ -45399,17 +45648,17 @@ Försökte med URL: %1 Save connection - + Spara anslutning Should the existing connection %1 be overwritten? - + Vill du att existerande anslutning '%1' ska skrivas över? Failed to load interface - + @@ -45428,7 +45677,7 @@ Försökte med URL: %1 SQL Anywhere error code: %1 Description: %2 - + @@ -45436,7 +45685,7 @@ Description: %2 Create a new SQL Anywhere connection - + @@ -45461,7 +45710,7 @@ Description: %2 Server - + @@ -45471,7 +45720,7 @@ Description: %2 Connection Parameters - + @@ -45486,57 +45735,57 @@ Description: %2 Name of the new connection - + Namn på den nya anslutningen Name or IP address of computer hosting the database server (leave blank for local connections) - + Port number used by the database server (leave blank for default 2638) - + Name of the database server (leave blank for default server on host) - + Name of the database (leave blank for default database on server) - + Additional connection parameters - + Database username - + Database password - + Save Username - + Spara användarnamn Save the connection username in the registry - + &Test Connect - + &Testa anslutning @@ -45546,37 +45795,37 @@ Description: %2 Save the connection password in the registry (WARNING: NOT SECURE) - + Simple Encryption - + Encrypt packets using simple encryption - + Estimate table metadata - + Use estimates for certain layer properties such as cardinality, extent, etc. (improves performance) - + Search other users' tables - + Search for geometry columns in tables owned by other users - + @@ -45622,7 +45871,7 @@ Description: %2 &Build Query - + @@ -45670,7 +45919,7 @@ Description: %2 Line Interpretation - + @@ -45692,7 +45941,7 @@ Description: %2 Confirm Delete - + @@ -45707,7 +45956,7 @@ Description: %2 Failed to load interface - + @@ -45720,7 +45969,7 @@ Description: %2 SQL Anywhere error code: %2 Description: %3 - + @@ -45730,17 +45979,17 @@ Description: %3 Database connection was successful, but no tables containing geometry columns were %1. - + found - + found in your schema - + @@ -45748,17 +45997,17 @@ Description: %3 Add SQL Anywhere layer - + SQL Anywhere Connections - + Delete - + @@ -45782,7 +46031,7 @@ Description: %3 Search options - + @@ -45792,12 +46041,12 @@ Description: %3 Search mode - + Search in columns - + @@ -45866,6 +46115,56 @@ Description: %3 + + SettingsDialog + + + Tab 1 + Tab 1 + + + + Use preloaded API file + + + + + Font + Typsnitt + + + + Size + Storlek + + + + API file + + + + + Browse + Bläddra + + + + Tab 2 + Tab 2 + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Aurulent Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">Python Console for QGIS</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">Developed by Salvatore Larosa</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">---------------------------</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version.</span></p></body></html> + + + SextanteToolbox @@ -46237,37 +46536,37 @@ additional algorithm providers Formulär - + Font family Typsnittsfamilj - + Color Färg - + Change Ändra - + Size Storlek - + Rotation Rotation - + ° ° - + Offset X,Y Offset X,Y @@ -46280,17 +46579,17 @@ additional algorithm providers Formulär - + Color Färg - + Change Ändra - + Pen width Pennbredd @@ -46303,38 +46602,36 @@ additional algorithm providers Formulär - + Angle Vinkel - + Distance Avstånd - + Line width Linjebredd - + Color Färg - - + Change Ändra - Outline - Kontur + Kontur - + Offset @@ -46403,22 +46700,22 @@ additional algorithm providers Ändra - + Horizontal distance Horisontellt avstånd - + Vertical distance Vertikalt avstånd - + Horizontal displacement Horisontell förkjutning - + Vertical displacement Vertikal förskjutning @@ -46431,54 +46728,52 @@ additional algorithm providers Formulär - + Texture width Texturbredd - + Rotation Rotation - + Color Färg - + Border color Kantfärg - + Border width Kantbredd - Outline - Kontur + Kontur - - - + + Change Ändra - + SVG Groups SVG-grupper - + SVG Symbols SVG-symboler - + ... ... @@ -46491,38 +46786,38 @@ additional algorithm providers Formulär - + Color Färg - + Fill style Fyllnadsstil - + Border color Kantfärg - + Border style Kantstil - + Border width Kantbredd - + Offset X,Y Offset X,Y - - + + Change Ändra @@ -46535,43 +46830,43 @@ additional algorithm providers Formulär - + Color Färg - + Pen width Pennbredd - + Offset Offset - + Pen style Pennstil - + Join style Ihopslagningsstil - + Cap style - + - - + + Change Ändra - + Use custom dash pattern Använd valbar streckning @@ -46584,33 +46879,33 @@ additional algorithm providers Formulär - + Border color Kantfärg - + Fill color Fyllnadsfärg - + Size Storlek - + Angle Vinkel - + Offset X,Y Offset X,Y - - + + Change Ändra @@ -46628,48 +46923,48 @@ additional algorithm providers Storlek - + Angle Vinkel - + Offset X,Y Offset X,Y - - + + Change Ändra - + Color Färg - + Border width Kantbredd - + Border color Kantfärg - + SVG Groups SVG-grupper - + SVG Image SVG-bild - + ... ... @@ -46934,12 +47229,12 @@ For support send a mail to scala@itc.cnr.it Undefined - + No predefined queries loaded - + @@ -46948,57 +47243,57 @@ For support send a mail to scala@itc.cnr.it Open File - + New Database connection requested... - + Error: You must select a database type - + Error: No host name entered - + Error: No database name entered - + Connection to [%1.%2] established - + Connection to [%1.%2] failed: %3 - + Error: Unabled to open file [%1] - + Error: Query failed: %1 - + Error: Could not create temporary file, process halted - + connected - + uppkopplad @@ -47008,12 +47303,12 @@ For support send a mail to scala@itc.cnr.it Error: Parse error at line %1, column %2: %3 - + Error: A database connection is not currently established - + @@ -47022,37 +47317,37 @@ For support send a mail to scala@itc.cnr.it Database Connection - + Load predefined queries - + Loads an XML file with predefined queries. Use the Open File window to locate the XML file that contains one or more predefined queries using the format described in the user guide. - + The description of the selected query. - + Predefined Queries - + Select the predefined query you want to use from the drop-down list containing queries identified from the file loaded using the Open File icon above. To run the query you need to click on the SQL Query tab. The query will be automatically entered in the query window. - + not connected - + @@ -47060,27 +47355,27 @@ For support send a mail to scala@itc.cnr.it p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Connection Status: </span></p></body></html> - + Database Host - + Enter the database host. If the database resides on your desktop you should enter ¨localhost¨. If you selected ¨MSAccess¨ as the database type this option will not be available. - + Password to access the database. - + Enter the name of the database. - + @@ -47090,12 +47385,12 @@ p, li { white-space: pre-wrap; } Enter the port through which the database must be accessed if a MYSQL database is used. - + Connect to the database using the parameters selected above. If the connection was successful a message will be displayed in the Output Console below saying the connection was established. - + @@ -47105,17 +47400,17 @@ p, li { white-space: pre-wrap; } User name to access the database. - + Select the type of database from the list of supported databases in the drop-down menu. - + Database Name - + @@ -47125,7 +47420,7 @@ p, li { white-space: pre-wrap; } Database Type - + @@ -47135,32 +47430,32 @@ p, li { white-space: pre-wrap; } SQL Query - + Run the query entered above. The status of the query will be displayed in the Output Console below. - + Run Query - + Enter the query you want to run in this window. - + A window for status messages to be displayed. - + Output Console - + @@ -47168,22 +47463,22 @@ p, li { white-space: pre-wrap; } Database File Selection - + The name of the field that contains the Y coordinate of the points. - + The name of the field that contains the X coordinate of the points. - + Enter the name for the new layer that will be created and displayed in QGIS. - + @@ -47198,7 +47493,7 @@ p, li { white-space: pre-wrap; } Name of New Layer - + @@ -47206,7 +47501,7 @@ p, li { white-space: pre-wrap; } Generic Event Browser - + @@ -47247,38 +47542,38 @@ p, li { white-space: pre-wrap; } Unable to connect to either the map canvas or application interface - + An invalid feature was received during initialization - + Event Browser - Displaying records 01 of %1 - + Event Browser - Displaying records %1 of %2 - + Attribute Contents - + Select Application - + All ( * ) - + @@ -47291,7 +47586,7 @@ p, li { white-space: pre-wrap; } Use the Previous button to display the previous photo when more than one photo is available for display. - + @@ -47301,17 +47596,17 @@ p, li { white-space: pre-wrap; } Use the Next button to display the next photo when more than one photo is available for display. - + Next - + All of the attribute information for the point associated with the photo being viewed is displayed here. If the file type being referenced in the displayed record is not an image but is of a file type defined in the “Configure External Applications” tab then when you double-click on the value of the field containing the path to the file the application to open the file will be launched to view or hear the contents of the file. If the file extension is recognized the attribute data will be displayed in green. - + @@ -47321,12 +47616,12 @@ p, li { white-space: pre-wrap; } Image display area - + Display area for the image. - + @@ -47336,17 +47631,17 @@ p, li { white-space: pre-wrap; } Use the drop-down list to select the field containing a directory path to the image. This can be an absolute or relative path. - + If checked the path to the image will be defined appending the attribute in the field selected from the “Attribute Containing Path to Image” drop-down list to the “Base Path” defined below. - + If checked, the relative path values will be saved for the next session. - + @@ -47356,53 +47651,53 @@ p, li { white-space: pre-wrap; } Reset to default - + Resets the values on this line to the default setting. - + If checked an arrow pointing in the direction defined by the attribute in the field selected from the drop-down list to the right will be displayed in the QGIS window on top of the point for this image. - + Use the drop-down list to select the field containing the compass bearing for the image. This bearing usually references the direction the camera was pointing when the image was acquired. - + If checked, the Display Compass Bearing values will be saved for the next session. - + A value to be added to the compass bearing. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. - + Define the compass offset using a field from the vector layer attribute table. - + From Attribute - + Use the drop-down list to select the field containing the compass bearing offset. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. - + Define the compass offset manually. - + @@ -47412,53 +47707,53 @@ p, li { white-space: pre-wrap; } If checked, the compass offset values will be saved for the next session. - + Resets the compass offset values to the default settings. - + The base path or url from which images and documents can be “relative” - + Base Path - + Enters the default “Base Path” which is the path to the directory of the vector layer containing the image information. - + If checked, the same path rules that are defined for images will be used for non-image documents such as movies, text documents, and sound files. If not checked the path rules will only apply to images and other documents will ignore the Base Path parameter. - + The Base Path onto which the relative path defined above will be appended. - + File path - + Attribute containing path to file - + Path is relative - + @@ -47468,7 +47763,7 @@ p, li { white-space: pre-wrap; } Remember this - + @@ -47478,105 +47773,105 @@ p, li { white-space: pre-wrap; } Reset - + Compass bearing - + Attribute containing compass bearing - + Display compass bearing - + Compass offset - + Relative paths - + If checked, the Base Path will be saved for the next session. - + If checked, the Base Path will append only the file name instead of the entire relative path (defined above) to create the full directory path to the file. - + Replace entire path/url stored in image path attribute with user defined Base Path (i.e. keep only filename from attribute) - + If checked, the current check-box setting will be saved for the next session. - + Clears the check-box on this line. - + Apply Path to Image rules when loading docs in external applications - + Clicking on Save will save the settings without closing the Options pane. Clicking on Restore Defaults will reset all of the fields to their default settings. It has the same effect as clicking all of the “Reset to default” buttons. - + Configure External Applications - + File extension and external application in which to load a document of that type - + A table containing file types that can be opened using eVis. Each file type needs a file extension and the path to an application that can open that type of file. This provides the capability of opening a broad range of files such as movies, sound recording, and text documents instead of only images. - + Extension - + Application - + Applikation Add new file type - + Add a new file type with a unique extension and the path for the application that can open the file. - + @@ -47586,7 +47881,7 @@ Base Path (i.e. keep only filename from attribute) Delete the file type highlighted in the table and defined by a file extension and a path to an associated application. - + @@ -47599,7 +47894,7 @@ Base Path (i.e. keep only filename from attribute) Zoom in to see more detail. - + @@ -47609,7 +47904,7 @@ Base Path (i.e. keep only filename from attribute) Zoom out to see more area. - + @@ -47619,7 +47914,7 @@ Base Path (i.e. keep only filename from attribute) Zoom to display the entire image. - + @@ -47636,7 +47931,7 @@ Insticksprogrammet stängs av. Create spatial index - + Skapa spatialt index &Analysis Tools @@ -47764,7 +48059,7 @@ Insticksprogrammet stängs av. Voronoi Polygons - + Extract nodes @@ -47776,7 +48071,7 @@ Insticksprogrammet stängs av. Densify geometries - + Multipart to singleparts @@ -47792,7 +48087,7 @@ Insticksprogrammet stängs av. Lines to polygons - + &Data Management Tools @@ -47820,7 +48115,7 @@ Insticksprogrammet stängs av. Merge shapefiles to one - + fTools Information @@ -47835,23 +48130,23 @@ Insticksprogrammet stängs av. Polygon area - + Polygon perimeter - + Line length - + Point x coordinate - + Point y coordinate - + @@ -47859,67 +48154,67 @@ Insticksprogrammet stängs av. (1-256) - + (Optional) column to read labels - + 3D-Viewer (NVIZ) - + 3d Visualization - + Add a value to the current category values - + Add elements to layer (ALL elements of the selected layer type!) - + Add missing centroids to closed boundaries - + Add one or more columns to attribute table - + Allocate network - + Assign constant value to column - + Assign new constant value to column only if the result of query is TRUE - + Assign new value as result of operation on columns to column in attribute table - + Assign new value to column as result of operation on columns only if the result of query is TRUE - + @@ -47929,57 +48224,57 @@ Insticksprogrammet stängs av. Attribute field (interpolated values) - + Attribute field to (over)write - + Attribute field to join - + Auto-balancing of colors for LANDSAT-TM raster - + Bicubic or bilinear spline interpolation with Tykhonov regularization - + Bilinear interpolation utility for raster maps - + Blend color components for two rasters by given ratio - + Blend red, green, raster layers to obtain one color raster - + Break (topologically clean) polygons (imported from non topological format, like ShapeFile). Boundaries are broken on each point shared between 2 and more polygons where angles of segments are different - + Break lines at each intersection of vector - + Brovey transform to merge multispectral and high-res panchromatic channels - + @@ -47989,527 +48284,527 @@ Insticksprogrammet stängs av. Build polylines from lines - + Calculate average of raster within areas with the same category in a user-defined base map - + Calculate covariance/correlation matrix for user-defined rasters - + Calculate error matrix and kappa parameter for accuracy assessment of classification result - + Calculate geometry statistics for vectors - + Calculate linear regression from two rasters: y = a + b*x - + Calculate median of raster within areas with the same category in a user-defined base map - + Calculate mode of raster within areas with the same category in a user-defined base map - + Calculate optimal index factor table for LANDSAT-TM raster - + Calculate raster surface area - + Calculate shadow maps from exact sun position - + Calculate shadow maps from sun position determinated by date/time - + Calculate statistics for raster - + Calculate univariate statistics for numeric attributes in a data table - + Calculate univariate statistics from raster based on vector objects - + Calculate univariate statistics from the non-null cells of raster - + Calculate univariate statistics of vector map features - + Calculate volume of data clumps, and create vector with centroids of clumps - + Category or object oriented statistics - + Cats - + Cats (select from the map or using their id) - + Change category values and labels - + Change field - + Change layer number - + Change resolution - + Change the type of boundary dangle to line - + Change the type of bridges connecting area and island or 2 islands from boundary to line - + Change the type of geometry elements - + Choose appropriate format - + Columns management - + Compares bit patterns with raster - + Compress and decompress raster - + Compress raster - + Computes a coordinate transformation based on the control points - + Concentric circles - + Connect nodes by shortest route (traveling salesman) - + Connect selected nodes by shortest tree (Steiner tree) - + Connect vector to database - + Convert 2D vector to 3D by sampling raster - + Convert 2D vector to 3D vector by sampling of elevation raster. Default sampling by nearest neighbour - + Convert GRASS binary vector to GRASS ASCII vector - + Convert a raster to vector within GRASS - + Convert a vector to raster within GRASS - + Convert bearing and distance measurements to coordinates and vice versa - + Convert boundaries to lines - + Convert centroids to points - + Convert coordinates - + Convert coordinates from one projection to another (cs2cs frontend) - + Convert lines to boundaries - + Convert points to centroids - + Convert raster to vector areas - + Convert raster to vector lines - + Convert raster to vector points - + Convert vector to raster using attribute values - + Convert vector to raster using constant - + Convex hull - + Copy a table - + Copy also attribute table (only the table of layer 1 is currently supported) - + Count of neighbouring points - + Create 3D volume map based on 2D elevation and value rasters - + Create a MASK for limiting raster operation - + Create a map containing concentric rings - + Create a raster plane - + Create and add new table to vector - + Create and/or modify raster support files - + Create aspect raster from DEM (digital elevation model) - + Create cross product of category values from multiple rasters - + Create fractal surface of given fractal dimension - + Create grid in current region - + Create new GRASS location and transfer data into it - + Create new GRASS location from metadata file - + Create new GRASS location from raster data - + Create new GRASS location from vector data - + Create new layer with category values based upon user's reclassification of categories in existing raster - + Create new location from .prj (WKT) file - + Create new raster by combining other rasters - + Create new vector by combining other vectors - + Create new vector with current region extent - + Create nodes on network - + Create parallel line to input lines - + Create points - + Create points along input lines - + Create points/segments from input vector lines and positions - + Create quantization file for floating-point raster - + Create random 2D/3D vector points - + Create random cell values with spatial dependence - + Create random points - + Create random vector point contained in raster - + Create raster images with textural features from raster (first serie of indices) - + Create raster of distance to features in input layer - + Create raster of gaussian deviates with user-defined mean and standard deviation - + Create raster of uniform random deviates with user-defined range - + Create raster with contiguous areas grown by one cell - + Create raster with textural features from raster (second serie of indices) - + Create red, green and blue rasters combining hue, intensity, and saturation (his) values from rasters - + Create shaded map - + Create slope raster from DEM (digital elevation model) - + Create standard vectors - + Create surface from rasterized contours - + Create vector contour from raster at specified levels - + Create vector contour from raster at specified steps - + Create watershed basin - + Create watershed subbasins raster - + Cut network by cost isolines - + DXF vector layer - + @@ -48519,452 +48814,452 @@ Insticksprogrammet stängs av. Database connection - + Database file - + Database management - + Delaunay triangulation (areas) - + Delaunay triangulation (lines) - + Delaunay triangulation, Voronoi diagram and convex hull - + Delete category values - + Develop images and group - + Develop map - + Directory of rasters to be linked - + Disconnect vector from database - + Display general DB connection - + Display list of category values found in raster - + Display projection information from PROJ.4 projection description file - + Display projection information from PROJ.4 projection description file and create a new location based on it - + Display projection information from a georeferenced file (raster, vector or image) and create a new location based on it - + Display projection information from georeferenced ASCII file containing WKT projection description - + Display projection information from georeferenced ASCII file containing WKT projection description and create a new location based on it - + Display projection information from georeferenced file (raster, vector or image) - + Display projection information of the current location - + Display raster category values and labels - + Display results of SQL selection from database - + Display the HTML manual pages of GRASS - + Display vector attributes - + Display vector map attributes with SQL - + Dissolves boundaries between adjacent areas sharing a common category number or attribute - + Download and import data from WMS server - + Drop column from attribute table - + E00 vector layer - + Elevation raster for height extraction (optional) - + Execute any SQL statement - + Export 3 GRASS rasters (R,G,B) to PPM image at the resolution of the current region - + Export from GRASS - + Export raster as non-georeferenced PNG image format - + Export raster from GRASS - + Export raster series to MPEG movie - + Export raster to 8/24bit TIFF image at the resolution of the current region - + Export raster to ASCII text file - + Export raster to ESRI ARCGRID - + Export raster to GRIDATB.FOR map file (TOPMODEL) - + Export raster to Geo TIFF - + Export raster to POVRAY height-field file - + Export raster to PPM image at the resolution of the current region - + Export raster to VTK-ASCII - + Export raster to Virtual Reality Modeling Language (VRML) - + Export raster to binary MAT-File - + Export raster to binary array - + Export raster to text file as x,y,z values based on cell centers - + Export raster to various formats (GDAL library) - + Export vector from GRASS - + Export vector table from GRASS to database format - + Export vector to DXF - + Export vector to GML - + Export vector to Mapinfo - + Export vector to POV-Ray - + Export vector to PostGIS (PostgreSQL) database table - + Export vector to SVG - + Export vector to Shapefile - + Export vector to VTK-ASCII - + Export vector to various formats (OGR library) - + Exports attribute tables into various format - + Extract features from vector - + Extract selected features - + Extracts terrain parameters from DEM - + Extrudes flat vector object to 3D with fixed height - + Extrudes flat vector object to 3D with height based on attribute - + Fast fourier transform for image processing - + Feature type (for polygons, choose Boundary) - + File management - + Fill lake from seed at given level - + Fill lake from seed point at given level - + Fill no-data areas in raster using v.surf.rst splines interpolation - + Filter and create depressionless elevation map and flow direction map from elevation raster - + Filter image - + Find nearest element in vector 'to' for elements in vector 'from'. Various information about this relation may be uploaded to attribute table of input vector 'from' - + Find shortest path on vector network - + GRASS MODULES - + GRASS shell - + Gaussian kernel density - + Generalization - + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) coordinates - + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) raster - + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) vector - + Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) coordinates - + Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) vector - + Generate surface - + Generate vector contour lines - + Generates area statistics for rasters - + Georeferencing, rectification, and import Terra-ASTER imagery and DEM using gdalwarp - + Graphical raster map calculator - + @@ -48974,17 +49269,17 @@ Insticksprogrammet stängs av. Hue Intensity Saturation (HIS) to Red Green Blue (RGB) raster color transform function - + Hydrologic modelling - + Imagery - + Import @@ -48993,372 +49288,372 @@ Insticksprogrammet stängs av. Import ASCII raster - + Import DXF vector - + Import ESRI ARC/INFO ASCII GRID - + Import ESRI E00 vector - + Import GDAL supported raster - + Import GDAL supported raster and create a fitted location - + Import GRIDATB.FOR (TOPMODEL) - + Import MapGen or MatLab vector - + Import OGR vector - + Import OGR vector and create a fitted location - + Import OGR vectors in a given data source combining them in a GRASS vector - + Import SPOT VGT NDVI - + Import SRTM HGT - + Import US-NGA GEOnet Names Server (GNS) country file - + Import all OGR/PostGIS vectors in a given data source and create a fitted location - + Import attribute tables in various formats - + Import binary MAT-File(v4) - + Import binary raster - + Import from database into GRASS - + Import geonames.org country files - + Import into GRASS - + Import loaded raster - + Import loaded raster and create a fitted location - + Import loaded vector - + Import loaded vector and create a fitted location - + Import only some layers of a DXF vector - + Import raster from ASCII polygon/line - + Import raster from coordinates using univariate statistics - + Import raster into GRASS - + Import raster into GRASS from QGIS view - + Import raster into GRASS from external data sources in GRASS - + Import text file - + Import vector from gps using gpsbabel - + Import vector from gps using gpstrans - + Import vector into GRASS - + Import vector points from database table containing coordinates - + Input nodes - + Input table - + Interpolate surface - + Inverse distance squared weighting raster interpolation - + Inverse distance squared weighting raster interpolation based on vector points - + Inverse fast fourier transform for image processing - + Join table to existing vector table - + Layers categories management - + Line-of-sight raster analysis - + Link GDAL supported raster as GRASS raster - + Link GDAL supported raster loaded in QGIS as GRASS raster - + Link all GDAL supported rasters in a directory as GRASS rasters - + Loaded layer - + Locate the closest points between objects in two raster maps - + Make each output cell function of the values assigned to the corresponding cells in the input rasters - + Manage features - + Manage image colors - + Manage map colors - + Manage raster cells value - + Manage training dataset - + Map algebra - + Map type conversion - + MapGen or MatLab vector layer - + Mask - + Maximal tolerance value (higher value=more simplification) - + Metadata support - + Minimum size for each basin (number of cells) - + Mosaic up to 4 images - + Name for new raster file (specify file extension) - + Name for new vector file (specify file extension) - + Name for output vector map (optional) - + Name for the output raster map (optional) - + Neighborhood analysis - + Network analysis - + Network maintenance - + Number of rows to be skipped - + Others - + Output GML file - + @@ -49368,12 +49663,12 @@ Insticksprogrammet stängs av. Output layer name (used in GML file) - + Output raster values along user-defined transect line(s) - + @@ -49383,72 +49678,72 @@ Insticksprogrammet stängs av. Overlay maps - + Path to GRASS database of input location (optional) - + Path to the OGR data source - + Percentage of first layer (0-99) - + Perform affine transformation (shift, scale and rotate, or GPCs) on vector - + Print projection information from a georeferenced file - + Print projection information from a georeferenced file and create a new location based on it - + Print projection information of the current location - + Projection conversion of vector - + Projection management - + Put geometry variables in database - + Query rasters on their category values and labels - + Random location perturbations of vector points - + Randomly partition points into test/train sets - + @@ -49458,372 +49753,372 @@ Insticksprogrammet stängs av. Raster buffer - + Raster file matrix filter - + Raster neighbours analysis - + Raster support - + Re-project raster from a location to the current location - + Rebuild topology of a vector in mapset - + Rebuild topology of all vectors in mapset - + Recategorize contiguous cells to unique categories - + Reclass category values - + Reclass category values using a column attribute (integer positive) - + Reclass category values using a rules file - + Reclass raster using reclassification rules - + Reclass raster with patches larger than user-defined area size (in hectares) - + Reclass raster with patches smaller than user-defined area size (in hectares) - + Reclassify raster greater or less than user-defined area size (in hectares) - + Recode categorical raster using reclassification rules - + Recode raster - + Reconnect vector to a new database - + Red Green Blue (RGB) to Hue Intensity Saturation (HIS) raster color transformation function - + Region settings - + Register external data sources in GRASS - + Regularized spline with tension raster interpolation based on vector points - + Reinterpolate and compute topographic analysis using regularized spline with tension and smoothing - + Remove all lines or boundaries of zero length - + Remove bridges connecting area and island or 2 islands - + Remove dangles - + Remove duplicate area centroids - + Remove duplicate lines (pay attention to categories!) - + Remove existing attribute table of vector - + Remove outliers from vector point data - + Remove small angles between lines at nodes - + Remove small areas, the longest boundary with adjacent area is removed - + Remove vertices in threshold from lines and boundaries, boundary is pruned only if topology is not damaged (new intersection, changed attachement of centroid), first and last segment of the boundary is never changed - + Rename column in attribute table - + Reports - + Reports and statistics - + Reproject raster from another Location - + Reproject vector from another Location - + Resample raster using aggregation - + Resample raster using interpolation - + Resample raster. Set new resolution first - + Rescale the range of category values in raster - + Sample raster at site locations - + Save the current region as a named region - + Select features by attributes - + Select features overlapped by features in another map - + Separator (| , etc.) - + Set PostgreSQL DB connection - + Set boundary definitions by edge (n-s-e-w) - + Set boundary definitions for raster - + Set boundary definitions from raster - + Set boundary definitions from vector - + Set boundary definitions to current or default region - + Set color rules based on stddev from a map's mean value - + Set general DB connection - + Set general DB connection with a schema (PostgreSQL only) - + Set raster color table - + Set raster color table from existing raster - + Set raster color table from setted tables - + Set raster color table from user-defined rules - + Set region to align to raster - + Set the region to match multiple rasters - + Set the region to match multiple vectors - + Set user/password for driver/database - + Sets the boundary definitions for a raster map - + Show database connection for vector - + Shrink current region until it meets non-NULL data from raster - + Simple map algebra - + Simplify vector - + Snap lines to vertex in threshold - + Solar and irradiation model - + Spatial analysis - + Spatial models - + Split lines to shorter segments - + @@ -49833,132 +50128,132 @@ Insticksprogrammet stängs av. Sum raster cell values - + Surface management - + Tables management - + Tabulate mutual occurrence (coincidence) of categories for two rasters - + Take vector stream data, transform it to raster, and subtract depth from the output DEM - + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 4 raster - + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 5 raster - + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 7 raster - + Tassled cap vegetation index - + Terrain analysis - + Tests of normality on vector points - + Text file - + Thin no-zero cells that denote line features - + Toolset for cleaning topology of vector map - + Topology management - + Trace a flow through an elevation model - + Transform cells with value in null cells - + Transform features - + Transform image - + Transform null cells in value cells - + Transform value cells in null cells - + Type in map names separated by a comma - + Update raster statistics - + Update vector map metadata - + Upload raster values at positions of vector points to the table - + Upload vector values at positions of vector points - + @@ -49968,166 +50263,166 @@ Insticksprogrammet stängs av. Vector buffer - + Vector geometry analysis - + Vector intersection - + Vector non-intersection - + Vector subtraction - + Vector union - + Vector update by other maps - + Visibility graph construction - + Voronoi diagram (area) - + Voronoi diagram (lines) - + Watershed Analysis - + Which column for the X coordinate? The first is 1 - + Which column for the Y coordinate? - + Which column for the Z coordinate? If 0, z coordinate is not used - + Work with vector points - + Write only features link to a record - + Zero-crossing edge detection raster function for image processing - + visualThread Max. len: - + Min. len: - + Mean. len: - + Filled: - + Empty: - + N: - + Mean: - + StdDev: - + Sum: - + Min: - + Max: - + CV: - + Number of unique values: - + Range: - + Median: - + Observed mean distance: - + Expected mean distance: - + Nearest neighbour index: - + Z-Score: - + Feature %1 contains an unnested hole diff --git a/i18n/qgis_sw.ts b/i18n/qgis_sw.ts new file mode 100644 index 000000000000..3d64ccd42cf6 --- /dev/null +++ b/i18n/qgis_sw.ts @@ -0,0 +1,46668 @@ + + + + + CharacterWidget + + + <p>Character: <span style="font-size: 24pt; font-family: %1%2</span><p>Value: 0x%3"> + + + + + CoordinateCapture + + + + Coordinate Capture + + + + + + Click on the map to view coordinates and capture to clipboard. + + + + + &Coordinate Capture + + + + + Click to select the CRS to use for coordinate display + + + + + Coordinate in your selected CRS (lat,lon or east,north) + + + + + Coordinate in map canvas coordinate reference system (lat,lon or east,north) + + + + + Copy to clipboard + + + + + Click to enable mouse tracking. Click the canvas to stop + + + + + Start capture + + + + + Click to enable coordinate capture + + + + + Dialog + + + Eliminate sliver polygons + + + + + area + + + + + Selected features: + + + + + + + + + Input vector layer + + + + + common boundary + + + + + Merge selection with the neighbouring polygon with the largest + + + + + + Save to new file + + + + + + + + + + + + + + + + + + + + + Browse + + + + + + Add result to canvas + + + + + Extract Nodes + + + + + Input line or polygon vector layer + + + + + + + Unique ID field + + + + + Save to new shapefile + + + + + Output point shapefile + + + + + Tolerance + + + + + Calculate using + + + + + Calculate extent for each feature separately + + + + + + + + + Use only selected features + + + + + Geoprocessing + + + + + Intersect layer + + + + + Buffer distance + + + + + Buffer distance field + + + + + Dissolve field + + + + + Dissolve buffer results + + + + + + + + Output shapefile + + + + + Segments to approximate + + + + + Locate Line Intersections + + + + + Input line layer + + + + + + Input unique ID field + + + + + Intersect line layer + + + + + Intersect unique ID field + + + + + + + + + + + Output Shapefile + + + + + Generate Centroids + + + + + Weight field + + + + + Number of standard deviations + + + + + Std. Dev. + + + + + Merge shapefiles + + + + + Select by layers in the folder + + + + + Shapefile type + + + + + Polygon + + + + + Line + + + + + Point + + + + + Input directory + + + + + Add result to map canvas + + + + + Create Distance Matrix + + + + + Input point layer + + + + + Target point layer + + + + + Target unique ID field + + + + + Output matrix type + + + + + Linear (N*k x 3) distance matrix + + + + + Standard (N x T) distance matrix + + + + + Summary distance matrix (mean, std. dev., min, max) + + + + + Use only the nearest (k) target points + + + + + Output distance matrix + + + + + Count Points In Polygons + + + + + + Input polygon vector layer + + + + + Input point vector layer + + + + + Output count field name + + + + + PNTCNT + + + + + Generate Random Points + + + + + + Input Boundary Layer + + + + + Sample Size + + + + + Unstratified Sampling Design (Entire layer) + + + + + + + Use this number of points + + + + + Stratified Sampling Design (Individual polygons) + + + + + Use this density of points + + + + + Use value from input field + + + + + Random Selection Tool + + + + + + + Input Vector Layer + + + + + + Randomly Select + + + + + + Number of Features + + + + + + Percentage of Features + + + + + + % + + + + + Projection Management Tool + + + + + Input spatial reference system + + + + + Output spatial reference system + + + + + Use predefined spatial reference system + + + + + Choose + + + + + Import spatial reference system from existing layer + + + + + Import spatial reference system + + + + + Generate Regular Points + + + + + Area + + + + + Input Coordinates + + + + + + X Min + + + + + + Y Min + + + + + + X Max + + + + + + Y Max + + + + + Grid Spacing + + + + + Use this point spacing + + + + + Apply random offset to point spacing + + + + + Initial inset from corner (LH side) + + + + + Simplify geometries + + + + + Input line or polygon layer + + + + + Simplify tolerance + + + + + Build spatial index + + + + + Select files from disk + + + + + Select files... + + + + + Select all + + + + + Select none + + + + + Clear list + + + + + Spatial Join + + + + + Target vector layer + + + + + Join vector layer + + + + + Attribute Summary + + + + + Mean + + + + + Take summary of intersecting features + + + + + Min + + + + + Sum + + + + + Median + + + + + Max + + + + + Take attributes of first located feature + + + + + Output table + + + + + Only keep matching records + + + + + Keep all records (including non-matching target records) + + + + + Random Selection From Within Subsets + + + + + Input subset field (unique ID field) + + + + + Sum Line Length In Polygons + + + + + Output summed length field name + + + + + LENGTH + + + + + Input line vector layer + + + + + Generate Vector Grid + + + + + Grid extent + + + + + Update extents from layer + + + + + Update extents from canvas + + + + + Align extents and resolution to selected raster layer + + + + + Parameters + + + + + X + + + + + Lock 1:1 ratio + + + + + Y + + + + + Output grid as polygons + + + + + Output grid as lines + + + + + Vector Split + + + + + Output folder + + + + + List Unique Values + + + + + Target field + + + + + Unique values list + + + + + Unique value count + + + + + Press Ctrl+C to copy results to the clipboard + + + + Regular points + + + + Please specify input layer + + + + Please properly specify extent coordinates + + + + Please specify output shapefile + + + + Created output point shapefile: +%1 + +Would you like to add the new layer to the TOC? + + + + creating new selection + + + + adding to current selection + + + + removing from current selection + + + + Select by location + + + + Select features in: + + + + that intersect features in: + + + + Modify current selection by: + + + + Use selected features only + + + + Please specify select layer + + + + Select directory with shapefiles to merge + + + + No shapefiles found + + + + There are no shapefiles in this directory. Please select another one. + + + + Input files + + + + No output file + + + + Please specify output file. + + + + Delete error + + + + Can't delete file %1 + + + + Cancel + + + + Merging + + + + Error loading output shapefile: +%1 + + + + Close + + + + Sum line lengths + + + + Sum Line Lengths In Polyons + + + + Please specify input polygon vector layer + + + + Please specify input line vector layer + + + + Please specify output length field + + + + Created output shapefile: +%1 + +Would you like to add the new layer to the TOC? + + + + CRS warning! + + + + Warning: Input layers have non-matching CRS. +This may cause unexpected results. + + + + length field + + + + Random selection within subsets + + + + Please specify input vector layer + + + + Please specify an input field + + + + Distance matrix + + + + Create Point Distance Matrix + + + + Please specify input point layer + + + + Please specify output file + + + + Please specify target point layer + + + + Please specify input unique ID field + + + + Please specify target unique ID field + + + + Created output matrix: + + + + + Define current projection + + + + Missing or invalid CRS + + + + No input shapefile specified + + + + Please specify spatial reference system + + + + Cannot define projection for PostGIS data...yet! + + + + Identical output spatial reference system chosen + +Are you sure you want to proceed? + + + + Output spatial reference system is not valid + + + + Defined Projection For: +%1.shp + + + + Please select the projection system that defines the current layer. + + + + Layer CRS information will be updated to the selected CRS. + + + + Export to new projection + + + + No Valid CRS selected + + + + Count Points in Polygon + + + + Count Points In Polygon + + + + Please specify input point vector layer + + + + Please specify output count field + + + + Random Points + + + + No input layer specified + + + + unstratified + + + + stratified + + + + density + + + + field + + + + Unknown layer type... + + + + Mean coordinates + + + + Standard distance + + + + (Optional) Weight field + + + + (Optional) Unique ID field + + + + Coordinate statistics + + + + No input vector layer specified + + + + Selected features: %1 + + + + Eliminate + + + + No selection in input layer + + + + Error creating output file + + + + Could not replace geometry of feature with id + + + + Could not delete feature with id + + + + Commit error + + + + Commit Error + + + + Created output shapefile: +%1 + + + + Could not eliminate features with these ids: +%1 + + + + Line intersections + + + + Please specify input line layer + + + + Please specify line intersect layer + + + + Please specify intersect unique ID field + + + + Random selection + + + + Densify geometries + + + + Vertices to add + + + + Warning + + + + Currently QGIS doesn't allow simultaneous access from + different threads to the same datasource. Make sure your layer's + attribute tables are closed. Continue? + + + + Simplify results + + + + There were %1 vertices in original dataset which +were reduced to %2 vertices after simplification + + + + Error + + + + Finished + + + + Processing completed. + + + + Join attributes by location + + + + Please specify target vector layer + + + + Please specify join vector layer + + + + Please specify at least one summary statistic + + + + Summary field + + + + Incorrect field names + + + + No output will be created. +Following field names are longer than 10 characters: +%1 + + + + Error deleting shapefile + + + + Can't delete existing shapefile +%1 + + + + Vector grid + + + + Please select a raster layer + + + + Unable to compute extents aligned on selected raster layer + + + + Please specify valid extent coordinates + + + + Invalid extent coordinates entered + + + + Split vector layer + + + + Created output shapefiles in folder: +%1 + + + + + DlgAddGeometryColumn + + + Dialog + + + + + Name + + + + + geom + + + + + Type + + + + + POINT + + + + + LINESTRING + + + + + POLYGON + + + + + MULTIPOINT + + + + + MULTILINESTRING + + + + + MULTIPOLYGON + + + + + GEOMETRYCOLLECTION + + + + + Dimensions + + + + + SRID + + + + + -1 + + + + + DlgCreateConstraint + + + Add constraint + + + + + Column + + + + + Primary key + + + + + Unique + + + + + DlgCreateIndex + + + Create index + + + + + Column + + + + + Name + + + + + DlgCreateTable + + + Create Table + + + + + Schema + + + + + + Name + + + + + Add field + + + + + Delete field + + + + + Up + + + + + Down + + + + + Primary key + + + + + Create geometry column + + + + + POINT + + + + + LINESTRING + + + + + POLYGON + + + + + MULTIPOINT + + + + + MULTILINESTRING + + + + + MULTIPOLYGON + + + + + GEOMETRYCOLLECTION + + + + + geom + + + + + Dimensions + + + + + SRID + + + + + -1 + + + + + Create spatial index + + + + + DlgDbError + + + Database Error + + + + + An error occured: + + + + + An error occured when executing a query: + + + + + Query: + + + + + DlgFieldProperties + + + Field properties + + + + + Name + + + + + Type + + + + + Can be NULL + + + + + Default value + + + + + Length + + + + + DlgImportVector + + + Import vector layer + + + + + Schema: + + + + + Table: + + + + + Action + + + + + Create new table + + + + + Drop existing one + + + + + Append data into table + + + + + Options + + + + + Primary key: + + + + + Geometry column: + + + + + Source SRID: + + + + + Target SRID: + + + + + Encoding: + + + + + Create single-part geometries instead of multi-part + + + + + Create spatial index + + + + + DlgSqlWindow + + + SQL window + + + + + SQL query: + + + + + &Execute (F5) + + + + + F5 + + + + + &Clear + + + + + Result: + + + + + Load as new layer + + + + + Column with unique +integer values + + + + + Geometry column + + + + + Retrieve +columns + + + + + Layer name (prefix) + + + + + Type + + + + + Vector + + + + + Raster + + + + + Load now! + + + + + <html><head/><body><p>Avoid selecting feature by id. Sometimes - especially when running expensive queries/views - fetching the data sequentially instead of fetching features by id can be much quicker.</p></body></html> + + + + + Avoid selecting by feature id + + + + Sorry + + + + You must fill the required fields: +geometry column - column with unique integer values + + + + + DlgTableProperties + + + Table properties + + + + + Columns + + + + + Table columns: + + + + + Add column + + + + + Add geometry column + + + + + Edit column + + + + + Delete column + + + + + Constraints + + + + + Primary, foreign keys, unique and check constraints: + + + + + Add primary key / unique + + + + + Delete constraint + + + + + Indexes + + + + + Indexes defined for this table: + + + + + Add index + + + + + Add spatial index + + + + + Delete index + + + + + DlgVersioning + + + Add versioning support to a table + + + + + Table is expected to be empty, with a primary key. + + + + + Schema + + + + + Table + + + + + create a view with current content (<TABLE>_current) + + + + + New columns + + + + + Prim. key + + + + + id_hist + + + + + Start time + + + + + time_start + + + + + End time + + + + + time_end + + + + + SQL to be executed: + + + + + GdalTools + + The process failed to start. Either the invoked program is missing, or you may have insufficient permissions to invoke the program. + + + + The process crashed some time after starting successfully. + + + + An unknown error occurred. + + + + &Input directory + + + + &Output directory + + + + The selected file is not a supported OGR format + + + + Plugin error + + + + Unable to load %1 plugin. +The required "%2" module is missing. +Install it and try again. + + + + Quantum GIS version detected: + + + + This version of Gdal Tools requires at least QGIS version 1.0.0 +Plugin will not be enabled. + + + + Projections + + + + Warp (Reproject) + + + + Warp an image into a new coordinate system + + + + Assign projection + + + + Add projection info to the raster + + + + Extract projection + + + + Extract projection information from raster(s) + + + + Conversion + + + + Rasterize (Vector to raster) + + + + Burns vector geometries into a raster + + + + Polygonize (Raster to vector) + + + + Produces a polygon feature layer from a raster + + + + Translate (Convert format) + + + + Converts raster data between different formats + + + + RGB to PCT + + + + Convert a 24bit RGB image to 8bit paletted + + + + PCT to RGB + + + + Convert an 8bit paletted image to 24bit RGB + + + + Extraction + + + + Contour + + + + Builds vector contour lines from a DEM + + + + Clipper + + + + Analysis + + + + Sieve + + + + Removes small raster polygons + + + + Near black + + + + Convert nearly black/white borders to exact value + + + + Fill nodata + + + + Fill raster regions by interpolation from edges + + + + Proximity (Raster distance) + + + + Produces a raster proximity map + + + + Grid (Interpolation) + + + + Create raster from the scattered data + + + + DEM (Terrain models) + + + + Tool to analyze and visualize DEMs + + + + Miscellaneous + + + + Build Virtual Raster (Catalog) + + + + Builds a VRT from a list of datasets + + + + Merge + + + + Build a quick mosaic from a set of images + + + + Information + + + + Lists information about raster dataset + + + + Build overviews (Pyramids) + + + + Builds or rebuilds overview images + + + + Tile index + + + + Build a shapefile as a raster tileindex + + + + GdalTools settings + + + + Various settings for Gdal Tools + + + + + GdalToolsAboutDialog + + + About Gdal Tools + + + + + GDAL Tools + + + + + Version x.x-xxxxxx + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;"></p></body></html> + + + + + Web + + + + + Close + + + + + GdalToolsBaseBatchWidget + + Finished + + + + Operation completed. + + + + Warning + + + + The following files were not created: +%1 + + + + + GdalToolsBaseDialog + + Warning + + + + The command is still running. +Do you want terminate it anyway? + + + + Invalid parameters. + + + + + GdalToolsBasePluginWidget + + Warning + + + + No output file created. + + + + Finished + + + + Processing completed. + + + + %1 not created. + + + + + GdalToolsDialog + + + Dialog + + + + + &Load into canvas when finished + + + + + + Edit + + + + + + Reset + + + + + Extract projection + + + + + Batch mode (for processing whole directory) + + + + + &Input file + + + + + Recurse subdirectories + + + + + Create also prj file + + + + Select the input file for Rasterize + + + + Select the raster file to save the results to + + + + Output size required + + + + The output file doesn't exist. You must set up the output size to create it. + + + + Select the input file for Polygonize + + + + Select where to save the Polygonize output + + + + Select the input file for Contour + + + + Select where to save the Contour output + + + + Select the input file for Translate + + + + Select the input directory with files to Translate + + + + Select the output directory to save the results to + + + + Translate - srcwin + + + + Image coordinates (pixels) must be integer numbers. + + + + Translate - prjwin + + + + Image coordinates (geographic) must be numbers. + + + + Select the input file for convert + + + + Select the input directory with files for convert + + + + Select the files to Merge + + + + Error retrieving the extent + + + + GDAL was unable to retrieve the extent from any file. +The "Use intersected extent" option will be unchecked. + + + + Empty extent + + + + The computed extent is empty. +Disable the "Use intersected extent" option to have a nonempty output. + + + + Select where to save the Merge output + + + + Select the input directory with files to Merge + + + + Select the input file for Sieve + + + + Select the file to analyse + + + + Select the input directory with files to Assign projection + + + + Convert paletted image to RGB + + + + Warning + + + + Warning: CRS information for all raster in subfolders will be rewritten. Are you sure? + + + + Finished + + + + Processing completed. + + + + %1 not created. + + + + Assign projection + + + + This raster already found in map canvas + + + + Select the input file for Grid + + + + Select the input file for Near Black + + + + Select the files for VRT + + + + Select where to save the VRT + + + + VRT (*.vrt) + + + + Select the input directory with files for VRT + + + + Select the input directory with raster files + + + + Select where to save the TileIndex output + + + + Copy + + + + Copy all + + + + Select the input file for Warp + + + + Select the mask file + + + + Select the input directory with files to Warp + + + + Select the files to analyse + + + + Select the input directory with files + + + + Select the file for DEM + + + + Select the color configuration file + + + + Select the input file for Proximity + + + + Select the input file + + + + + GdalToolsExtentSelector + + + Select the extent by drag on canvas + + + + + or change the extent coordinates + + + + + + x + + + + + + y + + + + + 2 + + + + + 1 + + + + + Re-Enable + + + + + GdalToolsInOutSelector + + + Select... + + + + + GdalToolsOptionsTable + + + Name + + + + + Value + + + + + Add + + + + + Remove + + + + + GdalToolsSettingsDialog + + + Gdal Tools settings + + + + + Path to the GDAL executables + + + + + + + + + Browse + + + + + Path to the GDAL python modules + + + + + GDAL help path + + + + + GDAL data path + + + + + GDAL driver path + + + + A list of colon-separated (Linux and MacOS) or +semicolon-separated (Windows) paths to both binaries +and python executables. + +MacOS users usually need to set it to something like +/Library/Frameworks/GDAL.framework/Versions/1.8/Programs + + + + A list of colon-separated (Linux and MacOS) or +semicolon-separated (Windows) paths to python modules. + + + + Useful to open local GDAL documentation instead of online help +when pressing on the tool dialog's Help button. + + + + Select directory with GDAL executables + + + + Select directory with GDAL python modules + + + + Select directory with the GDAL documentation + + + + + GdalToolsWidget + + + Build Virtual Raster (Catalog) + + + + + Use visible raster layers for input + + + + + + Choose input directory instead of files + + + + + + &Input files + + + + + + + + Recurse subdirectories + + + + + + + + + + + + + + + + &Output file + + + + + &Resolution + + + + + Highest + + + + + Average + + + + + Lowest + + + + + &Source No Data + + + + + Se&parate + + + + + Allow projection difference + + + + + Clipper + + + + + + &No data value + + + + + + + &Input file (raster) + + + + + Clipping mode + + + + + + Extent + + + + + + + Mask layer + + + + + Create an output alpha band + + + + + Contour + + + + + &Output file for contour lines (vector) + + + + + I&nterval between contour lines + + + + + &Attribute name + + + + + If not provided, no elevation attribute is attached. + + + + + ELEV + + + + + Convert RGB image to paletted + + + + + + + + + + Batch mode (for processing whole directory) + + + + + + + + + + + + + &Input file + + + + + Number of colors + + + + + Band to convert + + + + + DEM (Terrain models) + + + + + &Input file (DEM raster) + + + + + &Band + + + + + Compute &edges + + + + + &Mode + + + + + Hillshade + + + + + Slope + + + + + Aspect + + + + + Color relief + + + + + TRI (Terrain Ruggedness Index) + + + + + TPI (Topographic Position Index) + + + + + Roughness + + + + + Use Zevenbergen&&Thorne formula (instead of the Horn's one) + + + + + Z factor (vertical exaggeration) + + + + + + Scale (ratio of vert. units to horiz.) + + + + + Azimuth of the light + + + + + Altitude of the light + + + + + Slope expressed as percent (instead of as degrees) + + + + + Return trigonometric angle (instead of azimuth) + + + + + Return 0 for flat (instead of -9999) + + + + + Color configuration file + + + + + Matching mode + + + + + Exact color (otherwise "0,0,0,0" RGBA) + + + + + Nearest color + + + + + Add alpha channel + + + + + + + &Creation Options + + + + + Fill Nodata + + + + + + &Input Layer + + + + + + Output format + + + + + Search distance + + + + + Smooth iterations + + + + + Band to operate on + + + + + Validity mask + + + + + Do not use the default validity mask + + + + + Grid (Interpolation) + + + + + &Z Field + + + + + &Algorithm + + + + + Inverse distance to a power + + + + + Moving average + + + + + Nearest neighbor + + + + + Data metrics + + + + + Power + + + + + Smoothing + + + + + + + + Radius1 + + + + + + + + Radius2 + + + + + Max points + + + + + + + Min points + + + + + + + + Angle + + + + + + + + + No data + + + + + Metrics + + + + + Minimum + + + + + Maximum + + + + + Range + + + + + + Resize + + + + + + + Width + + + + + + + Height + + + + + Info + + + + + Raster info + + + + + Suppress GCP printing + + + + + Suppress metadata printing + + + + + Merge + + + + + Layer stack + + + + + Use intersected extent + + + + + Grab pseudocolor table from the first image + + + + + Near Black + + + + + How &far from black (or white) + + + + + Search for nearly &white (255) pixels instead of black ones + + + + + Build overviews (Pyramids) + + + + + Resampling method + + + + + nearest + + + + + average + + + + + gauss + + + + + cubic + + + + + average_mp + + + + + average_magphase + + + + + mode + + + + + Levels (space delimited) + + + + + Remove all overviews. + + + + + Clean + + + + + In order to generate external overview (for GeoTIFF especially). + + + + + Open in read-only mode + + + + + Create external overviews in TIFF format, compressed using JPEG. + + + + + Overviews in TIFF format with JPEG compression + + + + + + For JPEG compressed external overviews, +the JPEG quality can be set. + + + + + JPEG Quality (1-100) + + + + + Alternate overview format using Erdas Imagine format, +placing the overviews in an associated .aux file +suitable for direct use with Imagine,ArcGIS, GDAL. + + + + + Use Imagine format (.aux file) + + + + + Polygonize (Raster to vector) + + + + + &Output file for polygons (shapefile) + + + + + &Field name + + + + + DN + + + + + Use mask + + + + + Assign projection + + + + + WARNING: current projection definition will be cleared + + + + + Desired SRS + + + + + Output will be: +- new GeoTiff if input file is not GeoTiff +- overwritten if input is GeoTiff + + + + + + + + Select... + + + + + Proximity (Raster distance) + + + + + &Values + + + + + &Dist units + + + + + GEO + + + + + PIXEL + + + + + &Max dist + + + + + &No data + + + + + &Fixed buf val + + + + + + 0 + + + + + Rasterize (Vector to raster) + + + + + &Input file (shapefile) + + + + + &Attribute field + + + + + &Output file for rasterized vectors (raster) + + + + + New size (required if output file doens't exist) + + + + + Sieve + + + + + &Threshold + + + + + &Pixel connections + + + + + 4 + + + + + 8 + + + + + Raster tile index + + + + + Input directory + + + + + Output shapefile + + + + + Tile index field + + + + + location + + + + + Write absolute path + + + + + Skip files with different projection ref + + + + + Translate (Convert format) + + + + + + &Target SRS + + + + + + Percentage to resize image. This will change pixel size/image resolution accordingly: 25% will create an image with pixels 4x larger. + + + + + Outsize + + + + + % + + + + + + Assign a specified nodata value to output bands. + + + + + + To expose a dataset with 1 band with a color table as a dataset with 3 (RGB) or 4 (RGBA) bands. +Useful for output drivers such as JPEG, JPEG2000, MrSID, ECW that don't support color indexed datasets. +The 'gray' value (from GDAL 1.7.0) enables to expand a dataset with a color table that only contains gray levels to a gray indexed dataset. + + + + + Expand + + + + + Gray + + + + + RGB + + + + + RGBA + + + + + + Selects a subwindow from the source image for copying based on pixel/line location. (Enter Xoff Yoff Xsize Ysize) + + + + + Srcwin + + + + + + Selects a subwindow from the source image for copying (like -srcwin) but with the corners given in georeferenced coordinates. (Enter ulx uly lrx lry) + + + + + Prjwin + + + + + Copy all subdatasets of this file to individual output files. Use with formats like HDF or OGDI that have subdatasets. + + + + + Sds + + + + + Warp (Reproject) + + + + + &Source SRS + + + + + &Resampling method + + + + + Near + + + + + Bilinear + + + + + Cubic + + + + + Cubic spline + + + + + Lanczos + + + + + No data values + + + + + &Memory used for caching + + + + + MB + + + + + Use m&ultithreaded warping implementation + + + + &Output directory for contour lines (shapefile) + + + + + GeometryDialog + + Merge all + + + + Geometry + + + + Please specify input vector layer + + + + Please specify output shapefile + + + + Please specify valid tolerance value + + + + Please specify valid UID field + + + + Singleparts to multipart + + + + Output shapefile + + + + Multipart to singleparts + + + + Extract nodes + + + + Polygons to lines + + + + Input polygon vector layer + + + + Export/Add geometry columns + + + + Input vector layer + + + + Layer CRS + + + + Project CRS + + + + Ellipsoid + + + + Polygon centroids + + + + Output point shapefile + + + + Delaunay triangulation + + + + Input point vector layer + + + + Voronoi polygon + + + + Buffer region + + + + Lines to polygons + + + + Input line vector layer + + + + Polygon from layer extent + + + + Input layer + + + + Output polygon shapefile + + + + Unable to delete existing shapefile. + + + + Currently QGIS doesn't allow simultaneous access from + different threads to the same datasource. Make sure your layer's + attribute tables are closed. Continue? + + + + Cancel + + + + Error processing specified tolerance! +Please choose larger tolerance... + + + + Unable to delete incomplete shapefile. + + + + At least two features must have same attribute value! +Please choose another field... + + + + One or more features in the output layer may have invalid geometry, please check using the check validity tool + + + + + Created output shapefile: +%1 +%2 + +Would you like to add the new layer to the TOC? + + + + Error loading output shapefile: +%1 + + + + Layer '%1' updated + + + + Error writing output shapefile. + + + + + GeoprocessingDialog + + Dissolve all + + + + Geoprocessing + + + + Please specify an input layer + + + + Please specify a difference/intersect/union layer + + + + Please specify valid buffer value + + + + Please specify dissolve field + + + + Please specify output shapefile + + + + No features selected, please uncheck 'Use selected' or make a selection + + + + Buffer(s) + + + + Create single minimum convex hull + + + + Create convex hulls based on input field + + + + Convex hull(s) + + + + Dissolve + + + + Difference layer + + + + Difference + + + + Intersect layer + + + + Intersect + + + + Symetrical difference + + + + Clip layer + + + + Clip + + + + Union layer + + + + Union + + + + Unable to delete existing shapefile. + + + + Cancel + + + + Close + + + + No output created. File creation error: +%1 + + + + +Warnings: + + + + +Some output geometries may be missing or invalid. + +Would you like to add the new layer anyway? + + + + + +Would you like to add the new layer to the TOC? + + + + +Input CRS error: Different input coordinate reference systems detected, results may not be as expected. + + + + +Input CRS error: One or more input layers missing coordinate reference information, results may not be as expected. + + + + +Feature geometry error: One or more output features ignored due to invalid geometry. + + + + +GEOS geoprocessing error: One or more input features have invalid geometry. + + + + Created output shapefile: +%1 +%2%3 + + + + Error loading output shapefile: +%1 + + + + + GlobePlugin + + + Launch Globe + + + + + Globe Settings + + + + + Unload Globe + + + + + Overlay data on a 3D globe + + + + + Settings for 3D globe + + + + + Unload globe + + + + + + + &Globe + + + + + Heatmap + + + Heatmap + + + + + Creates a heatmap raster for the input point vector. + + + + + + &Heatmap + + + + + GDAL driver error + + + + + Cannot open the driver for the specified format + + + + + Raster update error + + + + + Could not open the created raster for updating. The heatmap was not generated. + + + + + Point layer error + + + + + Could not identify the vector data provider. + + + + + Heatmap generation aborted + + + + + QGIS will now load the partially-computed raster. + + + + + HeatmapGui + + + Save Heatmap as: + + + + + No valid layers found! + + + + + Advanced options cannot be enabled. + + + + + Invalid output filename + + + + + Please enter a valid output file path and name. + + + + + Layer not found + + + + + Layer %1 not found. + + + + + HeatmapGuiBase + + + Heatmap Plugin + + + + + Input Point Vector + + + + + Output Raster + + + + + ... + + + + + Output Format + + + + + Radius + + + + + 10 + + + + + + meters + + + + + + map units + + + + + Decay Ratio + + + + + 0.1 + + + + + Advanced + + + + + Row + + + + + Cell Size X + + + + + Column + + + + + Cell Size Y + + + + + Use Radius from field + + + + + Use Weight from field + + + + + Help + + + Dialog + + + + + about:blank + + + + + LayerPropertiesWidget + + + Form + + + + + Symbol layer type + + + + + This layer doesn't have any editable properties + + + + + MainWindow + + + &Edit + + + + + &File + + + + + &Open Recent Projects + + + + + Print Composers + + + + + New Project From Template + + + + + &View + + + + + Select + + + + + Measure + + + + + &Decorations + + + + + &Layer + + + + + New + + + + + &Plugins + + + + + &Help + + + + + &Settings + + + + + &Raster + + + + + File + + + + + Manage Layers + + + + + Digitizing + + + + + Advanced Digitizing + + + + + Map Navigation + + + + + Attributes + + + + + Plugins + + + + + Help + + + + + Raster + + + + + Label + + + + + Vector + + + + + Database + + + + + Web + + + + + &New Project + + + + + Ctrl+N + + + + + &Open Project... + + + + + Ctrl+O + + + + + &Save Project + + + + + Ctrl+S + + + + + Save Project &As... + + + + + Ctrl+Shift+S + + + + + Save as Image... + + + + + &New Print Composer + + + + + Ctrl+P + + + + + Composer Manager... + + + + + Exit + + + + + Ctrl+Q + + + + + &Undo + + + + + Ctrl+Z + + + + + &Redo + + + + + Ctrl+Shift+Z + + + + + Cut Features + + + + + Ctrl+X + + + + + Copy Features + + + + + Ctrl+C + + + + + Paste Features + + + + + Ctrl+V + + + + + Add Feature + + + + + Ctrl+. + + + + + Move Feature(s) + + + + + Reshape Features + + + + + Split Features + + + + + Delete Selected + + + + + Add Ring + + + + + Add Part + + + + + Simplify Feature + + + + + Delete Ring + + + + + Delete Part + + + + + Merge Selected Features + + + + + Merge Attributes of Selected Features + + + + + Node Tool + + + + + Rotate Point Symbols + + + + + Snapping Options... + + + + + Pan Map + + + + + Zoom In + + + + + Ctrl++ + + + + + Zoom Out + + + + + Ctrl+- + + + + + Select Single Feature + + + + + Select Features by Rectangle + + + + + Select Features by Polygon + + + + + Select Features by Freehand + + + + + Select Features by Radius + + + + + Deselect Features from All Layers + + + + + Identify Features + + + + + Ctrl+Shift+I + + + + + Measure Line + + + + + + Ctrl+Shift+M + + + + + Measure Area + + + + + Ctrl+Shift+J + + + + + Measure Angle + + + + + Zoom Full + + + + + Ctrl+Shift+F + + + + + Zoom to Layer + + + + + Zoom to Selection + + + + + Ctrl+J + + + + + Zoom Last + + + + + Zoom Next + + + + + Zoom Actual Size + + + + + Zoom to Native Pixel Resolution + + + + + Map Tips + + + + + Show information about a feature when the mouse is hovered over it + + + + + New Bookmark... + + + + + Ctrl+B + + + + + Show Bookmarks + + + + + Ctrl+Shift+B + + + + + Refresh + + + + + Ctrl+R + + + + + Text Annotation + + + + + Form Annotation + + + + + Move Annotation + + + + + Labeling + + + + + Layer Labeling Options + + + + + New Shapefile Layer... + + + + + Ctrl+Shift+N + + + + + New SpatiaLite Layer ... + + + + + Ctrl+Shift+A + + + + + Raster calculator ... + + + + + Add Vector Layer... + + + + + Ctrl+Shift+V + + + + + Add Raster Layer... + + + + + Ctrl+Shift+R + + + + + Add PostGIS Layers... + + + + + Ctrl+Shift+D + + + + + Add SpatiaLite Layer... + + + + + Ctrl+Shift+L + + + + + Add MSSQL Spatial Layer... + + + + + Add WMS Layer... + + + + + Ctrl+Shift+W + + + + + Open Attribute Table + + + + + Toggle Editing + + + + + Toggles the editing state of the current layer + + + + + Save Edits + + + + + Save edits to current layer, but continue editing + + + + + Save As... + + + + + Save Selection as Vector File... + + + + + Remove Layer(s) + + + + + Ctrl+D + + + + + Set CRS of Layer(s) + + + + + Ctrl+Shift+C + + + + + Set Project CRS from Layer + + + + + Properties... + + + + + Query... + + + + + Add to Overview + + + + + Ctrl+Shift+O + + + + + Add All to Overview + + + + + Remove All from Overview + + + + + Show All Layers + + + + + Ctrl+Shift+U + + + + + Hide All Layers + + + + + Ctrl+Shift+H + + + + + Manage Plugins... + + + + + Toggle Full Screen Mode + + + + + Ctrl+F + + + + + Project Properties... + + + + + Ctrl+Shift+P + + + + + Options... + + + + + Custom CRS... + + + + + Configure shortcuts... + + + + + Local Histogram Stretch + + + + + Stretch histogram of active raster to view extents + + + + + Help Contents + + + + + F1 + + + + + API documentation + + + + + QGIS Home Page + + + + + Ctrl+H + + + + + Check QGIS Version + + + + + Check if your QGIS version is up to date (requires internet access) + + + + + About + + + + + QGIS Sponsors + + + + + + Move Label + + + + + Rotate Label + + + + + Rotate Label +Ctl (Cmd) increments by 15 deg. + + + + + Change Label + + + + + Style Manager... + + + + + Python Console + + + + + Full histogram stretch + + + + + Stretch Histogram to Full Dataset + + + + + Customization... + + + + + mActionCatchForCustomization + + + + + This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization + + + + + Ctrl+M + + + + + Embed Layers and Groups... + + + + + Embed layers and groups from other project files + + + + + &Copyright Label + + + + + Creates a copyright label that is displayed on the map canvas. + + + + + &North Arrow + + + + + "Creates a north arrow that is displayed on the map canvas" + + + + + &Scale Bar + + + + + + Creates a scale bar that is displayed on the map canvas + + + + + Add WFS Layer... + + + + + Add WFS Layer + + + + + Feature Action + + + + + Run Feature Action + + + + + + Pan Map to Selection + + + + + + Touch zoom and pan + + + + + Offset Curve + + + + + Copy style + + + + + Paste style + + + + + Add WCS Layer... + + + + + &Grid + + + + + Grid + + + + + Pin/Unpin Labels + + + + + Pin/Unpin Labels +Click or marquee on label to pin +Shift unpins, Ctl (Cmd) toggles state +Acts on all editable layers + + + + + + Highlight Pinned Labels + + + + + + New Blank Project + + + + + Local Cumulative Cut Stretch + + + + + Local cumulative cut stretch using current extent, default limits and estimated values. + + + + + Full Dataset Cumulative Cut Stretch + + + + + Cumulative cut stretch using full dataset extent, default limits and estimated values. + + + + + Show/Hide Labels + + + + + Show/Hide Labels +Click or marquee on feature to show label +Shift+click or marquee on label to hide it +Acts on currently active editable layer + + + + + + Html Annotation + + + + + + Duplicate Layer(s) + + + + + SVG annotation + + + + + OracleConnectGuiBase + + + Create Oracle Connection + + + + + Name + + + + + Name of the new connection + + + + + Database instance + + + + + Username + + + + + Password + + + + + Save Password + + + + + OsmAddRelationDlg + + + Create OSM relation + + + + + Relation type: + + + + + Show type description + + + + + + Shows brief description of selected relation type. + + + + + + + + + ... + + + + + Properties + + + + + Generate tags + + + + + + Fills tag table with tags that are typical for relation of specified type. + + + + + Remove all selected tags + + + + + + Removes all selected tags. + + + + + Members + + + + + Select member on map + + + + + + Starts process of selecting next relation member on map. + + + + + Remove all selected members + + + + + + Removes all selected members. + + + + + Create + + + + + Cancel + + + + Save + + + + Edit OSM relation + + + + for grouping boundaries and marking enclaves / exclaves + + + + to put holes into areas (might have to be renamed, see article) + + + + any kind of turn restriction + + + + like bus routes, cycle routes and numbered highways + + + + traffic enforcement devices; speed cameras, redlight cameras, weight checks, ... + + + + OSM Information + + + + + OsmDownloadDlg + + + Download OSM data + + + + + Extent + + + + + Latitude: + + + + + + From + + + + + + To + + + + + Longitude: + + + + + <nothing> + + + + + + ... + + + + + Download to: + + + + + Open data automatically after download + + + + + Replace current data (current layer will be removed) + + + + + Use custom renderer + + + + + Download + + + + + Cancel + + + + OSM Download + + + + Unable to save the file %1: %2. + + + + Waiting for OpenStreetMap server ... + + + + Download process failed. OpenStreetMap server response: %1 - %2 + + + + Check your internet connection + + + + OSM Download Error + + + + Download failed: %1. + + + + Choose file to save + + + + OSM Files (*.osm) + + + + Getting data + + + + The OpenStreetMap server you are downloading OSM data from (~ api.openstreetmap.org) has fixed limitations of how much data you can get. As written at <http://wiki.openstreetmap.org/wiki/Getting_Data> neither latitude nor longitude extent of downloaded region can be larger than 0.25 degrees. Note that Quantum GIS allows you to specify any extent you want, but OpenStreetMap server will reject all request that won't satisfy downloading limitations. + + + + Both extents are too large! + + + + Latitude extent is too large! + + + + Longitude extent is too large! + + + + OK! Area is probably acceptable to server. + + + + + OsmFeatureDW + + + OSM Feature + + + + + + + + + + + + + + + + + + + ... + + + + + + + Identify feature + + + + + + + Move feature + + + + + Create point + + + + + Create line + + + + + Create polygon + + + + + Create relation + + + + + + + Undo + + + + + + + Redo + + + + + + + Show/Hide OSM Edit History + + + + + Feature: + + + + + TYPE, ID: + + + + + CREATED: + + + + + USER: + + + + + + + unknown + + + + + + + Remove this feature + + + + + Properties + + + + + + + Remove selected tags + + + + + Relations + + + + + + + Add relation + + + + + + + Edit relation + + + + + + + Remove relation + + + + + Relation tags: + + + + + 1 + + + + + Relation members: + + + + OSM Plugin + + + + The 'Create OSM Relation' dialog was closed automatically because current OSM database was changed. + + + + OSM Feature Dock Widget + + + + Choose OSM feature first. + + + + Choose relation for editing first. + + + + Snapping ON. Hold Ctrl to disable it. + + + + Hide OSM Edit History + + + + Show OSM Edit History + + + + + OsmImportDlg + + + Import data to OSM + + + + + In this dialog you can import a layer loaded in QGIS into active OSM data. + + + + + Layer + + + + + Import only current selection + + + + Layer doesn't exist + + + + The selected layer doesn't exist anymore! + + + + Importing features... + + + + Cancel + + + + Import + + + + Import has been completed. + + + + + OsmLoadDlg + + + Load OSM + + + + + OpenStreetMap file to load: + + + + + ... + + + + + Add columns for tags: + + + + + Use custom renderer + + + + + Replace current data (current layers will be removed) + + + + Choose an Open Street Map file + + + + OSM Files (*.osm) + + + + OSM Load + + + + Please enter path to OSM data file. + + + + Path to OSM file is invalid: %1. + + + + Error + + + + Layers of OSM file "%1" are loaded already. + + + + Failed to load polygon layer. + + + + Failed to load line layer. + + + + Failed to load point layer. + + + + Could not connect to setRenderer signal. + + + + Failed to load layers: %1 + + + + + OsmPlugin + + Load OSM from file + + + + Load OpenStreetMap from file + + + + Import data from a layer + + + + Import data from a layer to OpenStreetMap + + + + Save OSM to file + + + + Save OpenStreetMap to file + + + + Download OSM data + + + + Download OpenStreetMap data + + + + Upload OSM data + + + + Upload OpenStreetMap data + + + + Show/Hide OSM Feature Manager + + + + Show/Hide OpenStreetMap Feature Manager + + + + Sorry + + + + You don't have OSM provider installed! + + + + OSM Save to file + + + + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. +Please change this situation first, because OSM Plugin doesn't know what to save. + + + + OSM Upload + + + + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. +Please change this situation first, because OSM Plugin doesn't know what to upload. + + + + OSM Import + + + + No OSM data are loaded/downloaded or no OSM layer is selected in Layers panel. +Please change this situation first, because OSM Plugin doesn't know what layer will be destination of the import. + + + + There are currently no available vector layers. + + + + + OsmSaveDlg + + + Save OSM + + + + + Where to save: + + + + + ... + + + + + Features to save: + + + + + Points + + + + + Lines + + + + + Polygons + + + + + Relations + + + + + Tags + + + + Choose an Open Street Map file + + + + OSM Files (*.osm) + + + + Save OSM to file + + + + Unable to save the file %1: %2. + + + + Initializing... + + + + Saving nodes... + + + + Saving lines... + + + + Saving polygons... + + + + Saving relations... + + + + + OsmUndoRedoDW + + + OSM Edit History + + + + + + + Clear all + + + + + + + ... + + + + + + + Undo + + + + + + + Redo + + + + + OsmUploadDlg + + + Upload OSM data + + + + + Ready for upload + + + + + 1 + + + + + 2 + + + + + 3 + + + + + 4 + + + + + 5 + + + + + Comment on your changes: + + + + + OSM account + + + + + Username: + + + + + Password: + + + + + Show password + + + + + Save password + + + + Upload + + + + OSM Upload + + + + Uploading data... + + + + Node addition failed. + + + + Node update failed. + + + + Node deletion failed. + + + + Way addition failed. + + + + Way update failed. + + + + Way deletion failed. + + + + Relation addition failed. + + + + Relation update failed. + + + + Relation deletion failed. + + + + Connection to OpenStreetMap server cannot be established. Please check your proxy settings, firewall settings and try again. + + + + Changeset closing failed. + + + + Upload process failed. OpenStreetMap server response: %1 - %2. + + + + Authentication failed. Please try again with correct login and password. + + + + Setting host failed. + + + + Setting user and password failed. + + + + Setting proxy failed. + + + + + PointsInPolygonThread + + point count field + + + + + Python + + An error has occured while executing Python code: + + + + Python version: + + + + QGIS version: + + + + Python path: + + + + Python error + + + + Couldn't load plugin '%1' from ['%2'] + + + + Couldn't load plugin %1 + + + + %1 due an error when calling its classFactory() method + + + + %1 due an error when calling its initGui() method + + + + Error while unloading plugin %1 + + + + + PythonConsole + + Python Console + + + + Clear console + + + + Settings + + + + Import Class + + + + Manage Script + + + + Import Sextante class + + + + Import QgisInterface class + + + + Import PyQt.QtCore class + + + + Import PyQt.QtGui class + + + + Open script file + + + + Save to script file + + + + Run command + + + + Help + + + + + QGis::UnitType + + + meters + + + + + feet + + + + + + + + degrees + + + + + <unknown> + + + + + QObject + + + Interpolating... + + + + + + Abort + + + + + Building triangulation... + + + + + Estimating normal derivatives... + + + + + QGIS starting in non-interactive mode not supported. +You are seeing this message most likely because you have no DISPLAY environment variable set. + + + + + + Deleted vertices + + + + + Moved vertices + + + + + CRS undefined - defaulting to project CRS + + + + + CRS undefined - defaulting to default CRS: %1 + + + + + Reading raster + + + + + No active vector layer + + + + + To select features, you must choose a vector layer by clicking on its name in the legend + + + + + + CRS Exception + + + + + + Selection extends beyond layer's coordinate system. + + + + + Python is not enabled in QGIS. + + + + + + + + + + + + + + + Plugins + + + + + Loaded %1 (package: %2) + + + + + Library name is %1 + + + + + + + Failed to load %1 (Reason: %2) + + + + + Attempting to resolve the classFactory function + + + + + + Loaded %1 (Path: %2) + + + + + Error Loading Plugin + + + + + There was an error loading a plugin.The following diagnostic information may help the QGIS developers resolve the issue: +%1. + + + + + Unable to find the class factory for %1. + + + + + Plugin %1 did not return a valid type and cannot be loaded + + + + + + Python error + + + + + Error when reading metadata of plugin %1 + + + + + Could not open CRS database %1 +Error(%2): %3 + + + + + + CRS + + + + + Generated CRS + A CRS automatically generated from layer info get this prefix for description + + + + + Saved user CRS [%1] + + + + + Imported from GDAL + + + + + Can't open database: %1 + + + + + + Caught a coordinate system exception while trying to transform a point. Unable to calculate line length. + + + + + Caught a coordinate system exception while trying to transform a point. Unable to calculate polygon area or perimeter. + + + + + Caught a coordinate system exception while trying to transform a point. Unable to calculate polygon area. + + + + + + m² + + + + + km² + + + + + ha + + + + + + m + + + + + km + + + + + mm + + + + + cm + + + + + sq ft + + + + + acres + + + + + sq mile + + + + + foot + + + + + feet + + + + + mile + + + + + sq.deg. + + + + + degree + + + + + degrees + + + + + unknown + + + + + day + Note: Word is part matched in code + + + + + days + Note: Word is part matched in code + + + + + week + Note: Word is part matched in code + + + + + weeks + Note: Word is part matched in code + + + + + month + Note: Word is part matched in code + + + + + months + Note: Word is part matched in code + + + + + year + Note: Word is part matched in code + + + + + years + Note: Word is part matched in code + + + + + second + Note: Word is part matched in code + + + + + seconds + Note: Word is part matched in code + + + + + minute + Note: Word is part matched in code + + + + + minutes + Note: Word is part matched in code + + + + + hour + Note: Word is part matched in code + + + + + hours + Note: Word is part matched in code + + + + + Cannot convert '%1' to double + + + + + Cannot convert '%1' to int + + + + + Cannot convert '%1' to DateTime + + + + + Cannot convert '%1' to Date + + + + + Cannot convert '%1' to Time + + + + + Cannot convert '%1' to Interval + + + + + Cannot convert '%1' to boolean + + + + + Invalid regular expression '%1': %2 + + + + + Index is out of range + + + + + + + + + + + + + + + + + Math + + + + + + + + + + + Conversions + + + + + Conditionals + + + + + + + + + + + + + Date and Time + + + + + + + + + + + + + + + + + + + String + + + + + + + + + + + Geometry + + + + + + + + Record + + + + + Special + + + + + + No root node! Parsing failed? + + + + + (no root) + + + + + Unary minus only for numeric values. + + + + + Can't preform /, *, or % on DateTime and Interval + + + + + [unsupported type;%1; value:%2] + + + + + Column '%1' not found + + + + + + + + + + + + + + + + + + + + + + + + + + Exception: %1 + + + + + + + + + + + + + + + + + + + + + + + + + + + GEOS + + + + + GEOS prior to 3.2 doesn't support GEOSInterpolate + + + + + segment %1 of ring %2 of polygon %3 intersects segment %4 of ring %5 of polygon %6 at %7 + + + + + ring %1 with less than four points + + + + + ring %1 not closed + + + + + line %1 with less than two points + + + + + line %1 contains %n duplicate node(s) at %2 + number of duplicate nodes + + + + + + + + segments %1 and %2 of line %3 intersect at %4 + + + + + ring %1 of polygon %2 not in exterior ring + + + + + GEOS error:could not produce geometry for GEOS (check log window) + + + + + + GEOS error:%1 + + + + + + polygon %1 inside polygon %2 + + + + + Unknown geometry type + + + + + Unknown geometry type %1 + + + + + Geometry validation was aborted. + + + + + Geometry has %1 errors. + + + + + Geometry is valid. + + + + + invalid line + + + + + Label + + + + + Console + + + + + + infinite + + + + + + W + + + + + + E + + + + + + S + + + + + + N + + + + + No QGIS data provider plugins found in: +%1 + + + + + + No vector layers can be loaded. Check your QGIS installation + + + + + No Data Providers + + + + + No data provider plugins are available. No vector layers can be loaded + + + + + Unable to instantiate the data provider plugin %1 + + + + + Failed to load %1: %2 + + + + + OGR driver for '%1' not found (OGR error: %2) + + + + + trimming attribute name '%1' to ten significant characters produces duplicate column name. + + + + + creation of data source failed (OGR error:%1) + + + + + creation of layer failed (OGR error:%1) + + + + + + unsupported type for field %1 + + + + + creation of field %1 failed (OGR error: %2) + + + + + created field %1 not found (OGR error: %2) + + + + + Invalid variant type for field %1[%2]: received %3 with type %4 + + + + + + + + + + + + + + + + + OGR + + + + + + + Feature geometry not imported (OGR error: %1) + + + + + Feature creation error (OGR error: %1) + + + + + + Failed to transform a point while drawing a feature of type '%1'. Writing stopped. (Exception: %2) + + + + + + Feature write errors: + + + + + + Stopping after %1 errors + + + + + +Only %1 of %2 features written. + + + + + + Arc/Info ASCII Coverage + + + + + + Atlas BNA + + + + + + Comma Separated Value + + + + + ESRI Shapefile + + + + + + + FMEObjects Gateway + + + + + + GeoJSON + + + + + + GeoRSS + + + + + + Geography Markup Language [GML] + + + + + + Generic Mapping Tools [GMT] + + + + + + GPS eXchange Format [GPX] + + + + + + INTERLIS 1 + + + + + + INTERLIS 2 + + + + + + Keyhole Markup Language [KML] + + + + + Mapinfo TAB + + + + + Mapinfo MIF + + + + + + Microstation DGN + + + + + + S-57 Base file + + + + + + Spatial Data Transfer Standard [SDTS] + + + + + + SQLite + + + + + SpatiaLite + + + + + + AutoCAD DXF + + + + + + Geoconcept + + + + + + ESRI FileGDB + + + + + Unable to load %1 provider + + + + + Provider %1 has no createEmptyLayer method + + + + + Loading of layer failed + + + + + Creation error for features from #%1 to #%2. Provider errors was: +%3 + + + + + Vector import + + + + + Only %1 of %2 features written. + + + + + + + + Reading raster part %1 of %2 + + + + + Building pyramids failed - write access denied + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + + Building pyramids failed. + + + + + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. + + + + + + Building pyramid overviews is not supported on this type of raster. + + + + + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. + + + + + Multiband color + + + + + Paletted + + + + + Singleband gray + + + + + Singleband pseudocolor + + + + + Singleband color data + + + + + Single Symbol + + + + + Categorized + + + + + Graduated + + + + + Rule-based + + + + + Point displacement + + + + + Simple line + + + + + Marker line + + + + + Line decoration + + + + + Simple marker + + + + + SVG marker + + + + + Font marker + + + + + Ellipse marker + + + + + Vector Field marker + + + + + Simple fill + + + + + SVG fill + + + + + Centroid fill + + + + + Line pattern fill + + + + + Point pattern fill + + + + + Where is '%1' (original location: %2)? + + + + + QGIS rocks! + + + + + <html>QGIS rocks!</html> + + + + + Raster Histogram + + + + + Pixel Value + + + + + Frequency + + + + + Internal Compass + + + + + Shows a QtSensors compass reading + + + + + Version 0.9 + + + + + Coordinate Capture + + + + + Capture mouse coordinates in different CRS + + + + + + + + + Vector + + + + + + + + + + + + + + + + + Version 0.1 + + + + + + Version 0.2 + + + + + Loads and displays delimited text files containing x,y coordinates + + + + + + + Layers + + + + + Add Delimited Text Layer + + + + + Diagram Overlay (Legacy) + + + + + A plugin for placing diagrams on vector layers + + + + + Version 0.0.1 (Legacy) + + + + + Dxf2Shp Converter + + + + + Converts from dxf to shp file format + + + + + eVis + + + + + An event visualization tool - view images associated with vector features + + + + + + + + Database + + + + + Version 1.1.0 + + + + + + + + + + + + + + + + + + + + + + + + + + Warning + + + + + This tool only supports vector data + + + + + No active layers found + + + + + Georeferencer GDAL + + + + + Georeferencing rasters using GDAL + + + + + + + + + Raster + + + + + Version 3.1.9 + + + + + Fit to a linear transform requires at least 2 points. + + + + + Fit to a Helmert transform requires at least 2 points. + + + + + Fit to an affine transform requires at least 4 points. + + + + + Fitting a projective transform requires at least 4 corresponding points. + + + + + Globe + + + + + Overlay data on a 3D globe + + + + + GPS Tools + + + + + Tools for loading and importing GPS data + + + + + Location: %1 + + + + + + Location: %1<br>Mapset: %2 + + + + + <b>Raster</b> + + + + + Cannot open raster header + + + + + + Rows + + + + + + Columns + + + + + + N-S resolution + + + + + + E-W resolution + + + + + + + North + + + + + + + South + + + + + + + East + + + + + + + West + + + + + Format + + + + + Minimum value + + + + + Maximum value + + + + + Data source + + + + + Data description + + + + + Comments + + + + + Categories + + + + + + <b>Vector</b> + + + + + Points + + + + + Lines + + + + + Boundaries + + + + + Centroids + + + + + Faces + + + + + Kernels + + + + + Areas + + + + + Islands + + + + + + Top + + + + + + Bottom + + + + + yes + + + + + no + + + + + History<br> + + + + + <b>Layer</b> + + + + + Features + + + + + Driver + + + + + Table + + + + + Key column + + + + + <b>Region</b> + + + + + Cannot open region header + + + + + XY + + + + + UTM + + + + + SP + + + + + LL + + + + + Other + + + + + Projection Type + + + + + Zone + + + + + 3D Cols + + + + + 3D Rows + + + + + Depths + + + + + E-W 3D resolution + + + + + N-S 3D resolution + + + + + GRASS + + + + + GRASS layer + + + + + Heatmap + + + + + Creates a Heatmap raster for the input point vector + + + + + Interpolation plugin + + + + + A plugin for interpolation based on vertices of a vector layer + + + + + Version 0.001 + + + + + OfflineEditing + + + + + Allow offline editing and synchronizing with database + + + + + Oracle Spatial GeoRaster + + + + + Access Oracle Spatial GeoRaster + + + + + Raster Terrain Analysis plugin + + + + + A plugin for raster based terrain analysis + + + + + Road graph plugin + + + + + It solves the shortest path problem. + + + + + Processing 1/2 - %p% + + + + + Processing 2/2 - %p% + + + + + Intersects + + + + + Is disjoint + + + + + + + Touches + + + + + + Crosses + + + + + + Within + + + + + + Contains + + + + + Equals + + + + + Overlaps + + + + + Spatial Query Plugin + + + + + A plugin that makes spatial queries on vector layers + + + + + SPIT + + + + + Shapefile to PostgreSQL/PostGIS Import Tool + + + + + SQL Anywhere plugin + + + + + Store vector layers within a SQL Anywhere database + + + + + Zonal statistics plugin + + + + + A plugin to calculate count, sum, mean of rasters for each polygon of a vector layer + + + + + Cannot open GDAL MEM dataset %1: %2 + + + + + Cannot GDALCreateGenImgProjTransformer: + + + + + Cannot inittialize GDALWarpOperation : + + + + + Cannot ChunkAndWarpImage: %1 + + + + + [GDAL] All files (*) + + + + + + GDAL/OGR VSIFileHandler + + + + + This raster file has no bands and is invalid as a raster layer. + + + + + Cannot get GDAL raster band: %1 + + + + + Couldn't open the data source: %1 + + + + + Parse error at line %1 : %2 + + + + + GPS eXchange format provider + + + + + + GRASS plugin + + + + + QGIS couldn't find your GRASS installation. +Would you like to specify path (GISBASE) to your GRASS installation? + + + + + Choose GRASS installation path (GISBASE) + + + + + GRASS data won't be available if GISBASE is not specified. + + + + + GISBASE is not set. + + + + + %1 is not a GRASS mapset. + + + + + Cannot start %1/etc/lock + + + + + Mapset is already in use. + + + + + Temporary directory %1 exists but is not writable + + + + + Cannot create temporary directory %1 + + + + + Cannot create %1 + + + + + Cannot remove mapset lock: %1 + + + + + Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module). + + + + + Cannot open vector %1 in mapset %2 + + + + + Cannot read raster map region + + + + + Cannot read vector map region + + + + + Cannot read region + + + + + Cannot open GISRC file + + + + + Cannot start module + + + + + command: %1 %2 + + + + + Cannot run module + + + + + command: %1 %2<br>%3<br>%4 + + + + + Cannot get projection + + + + + + Cannot get raster extent + + + + + Cannot get map info + + + + + Cannot get colors + + + + + Cannot query raster + + + + + + + Cannot draw raster + + + + + Loading of the MSSQL provider failed + + + + + + Unsupported type for field %1 + + + + + + Creation of fields failed + + + + + OGR[%1] error %2: %3 + + + + + Unable to create the datasource. %1 exists and overwrite flag is false. + + + + + Unable to get driver %1 + + + + + Arc/Info Binary Coverage + + + + + DODS + + + + + + ESRI Personal GeoDatabase + + + + + ESRI ArcSDE + + + + + ESRI Shapefiles + + + + + Grass Vector + + + + + Informix DataBlade + + + + + Ingres + + + + + Mapinfo File + + + + + MySQL + + + + + MSSQL + + + + + Oracle Spatial + + + + + ODBC + + + + + OGDI Vectors + + + + + PostgreSQL + + + + + UK. NTF2 + + + + + U.S. Census TIGER/Line + + + + + VRT - Virtual Datasource + + + + + X-Plane/Flightgear + + + + + All files + + + + + Duplicate field (10 significant characters): %1 + + + + + Creating the data source %1 failed: %2 + + + + + Unknown vector type of %1 + + + + + Creation of OGR data source %1 failed: %2 + + + + + creation of field %1 failed + + + + + Couldn't create file %1.qpj + + + + + no result buffer + + + + + + + + Connection to database failed + + + + + Creation of data source %1 failed: +%2 + + + + + Loading of the layer %1 failed + + + + + + Unable to delete layer %1: +%2 + + + + + creation of data source %1 failed. %2 + + + + + loading of the layer %1 failed + + + + + creation of fields failed + + + + + Unable to initialize SpatialMetadata: + + + + + + Could not create a new database + + + + + + Unable to activate FOREIGN_KEY constraints [%1] + + + + + Unable to delete table %1: + + + + + + Couldn't load SIP module. + + + + + + + + Python support will be disabled. + + + + + Couldn't load PyQt4. + + + + + Couldn't load PyQGIS. + + + + + Couldn't load QGIS utils. + + + + + An error occured during execution of following code: + + + + + Python version: + + + + + QGIS version: + + + + + Python path: + + + + + QextSerialPort + + + No Error has occurred + + + + + Invalid file descriptor (port was not opened correctly) + + + + + Unable to allocate memory tables (POSIX) + + + + + Caught a non-blocked signal (POSIX) + + + + + Operation timed out (POSIX) + + + + + The file opened by the port is not a valid device + + + + + The port detected a break condition + + + + + The port detected a framing error (usually caused by incorrect baud rate settings) + + + + + There was an I/O error while communicating with the port + + + + + Character buffer overrun + + + + + Receive buffer overflow + + + + + The port detected a parity error in the received data + + + + + Transmit buffer overflow + + + + + General read operation failure + + + + + General write operation failure + + + + + Unknown error: %1 + + + + + QgisApp + + + &Raster + + + + + Quantum GIS + + + + + Multiple Instances of QgisApp + + + + + Multiple instances of Quantum GIS application object detected. +Please contact the developers. + + + + + + Checking database + + + + + Reading settings + + + + + Setting up the GUI + + + + + Map canvas. This is where raster and vector layers are displayed when added to the map + + + + + GPS Information + + + + + Log Messages + + + + + Quantum GIS - %1 ('%2') + + + + + QGIS starting... + + + + + Checking provider plugins + + + + + Starting Python + + + + + Restoring loaded plugins + + + + + Initializing file filters + + + + + Restoring window state + + + + + + QGIS Ready! + + + + + Minimize + + + + + Ctrl+M + Minimize Window + + + + + Minimizes the active window to the dock + + + + + Zoom + + + + + Toggles between a predefined size and the window size set by the user + + + + + Bring All to Front + + + + + Bring forward all open windows + + + + + + + + + + + Error + + + + + Failed to open Python console: + + + + + Panels + + + + + Toolbars + + + + + Window + + + + + &Database + + + + + Vect&or + + + + + &Web + + + + + Progress bar that displays the status of rendering layers and other time-intensive operations + + + + + Toggle extents and mouse position display + + + + + + Coordinate: + + + + + Current map coordinate + + + + + Shows the map coordinates at the current cursor position. The display is continuously updated as the mouse is moved. It also allows editing to set the canvas center to a given position. The format is lat,lon or east,north + + + + + Current map coordinate (lat,lon or east,north) + + + + + Scale + + + + + Current map scale + + + + + Displays the current map scale + + + + + Current map scale (formatted as x:y) + + + + + Stop map rendering + + + + + Render + + + + + When checked, the map layers are rendered in response to map navigation commands and other events. When not checked, no rendering is done. This allows you to add a large number of layers and symbolize them before rendering. + + + + + Toggle map rendering + + + + + This icon shows whether on the fly coordinate reference system transformation is enabled or not. Click the icon to bring up the project properties dialog to alter this behaviour. + + + + + CRS status - Click to open coordinate reference system dialog + + + + + Ready + + + + + Map overview canvas. This canvas can be used to display a locator map that shows the current extent of the map canvas. The current extent is shown as a red rectangle. Any layer on the map can be added to the overview canvas. + + + + + Overview + + + + + Map legend that displays all the layers currently on the map canvas. Click on the check box to turn a layer on or off. Double click on a layer in the legend to customize its appearance and set other properties. + + + + + Layers + + + + + Control rendering order + + + + + Map layer list that displays all layers in drawing order. + + + + + Layer order + + + + + [ERROR] Can not make qgis.db private copy + + + + + + + Private qgis.db + + + + + Could not open qgis.db + + + + + Migration of private qgis.db failed. +%1 + + + + + Update of view in private qgis.db failed. +%1 + + + + + + < Blank > + + + + + QGIS version + + + + + QGIS code revision + + + + + Compiled against Qt + + + + + Running against Qt + + + + + Compiled against GDAL/OGR + + + + + Running against GDAL/OGR + + + + + GEOS Version + + + + + PostgreSQL Client Version + + + + + + No support. + + + + + SpatiaLite Version + + + + + QWT Version + + + + + PROJ.4 Version + + + + + QScintilla2 Version + + + + + This copy of QGIS writes debugging output. + + + + + %1 doesn't have any layers + + + + + + + Invalid Data Source + + + + + %1 is not a valid or recognized data source + + + + + Select zip layers to add... + + + + + Vector + + + + + Select raster layers to add... + + + + + Raster + + + + + Select vector layers to add... + + + + + PostgreSQL + + + + + Cannot get PostgreSQL select dialog from provider. + + + + + %1 is an invalid layer - not loaded + + + + + + + + Invalid Layer + + + + + %1 is an invalid layer and cannot be loaded. + + + + + SpatiaLite + + + + + Cannot get SpatiaLite select dialog from provider. + + + + + MSSQL + + + + + Cannot get MSSQL select dialog from provider. + + + + + WMS + + + + + Cannot get WMS select dialog from provider. + + + + + WCS + + + + + Cannot get WCS select dialog from provider. + + + + + WFS + + + + + Cannot get WFS select dialog from provider. + + + + + Calculating... + + + + + + Abort... + + + + + Choose a QGIS project file to open + + + + + + + QGis files + + + + + Unable to open project + + + + + Security warning: + + + + + project macros have been disabled. + + + + + Enable macros + + + + + Choose a QGIS project file + + + + + + Saved project to: %1 + + + + + + Unable to save project %1 + + + + + Choose a file name to save the QGIS project file as + + + + + Unable to load %1 + + + + + Choose a file name to save the map image as + + + + + Saved map image to %1 + + + + + Labeling + + + + + Please select a vector layer first. + + + + + Layer labeling settings + + + + + Saving done + + + + + Export to vector file has been completed + + + + + Save error + + + + + Export to vector file failed. +Error: %1 + + + + + + No Layer Selected + + + + + To delete features, you must select a vector layer in the legend + + + + + No Vector Layer Selected + + + + + Deleting features only works on vector layers + + + + + Provider does not support deletion + + + + + Data provider does not support deleting features + + + + + + + Layer not editable + + + + + The current layer is not editable. Choose 'Start editing' in the digitizing toolbar. + + + + + Delete features + + + + + Delete %n feature(s)? + number of features to delete + + + + + + + + Features deleted + + + + + Problem deleting features + + + + + A problem occured during deletion of features + + + + + Merging features... + + + + + Abort + + + + + + Composer %1 + + + + + + No active layer + + + + + + No active layer found. Please select a layer in the layer list + + + + + + Active layer is not vector + + + + + + The merge features tool only works on vector layers. Please select a vector layer from the layer list + + + + + + Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing + + + + + + + Not enough features selected + + + + + + + The merge tool requires at least two selected features + + + + + Merged feature attributes + + + + + + Merge failed + + + + + + An error occured during the merge operation + + + + + Union operation canceled + + + + + + The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled + + + + + Merged features + + + + + Features cut + + + + + Features pasted + + + + + Cannot copy style: %1 + + + + + Cannot parse style: %1:%2:%3 + + + + + Cannot read style: %1 + + + + + + Could not commit changes to layer %1 + +Errors: %2 + + + + + + Start editing failed + + + + + Provider cannot be opened for editing + + + + + Stop editing + + + + + Do you want to save the changes to layer %1? + + + + + Problems during roll back + + + + + copy + + + + + Plugin layer + + + + + Memory layer + + + + + + Duplicate layer: + + + + + %1 (duplication resulted in invalid layer) + + + + + %1 (%2type unsupported) + + + + + Couldn't load Python support library: %1 + + + + + Couldn't resolve python support library's instance() symbol. + + + + + Python support ENABLED :-) + + + + + There is a new version of QGIS available + + + + + You are running a development version of QGIS + + + + + You are running the current version of QGIS + + + + + Would you like more information? + + + + + + + + QGIS Version Information + + + + + QGIS - Changes since last release + + + + + Unable to get current version information from server + + + + + Connection refused - server may be down + + + + + QGIS server was not found + + + + + Unknown network socket error: %1 + + + + + Unable to communicate with QGIS Version server +%1 + + + + + + To perform a full histogram stretch, you need to have a raster layer selected. + + + + + No Raster Layer Selected + + + + + + Layer is not valid + + + + + The layer %1 is not a valid layer and can not be added to the map + + + + + The layer is not a valid layer and can not be added to the map + + + + + Save? + + + + + Do you want to save the current project? + + + + + Current CRS: %1 (OTFR enabled) + + + + + Current CRS: %1 (OTFR disabled) + + + + + Map coordinates for the current view extents + + + + + Map coordinates at mouse cursor position + + + + + Extents: + + + + + Maptips require an active layer + + + + + %n feature(s) selected on layer %1. + number of selected features + + + + + + + + Open a GDAL Supported Raster Data Source + + + + + %1 is not a valid or recognized raster data source + + + + + %1 is not a supported raster data source + + + + + Unsupported Data Source + + + + + <p>This project file was saved by an older version of QGIS. When saving this project file, QGIS will update it to the latest version, possibly rendering it useless for older versions of QGIS.<p>Even though QGIS developers try to maintain backwards compatibility, some of the information from the old project file might be lost. To improve the quality of QGIS, we appreciate if you file a bug report at %3. Be sure to include the old project file, and state the version of QGIS you used to discover the error.<p>To remove this warning when opening an older project file, uncheck the box '%5' in the %4 menu.<p>Version of the project file: %1<br>Current version of QGIS: %2 + + + + + <tt>Settings:Options:General</tt> + Menu path to setting options + + + + + Warn me when opening a project file saved with an older version of QGIS + + + + + Project file is older + + + + + This project file was saved by an older version of QGIS + + + + + Warning + + + + + This layer doesn't have a properties dialog. + + + + + Authentication required + + + + + Proxy authentication required + + + + + SSL errors occured accessing URL %1: + + + + + + +Always ignore these errors? + + + + + %n SSL errors occured + number of errors + + + + + + + + QgisAppInterface + + + Attributes changed + + + + + QgsAbout + + + About Quantum GIS + + + + + About + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:16px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:x-large; font-weight:600;"><span style=" font-size:x-large;">Quantum GIS (QGIS)</span></p></body></html> + + + + + Quantum GIS is licensed under the GNU General Public License + + + + + http://www.gnu.org/licenses + + + + + QGIS Home Page + + + + + Join our user mailing list + + + + + What's New + + + + + Providers + + + + + Developers + + + + + Essen (Germany), Developer meeting 2012 + + + + + Contributors + + + + + Translators + + + + + about:blank + + + + + Donors + + + + + <p>For a list of individuals and institutions who have contributed money to fund QGIS development and other project costs see <a href="http://qgis.org/en/sponsorship/donors.html">http://qgis.org/en/sponsorship/donors.html</a></p> + + + + + Available QGIS Data Provider Plugins + + + + + Available Qt Database Plugins + + + + + Available Qt Image Plugins + + + + + Qt Image Plugin Search Paths <br> + + + + + QgsAddAttrDialog + + + Warning + + + + + Invalid field name. This field name is reserved and cannot be used. + + + + + QgsAddAttrDialogBase + + + Add column + + + + + N&ame + + + + + Comment + + + + + + Type + + + + + Width + + + + + Precision + + + + + QgsAddJoinDialogBase + + + Add vector join + + + + + Join layer + + + + + Join field + + + + + Target field + + + + + Create attribute index on join field + + + + + Cache join layer in virtual memory + + + + + QgsAddTabOrGroup + + + Add tab or group for %1 + + + + + QgsAddTabOrGroupBase + + + Dialog + + + + + Create category + + + + + as + + + + + a tab + + + + + a group in container + + + + + QgsAnnotationWidget + + + Select frame color + + + + + QgsAnnotationWidgetBase + + + Form + + + + + Fixed map position + + + + + Map marker + + + + + Frame width + + + + + Frame color + + + + + QgsApplication + + + + + Exception + + + + + unknown exception + + + + + Application state: +QGIS_PREFIX_PATH env var: %1 +Prefix: %2 +Plugin Path: %3 +Package Data Path: %4 +Active Theme Name: %5 +Active Theme Path: %6 +Default Theme Path: %7 +SVG Search Paths: %8 +User DB Path: %9 + + + + + + + + match indentation of application state + + + + + QgsAtlasCompositionWidget + + + + Map %1 + + + + + Expression based filename + + + + + QgsAtlasCompositionWidgetBase + + + Atlas generation + + + + + Atlas options + + + + + Hide the coverage layer when generating the output + + + + + Hidden coverage layer + + + + + Margin around coverage + + + + + Output filename expression + + + + + % + + + + + ... + + + + + Coverage layer + + + + + Fixed scale + + + + + Single file export when possible + + + + + Composer map to use + + + + + Generate an atlas + + + + + QgsAttributeActionDialog + + + Select an action + File dialog window title + + + + + Insert expression + + + + + Missing Information + + + + + To create an attribute action, you must provide both a name and the action to perform. + + + + + Echo attribute's value + + + + + Run an application + + + + + Get feature id + + + + + Selected field's value (Identify features tool) + + + + + Clicked coordinates (Run feature actions tool) + + + + + Open file + + + + + Search on web based on attribute's value + + + + + QgsAttributeActionDialogBase + + + Attribute Actions + + + + + Action list + + + + + This list contains all actions that have been defined for the current layer. Add actions by entering the details in the controls below and then pressing the Add to action list button. Actions can be edited here by double clicking on the item. + + + + + + + Type + + + + + + Name + + + + + + Action + + + + + Capture + + + + + Remove the selected action + + + + + Remove action + + + + + Move the selected action up + + + + + Move up + + + + + Move the selected action down + + + + + Move down + + + + + Add default actions + + + + + Action properties + + + + + Generic + + + + + Python + + + + + Mac + + + + + Windows + + + + + Unix + + + + + Open + + + + + Captures any output from the action + + + + + Captures the standard output or error generated by the action and displays it in a dialog box + + + + + Capture output + + + + + + Enter the name of an action here. The name should be unique (qgis will make it unique if necessary). + + + + + Enter the action name here + + + + + Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters that start with a % and then have the name of a field will be replaced by the value of that field. The special characters %% will be replaced by the value of the field that was selected. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash + + + + + Enter the action command here + + + + + Enter the action here. This can be any program, script or command that is available on your system. When the action is invoked any set of characters within [% and %] will be evaluated as expression and replaced by its result. Double quote marks group text into single arguments to the program, script or command. Double quotes will be ignored if prefixed with a backslash + + + + + Browse for action + + + + + Click to browse for an action + + + + + Clicking the button will let you select an application to use as the action + + + + + ... + + + + + Inserts an expression into the action + + + + + Insert expression... + + + + + The valid attribute names for this layer + + + + + Inserts the selected field into the action + + + + + Insert field + + + + + Inserts the action into the list above + + + + + Add to action list + + + + + Update the selected action + + + + + Update selected action + + + + + QgsAttributeDialog + + + Error + + + + + Error: %1 + + + + + Attributes - %1 + + + + + QgsAttributeEditor + + + Select a file + + + + + Select a date + + + + + (no selection) + + + + + ... + + + + + QgsAttributeLoadValues + + + Load values from layer + + + + + Layer + + + + + + Description + + + + + + Value + + + + + Select data from attributes in selected layer. + + + + + View All + + + + + QgsAttributeSelectionDialog + + + + + Ascending + + + + + + Descending + + + + + QgsAttributeSelectionDialogBase + + + Select attributes + + + + + Select all + + + + + Clear + + + + + Sorting + + + + + Column + + + + + Ascending + + + + + <b>Attribute</b> + + + + + <b>Alias</b> + + + + + QgsAttributeTableAction + + + Attributes changed + + + + + QgsAttributeTableDelegate + + + Attribute changed + + + + + QgsAttributeTableDialog + + + Attribute Table + + + + + Show selected only + + + + + Search selected only + + + + + Case sensitive + + + + + Opens the search query builder + + + + + Advanced search + + + + + ? + + + + + Close + + + + + Unselect all (Ctrl+U) + + + + + Ctrl+U + + + + + Move selection to top (Ctrl+T) + + + + + Ctrl+T + + + + + Invert selection (Ctrl+R) + + + + + Ctrl+S + + + + + Copy selected rows to clipboard (Ctrl+C) + + + + + Ctrl+C + + + + + Zoom map to the selected rows (Ctrl+J) + + + + + Ctrl+J + + + + + Pan map to the selected rows (Ctrl+P) + + + + + Ctrl+P + + + + + Toggle editing mode (Ctrl+E) + + + + + + Ctrl+E + + + + + Save Edits (Ctrl+S) + + + + + Delete selected features (Ctrl+D) + + + + + ... + + + + + Ctrl+D + + + + + New column (Ctrl+W) + + + + + Ctrl+W + + + + + Delete column (Ctrl+L) + + + + + Ctrl+L + + + + + Add feature + + + + + + + + + + + Open field calculator (Ctrl+I) + + + + + Ctrl+I + + + + + Look for + + + + + in + + + + + Looks for the given value in the given attribute column + + + + + &Search + + + + + Attribute table - %1 (%n Feature(s)) + feature count + + + + + + + + Attribute table - %1 :: %n / %2 feature(s) selected + feature count + + + + + + + + Parsing error + + + + + Evaluation error + + + + + Error during search + + + + + Attribute table - %1 (%n matching features) + matching features + + + + + + + + Attribute table - %1 (No matching features) + + + + + Attribute added + + + + + + Attribute Error + + + + + The attribute could not be added to the layer + + + + + Deleted attribute + + + + + The attribute(s) could not be deleted + + + + + Geometryless feature added + + + + + Run action + + + + + + Open form + + + + + Loading feature attributes... + + + + + Abort + + + + + Attribute table + + + + + %1 features loaded. + + + + + QgsAttributeTableModel + + + feature id + + + + + QgsAttributeTypeDialog + + + + Attribute Edit Dialog + + + + + Simple edit box. This is the default editation widget. + + + + + Displays combo box containing values of attribute used for classification. + + + + + Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box. + + + + + Minimum + + + + + Maximum + + + + + Step + + + + + Local minimum/maximum = 0/0 + + + + + The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used. + + + + + + + Editable + + + + + Simplifies file selection by adding a file chooser dialog. + + + + + Combo box with predefined items. Value is stored in the attribute, description is shown in the combo box. + + + + + Load Data from layer + + + + + Value + + + + + Description + + + + + Remove Selected + + + + + Load Data from CSV file + + + + + Combo box with values that can be used within the column's type. Must be supported by the provider. + + + + + An immutable attribute is read-only - the user is not able to modify the contents. + + + + + A hidden attribute will be invisible - the user is not able to see it's contents. + + + + + Representation for checked state + + + + + Representation for unchecked state + + + + + A text edit field that accepts multiple lines will be used. + + + + + A calendar widget to enter a date. + + + + + Layer + + + + + Key column + + + + + Select layer, key column and value column + + + + + Allow null value + + + + + Order by value + + + + + Allow multiple selections + + + + + Value column + + + + + Filter column + + + + + Filter value + + + + + Read-only field that generates a UUID if empty. + + + + + Line edit + + + + + Classification + + + + + Range + + + + + Unique values + + + + + File name + + + + + Value map + + + + + Enumeration + + + + + Immutable + + + + + Hidden + + + + + Checkbox + + + + + Text edit + + + + + Calendar + + + + + Value relation + + + + + UUID generator + + + + + Select a file + + + + + Error + + + + + Could not open file %1 +Error was:%2 + + + + + + Slider + + + + + Dial + + + + + + Current minimum for this value is %1 and current maximum is %2. + + + + + Attribute has no integer or real type, therefore range is not usable. + + + + + Enumeration is not available for this attribute + + + + + No filter + + + + + QgsBookmarks + + + &Add + + + + + &Delete + + + + + &Zoom to + + + + + + Error + + + + + Unable to open bookmarks database. +Database: %1 +Driver: %2 +Database: %3 + + + + + Name + + + + + Project + + + + + xMin + + + + + yMin + + + + + xMax + + + + + yMax + + + + + SRID + + + + + New bookmark + + + + + Unable to create the bookmark. +Driver:%1 +Database:%2 + + + + + Really Delete? + + + + + Are you sure you want to delete %n bookmark(s)? + number of rows + + + + + + + + Empty extent + + + + + Reprojected extent is empty. + + + + + QgsBookmarksBase + + + Geospatial Bookmarks + + + + + QgsBrowser + + + WMS + + + + + Cannot get WMS select dialog from provider. + + + + + CRS + + + + + Cannot set layer CRS + + + + + QgsBrowserBase + + + QGIS Browser + + + + + Param + + + + + Metadata + + + + + Preview + + + + + Stop rendering + + + + + Attributes + + + + + toolBar + + + + + New Shapefile + + + + + Ctrl+Shift+N + + + + + Refresh + + + + + Ctrl+R + + + + + + Set layer CRS + + + + + Manage WMS + + + + + Manage WMS Connections + + + + + Ctrl+Shift+W + + + + + QgsBrowserDirectoryPropertiesBase + + + Dialog + + + + + Path + + + + + QgsBrowserDockWidget + + + Browser + + + + + Filter Pattern Syntax + + + + + Wildcard(s) + + + + + Regular Expression + + + + + Add as a favourite + + + + + Remove favourite + + + + + + Properties + + + + + Add Layer + + + + + Add Selected Layers + + + + + Add a directory + + + + + Add directory to favourites + + + + + Error + + + + + Layer Properties + + + + + Directory Properties + + + + + QgsBrowserDockWidgetBase + + + Browser + + + + + + Refresh + + + + + Add Selected Layers + + + + + Add + + + + + Filter Files + + + + + + ... + + + + + Collapse All + + + + + Options + + + + + Filter files + + + + + QgsBrowserLayerPropertiesBase + + + Dialog + + + + + Display Name + + + + + Layer Source + + + + + Provider + + + + + Metadata + + + + + QgsBrowserModel + + + Home + + + + + Favourites + + + + + QgsBrushStyleComboBox + + + Solid + + + + + No Brush + + + + + Horizontal + + + + + Vertical + + + + + Cross + + + + + BDiagonal + + + + + FDiagonal + + + + + Diagonal X + + + + + Dense 1 + + + + + Dense 2 + + + + + Dense 3 + + + + + Dense 4 + + + + + Dense 5 + + + + + Dense 6 + + + + + Dense 7 + + + + + QgsCategorizedSymbolRendererV2Widget + + + Column + + + + + + + Symbol + + + + + change + + + + + Color ramp + + + + + Classify + + + + + Add + + + + + Delete + + + + + Delete all + + + + + Join + + + + + Advanced + + + + + + Value + + + + + + Label + + + + + Symbol levels... + + + + + + Error + + + + + There are no available color ramps. You can add them in Style Manager. + + + + + The selected color ramp is not available. + + + + + Confirm Delete + + + + + The classification field was changed from '%1' to '%2'. +Should the existing classes be deleted before classification? + + + + + QgsColorRampComboBox + + + New color ramp... + + + + + QgsCompassPlugin + + + Show compass + + + + + &About + + + + + QgsCompassPluginGui + + + Pixmap not found + + + + + QgsCompassPluginGuiBase + + + Internal Compass + + + + + Azimut + + + + + QgsComposer + + + QGIS + + + + + File + + + + + View + + + + + Panels + + + + + Toolbars + + + + + Layout + + + + + Composition + + + + + Item Properties + + + + + Command history + + + + + Atlas generation + + + + + + Choose a file name to save the map as + + + + + PDF Format + + + + + + + Empty filename pattern + + + + + + + The filename pattern is empty. A default one will be used. + + + + + Directory where to save PDF files + + + + + + + Unable to write into the directory + + + + + + + The given output directory is not writeable. Cancelling. + + + + + + + + Rendering maps... + + + + + + + + Abort + + + + + + + + Atlas processing error + + + + + Big image + + + + + To create image %1x%2 requires about %3 MB of memory. Proceed? + + + + + Choose a file name to save the map image as + + + + + Directory where to save image files + + + + + Image format: + + + + + SVG warning + + + + + + Don't show this message again + + + + + <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the + + + + + Qt4 svg code. In particular, there are problems with layers not being clipped to the map bounding box.</p> + + + + + If you require a vector-based output file from Qgis it is suggested that you try printing to PostScript if the SVG output is not satisfactory.</p> + + + + + SVG Format + + + + + Directory where to save SVG files + + + + + Save template + + + + + Composer templates + + + + + Save error + + + + + Error, could not save file + + + + + Load template + + + + + Read error + + + + + Error, could not read file + + + + + Composer + + + + + Project contains WMS layers + + + + + Some WMS servers (e.g. UMN mapserver) have a limit for the WIDTH and HEIGHT parameter. Printing layers from such servers may exceed this limit. If this is the case, the WMS layer will not be printed + + + + + QgsComposerArrowWidget + + + General options + + + + + Arrow outline width + + + + + Arrowhead width + + + + + Arrow color + + + + + Arrow color changed + + + + + + + Arrow marker changed + + + + + + Arrow start marker + + + + + + Arrow end marker + + + + + Start marker svg file + + + + + End marker svg file + + + + + QgsComposerArrowWidgetBase + + + Form + + + + + Arrow + + + + + Arrow color... + + + + + Line width + + + + + Arrow head width + + + + + Arrow markers + + + + + Start marker + + + + + + ... + + + + + SVG markers + + + + + End marker + + + + + No marker + + + + + Default marker + + + + + QgsComposerBase + + + MainWindow + + + + + Toolbar + + + + + &Print... + + + + + Zoom Full + + + + + Zoom In + + + + + Zoom Out + + + + + Add Map + + + + + Add new map + + + + + Add Label + + + + + Add new label + + + + + Add Legend + + + + + Add new legend + + + + + Move Item + + + + + Select/Move item + + + + + Export as Image... + + + + + Export as PDF... + + + + + Export as SVG... + + + + + Add Scalebar + + + + + Add new scalebar + + + + + Refresh + + + + + Refresh view + + + + + Add Image + + + + + Move Content + + + + + Move item content + + + + + Group + + + + + Group items + + + + + Ungroup + + + + + Ungroup items + + + + + Raise + + + + + Raise selected items + + + + + Lower + + + + + Lower selected items + + + + + Bring to Front + + + + + Move selected items to top + + + + + Send to Back + + + + + Move selected items to bottom + + + + + Load From template + + + + + Save as template + + + + + Align left + + + + + Align selected items left + + + + + Align center + + + + + Align center horizontal + + + + + Align right + + + + + Align selected items right + + + + + Align top + + + + + Align selected items to top + + + + + + Align center vertical + + + + + Align bottom + + + + + Align selected items bottom + + + + + &Quit + + + + + Quit + + + + + Ctrl+Q + + + + + Add arrow + + + + + Add table + + + + + Adds attribute table + + + + + Page Setup + + + + + Undo + + + + + Revert last change + + + + + Ctrl+Z + + + + + Redo + + + + + Restore last change + + + + + Ctrl+Shift+Z + + + + + + Add Rectangle + + + + + + Add Triangle + + + + + + Add Ellipse + + + + + Add html + + + + + Add html frame + + + + + QgsComposerHtmlWidget + + + Use existing frames + + + + + Extend to next page + + + + + Repeat on every page + + + + + Repeat until finished + + + + + General options + + + + + Change html url + + + + + Select HTML document + + + + + Change resize mode + + + + + QgsComposerHtmlWidgetBase + + + Form + + + + + HTML + + + + + ... + + + + + URL + + + + + Resize mode + + + + + QgsComposerItem + + + Change item position + + + + + QgsComposerItemWidget + + + Frame color changed + + + + + Background color changed + + + + + Item opacity changed + + + + + Item outline width + + + + + Item frame toggled + + + + + Item position changed + + + + + Item id changed + + + + + QgsComposerItemWidgetBase + + + Form + + + + + Frame color... + + + + + Background color... + + + + + Opacity + + + + + Outline width + + + + + Position and size... + + + + + Show frame + + + + + Item ID + + + + + QgsComposerLabelWidget + + + General options + + + + + Label text changed + + + + + + Label font changed + + + + + Label margin changed + + + + + + Insert expression + + + + + + + + + + Label alignment changed + + + + + Label id changed + + + + + Label rotation changed + + + + + QgsComposerLabelWidgetBase + + + Label Options + + + + + Label + + + + + Font color... + + + + + Horizontal Alignment: + + + + + Left + + + + + Center + + + + + Right + + + + + Vertical Alignment: + + + + + Top + + + + + Middle + + + + + Bottom + + + + + Margin + + + + + mm + + + + + Rotation + + + + + Font + + + + + Insert an expression + + + + + QgsComposerLegend + + + Legend + + + + + QgsComposerLegendItemDialogBase + + + Legend item properties + + + + + Item text + + + + + QgsComposerLegendLayersDialogBase + + + Add layer to legend + + + + + QgsComposerLegendWidget + + + General Options + + + + + Item wrapping changed + + + + + Legend title changed + + + + + Legend symbol width + + + + + Legend symbol height + + + + + Legend group space + + + + + Legend layer space + + + + + Legend symbol space + + + + + Legend icon label space + + + + + Title font changed + + + + + Legend group font changed + + + + + Legend layer font changed + + + + + Legend item font changed + + + + + Legend box space + + + + + Legend map changed + + + + + Legend item edited + + + + + + + Legend updated + + + + + Legend group added + + + + + Map %1 + + + + + None + + + + + QgsComposerLegendWidgetBase + + + Barscale Options + + + + + General + + + + + Title Font... + + + + + Group Font... + + + + + Layer Font... + + + + + Item Font... + + + + + Symbol width + + + + + + + + + + + mm + + + + + Symbol height + + + + + Layer space + + + + + Symbol space + + + + + Icon label space + + + + + Box space + + + + + Map + + + + + &Title + + + + + Group Space + + + + + Wrap text on + + + + + Legend items + + + + + Auto Update + + + + + Update + + + + + All + + + + + Add group + + + + + Show feature count for each class of vector layer. + + + + + QgsComposerManager + + + &Show + + + + + &Remove + + + + + Re&name + + + + + Empty composer + + + + + Remove composer + + + + + Do you really want to remove the map composer '%1'? + + + + + Change title + + + + + Title + + + + + QgsComposerManagerBase + + + Composer manager + + + + + Add + + + + + QgsComposerMap + + + + Map %1 + + + + + Map will be printed here + + + + + QgsComposerMapWidget + + + General options + + + + + + + Cache + + + + + + + Render + + + + + + + Rectangle + + + + + + Solid + + + + + + + Cross + + + + + Decimal + + + + + DegreeMinute + + + + + DegreeMinuteSecond + + + + + + No frame + + + + + + + Zebra + + + + + Change item width + + + + + Change item height + + + + + Map scale changed + + + + + Map rotation changed + + + + + + Map extent changed + + + + + Canvas items toggled + + + + + + + None + + + + + Grid checkbox toggled + + + + + + Grid interval changed + + + + + + Grid offset changed + + + + + + Grid pen changed + + + + + Grid type changed + + + + + Grid cross width changed + + + + + Annotation font changed + + + + + Annotation distance changed + + + + + Annotation format changed + + + + + Annotation toggled + + + + + Changed annotation precision + + + + + Changed grid frame style + + + + + Changed grid frame width + + + + + + + Inside frame + + + + + + Outside frame + + + + + + + Disabled + + + + + + + Horizontal + + + + + + Vertical + + + + + Annotation position changed + + + + + Changed annotation direction + + + + + Map %1 + + + + + QgsComposerMapWidgetBase + + + Map options + + + + + Map + + + + + Update preview + + + + + Overview style + + + + + Change... + + + + + Overview frame + + + + + Width + + + + + Height + + + + + Scale + + + + + Rotation + + + + + degrees + + + + + Lock layers for map item + + + + + Draw map canvas items + + + + + Extents + + + + + X min + + + + + X max + + + + + Y min + + + + + Y max + + + + + Set to map canvas extent + + + + + Grid + + + + + Show grid? + + + + + Grid &type + + + + + Interval X + + + + + Interval Y + + + + + Offset X + + + + + Offset Y + + + + + Cross width + + + + + Line width + + + + + Frame style + + + + + Frame width + + + + + Line color + + + + + Draw annotation + + + + + Annotation position left side + + + + + Annotation position right side + + + + + Annotation position top side + + + + + Annotation position bottom side + + + + + Annotation direction left side + + + + + Annotation direction right side + + + + + Annotation direction top side + + + + + Annotation direction bottom side + + + + + Annotation format + + + + + Font... + + + + + Distance to map frame + + + + + Coordinate precision + + + + + QgsComposerPictureWidget + + + General options + + + + + Select svg or image file + + + + + + + Picture changed + + + + + Picture width changed + + + + + Picture height changed + + + + + Picture rotation changed + + + + + Select new preview directory + + + + + Rotation synchronisation toggled + + + + + Rotation map changed + + + + + + Map %1 + + + + + Creating icon for file %1 + + + + + QgsComposerPictureWidgetBase + + + Picture Options + + + + + Picture options + + + + + Preloaded images + + + + + Load another + + + + + ... + + + + + Options + + + + + Width + + + + + Height + + + + + Rotation + + + + + Sync with map + + + + + Search directories + + + + + Add... + + + + + Remove + + + + + QgsComposerScaleBar + + + km + + + + + m + + + + + QgsComposerScaleBarWidget + + + General options + + + + + + Single Box + + + + + + Double Box + + + + + + + Line Ticks Middle + + + + + + Line Ticks Down + + + + + + Line Ticks Up + + + + + + Numeric + + + + + Left + + + + + Middle + + + + + Right + + + + + Map units + + + + + Meters + + + + + Feet + + + + + + + Map %1 + + + + + Scalebar map changed + + + + + Scalebar line width + + + + + Scalebar segment size + + + + + Scalebar segments left + + + + + Scalebar n segments + + + + + Scalebar height changed + + + + + Scalebar font changed + + + + + Scalebar color changed + + + + + Scalebar unit text + + + + + Scalebar map units per segment + + + + + Scalebar style changed + + + + + Scalebar label bar space + + + + + Scalebar box content space + + + + + Scalebar alignment + + + + + Scalebar unit changed + + + + + QgsComposerScaleBarWidgetBase + + + Barscale Options + + + + + Scale bar + + + + + Segment size + + + + + Units + + + + + Map units per bar unit + + + + + Left segments + + + + + Right segments + + + + + Style + + + + + Map + + + + + Alignment + + + + + + + + mm + + + + + Height + + + + + Line width + + + + + Label space + + + + + Box space + + + + + Unit label + + + + + Font... + + + + + Color... + + + + + QgsComposerShapeWidget + + + General options + + + + + + + Ellipse + + + + + + + Rectangle + + + + + + + Triangle + + + + + Shape rotation changed + + + + + Shape type changed + + + + + Select outline color + + + + + Shape outline color + + + + + Shape outline width + + + + + Shape transparency toggled + + + + + Select fill color + + + + + Shape fill color + + + + + QgsComposerShapeWidgetBase + + + Form + + + + + Shape + + + + + Shape outline color... + + + + + Outline width + + + + + Transparent fill + + + + + Shape fill Color... + + + + + Rotation + Rotation + Rotation + + + + + QgsComposerTableWidget + + + General options + + + + + + Map %1 + + + + + Table layer changed + + + + + Table attribute settings + + + + + Table map changed + + + + + + Table maximum columns + + + + + + + + Select Font + + + + + Table header font + + + + + Table content font + + + + + Table grid stroke + + + + + Select grid color + + + + + Table grid color + + + + + Table grid toggled + + + + + Table visible only toggled + + + + + QgsComposerTableWidgetBase + + + Form + + + + + Table + + + + + Layer + + + + + Attributes... + + + + + Composer map + + + + + Maximum rows + + + + + Show grid + + + + + Grid stroke width + + + + + Grid color + + + + + Header Font... + + + + + Content Font... + + + + + Margin + + + + + Show only visible features + + + + + QgsComposerVectorLegendBase + + + Vector Legend Options + + + + + Preview + + + + + Map + + + + + Title + + + + + Layers + + + + + Group + + + + + ID + + + + + Box + + + + + Font + + + + + QgsComposerView + + + Quantum GIS + + + + + Label added + + + + + Scale bar added + + + + + Legend added + + + + + Picture added + + + + + Table added + + + + + Shape added + + + + + Move item content + + + + + Arrow added + + + + + Map added + + + + + Html item added + + + + + Html frame added + + + + + + + + Item moved + + + + + Zoom item content + + + + + QgsComposition + + + Label added + + + + + Map added + + + + + Arrow added + + + + + Scale bar added + + + + + Shape added + + + + + Picture added + + + + + Legend added + + + + + Table added + + + + + Aligned items left + + + + + Aligned items hcenter + + + + + Aligned items right + + + + + Aligned items top + + + + + Aligned items vcenter + + + + + Aligned items bottom + + + + + Item z-order changed + + + + + Remove item group + + + + + Frame deleted + + + + + Item deleted + + + + + Multiframe removed + + + + + QgsCompositionBase + + + Composition + + + + + Paper + + + + + Size + + + + + Units + + + + + Width + + + + + Height + + + + + Orientation + + + + + QgsCompositionWidget + + + mm + + + + + inch + + + + + + + Landscape + + + + + + Portrait + + + + + + Solid + + + + + + Dots + + + + + + Crosses + + + + + A5 (148x210 mm) + + + + + A4 (210x297 mm) + + + + + A3 (297x420 mm) + + + + + A2 (420x594 mm) + + + + + A1 (594x841 mm) + + + + + A0 (841x1189 mm) + + + + + B5 (176 x 250 mm) + + + + + B4 (250 x 353 mm) + + + + + B3 (353 x 500 mm) + + + + + B2 (500 x 707 mm) + + + + + B1 (707 x 1000 mm) + + + + + B0 (1000 x 1414 mm) + + + + + Legal (8.5x14 inches) + + + + + ANSI A (Letter; 8.5x11 inches) + + + + + ANSI B (Tabloid; 11x17 inches) + + + + + ANSI C (17x22 inches) + + + + + ANSI D (22x34 inches) + + + + + ANSI E (34x44 inches) + + + + + Arch A (9x12 inches) + + + + + Arch B (12x18 inches) + + + + + Arch C (18x24 inches) + + + + + Arch D (24x36 inches) + + + + + Arch E (36x48 inches) + + + + + Arch E1 (30x42 inches) + + + + + + + + Custom + + + + + QgsCompositionWidgetBase + + + Composition + + + + + Paper and quality + + + + + Size + + + + + Width + + + + + Height + + + + + Orientation + + + + + Print as raster + + + + + dpi + + + + + Quality + + + + + Number of pages + + + + + Snapping + + + + + Snap to grid + + + + + X offset + + + + + Y offset + + + + + Grid color + + + + + Grid style + + + + + Selection tolerance (mm) + + + + + Spacing + + + + + Pen width + + + + + QgsConfigureShortcutsDialog + + + Configure shortcuts + + + + + Action + + + + + Shortcut + + + + + + Change + + + + + Set none + + + + + Set default + + + + + Load... + + + + + Save... + + + + + Save shortcuts + + + + + + XML file + + + + + + All files + + + + + Saving shortcuts + + + + + Cannot write file %1: +%2. + + + + + Load shortcuts + + + + + + + + Loading shortcuts + + + + + Cannot read file %1: +%2. + + + + + Parse error at line %1, column %2: +%3 + + + + + The file is not an shortcuts exchange file. + + + + + The file contains shortcuts created with different locale, so you can't use it. + + + + + None + + + + + Set default (%1) + + + + + Input: + + + + + Shortcut conflict + + + + + This shortcut is already assigned to action %1. Reassign? + + + + + QgsContinuousColorDialogBase + + + Continuous color + + + + + Classification field + + + + + Minimum value + + + + + Maximum value + + + + + Outline width + + + + + Draw polygon outline + + + + + QgsCoordinateTransform + + + The source spatial reference system (CRS) is not valid. The coordinates can not be reprojected. The CRS is: %1 + + + + + + CRS + + + + + The destination spatial reference system (CRS) is not valid. The coordinates can not be reprojected. The CRS is: %1 + + + + + inverse transform + + + + + forward transform + + + + + %1 of +%2PROJ.4: %3 +to %4 +Error: %5 + + + + + QgsCptCityBrowserModel + + + Name + + + + + Info + + + + + QgsCptCityColorRampItem + + + colors + + + + + continuous + + + + + continuous (multi) + + + + + discrete + + + + + variants + + + + + QgsCptCityColorRampV2Dialog + + + Error - cpt-city gradient files not found. + +You have two means of installing them: + +1) Install the "Color Ramp Manager" python plugin (you must enable Experimental plugins in the plugin manager) and use it to download latest cpt-city package. +You can install the entire cpt-city archive or a selection for QGIS. + +2) Download the complete archive (in svg format) and unzip it to your QGis settings directory [%1] . + +This file can be found at [%2] +and current file is [%3] + + + + + Selections by theme + + + + + All by author + + + + + You can download a more complete set of cpt-city gradients by installing the "Color Ramp Manager" plugin (you must enable Experimental plugins in the plugin manager). + + + + + + + %1 directory details + + + + + %1 gradient details + + + + + QgsCptCityColorRampV2DialogBase + + + cpt-city color ramp + + + + + Selection and preview + + + + + + License + + + + + Palette + + + + + Path + + + + + Information + + + + + Author(s) + + + + + Source + + + + + Details + + + + + QgsCredentialDialog + + + Enter Credentials + + + + + Username + + + + + Password + + + + + + TextLabel + + + + + Realm + + + + + QgsCustomProjectionDialog + + + Delete Projection Definition? + + + + + Deleting a projection definition is not reversable. Do you want to delete it? + + + + + + + + %1 of %2 + + + + + + + + Abort + + + + + + New + + + + + * of %1 + + + + + + + + + + + + QGIS Custom Projection + + + + + + + + + This proj4 projection definition is not valid. + + + + + Please give the projection a name before pressing save. + + + + + Please add the parameters before pressing save. + + + + + Please add a proj= clause before pressing save. + + + + + This proj4 ellipsoid definition is not valid. Please add a ellips= clause before pressing save. + COMMENTED OUT + + + + + Please correct before pressing save. + + + + + Northing and Easthing must be in decimal form. + + + + + Internal Error (source projection invalid?) + + + + + + Error + + + + + QgsCustomProjectionDialogBase + + + Custom Coordinate Reference System Definition + + + + + Define + + + + + You can define your own custom Coordinate Reference System (CRS) here. The definition must conform to the proj4 format for specifying a CRS. + + + + + Name + + + + + + Parameters + + + + + |< + + + + + < + + + + + 1 of 1 + + + + + > + + + + + >| + + + + + * + + + + + S + + + + + X + + + + + Test + + + + + Use the text boxes below to test the CRS definition you are creating. Enter a coordinate where both the lat/long and the transformed result are known (for example by reading off a map). Then press the calculate button to see if the CRS definition you are creating is accurate. + + + + + Geographic / WGS84 + + + + + Destination CRS + + + + + North + + + + + East + + + + + Calculate + + + + + QgsCustomizationDialog + + + Object name + + + + + Label + + + + + Description + + + + + + Choose a customization INI file + + + + + + Customization files (*.ini) + + + + + Widgets + + + + + QgsCustomizationDialogBase + + + Customization + + + + + toolBar + + + + + Catch + + + + + Switch to catching widgets in main application + + + + + Save + + + + + Save to file + + + + + Load + + + + + Load from file + + + + + Expand All + + + + + Collapse All + + + + + Select All + + + + + QgsDashSpaceDialogBase + + + Dash space pattern + + + + + Dash + + + + + Space + + + + + QgsDbSourceSelectBase + + + Add PostGIS layers + + + + + Connections + + + + + Connect + + + + + New + + + + + Edit + + + + + Delete + + + + + Load + Load connections from file + + + + + Save connections to file + + + + + Save + + + + + Also list tables with no geometry + + + + + Search options + + + + + Search + + + + + Search mode + + + + + Search in columns + + + + + QgsDecorationCopyright + + + Bottom Left + + + + + Top Left + + + + + Top Right + + + + + Bottom Right + + + + + QgsDecorationCopyrightDialog + + + Copyright Label Decoration + + + + + Enable copyright label + + + + + &Enter your copyright label here: + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Verdana';">© QGIS 2009</span></p></body></html> + + + + + &Placement + + + + + Bottom Left + + + + + Top Left + + + + + Bottom Right + + + + + Top Right + + + + + &Orientation + + + + + Horizontal + + + + + Vertical + + + + + &Color + + + + + QgsDecorationGrid + + + + + + Error + + + + + No active layer + + + + + Please select a raster layer + + + + + Invalid raster layer + + + + + Layer CRS must be equal to project CRS + + + + + QgsDecorationGridDialog + + + Dialog + + + + + Enable grid + + + + + Interval X + + + + + Interval Y + + + + + Grid type + + + + + Line symbol + + + + + Draw annotation + + + + + Annotation direction + + + + + Font... + + + + + Distance to map frame + + + + + Coordinate precision + + + + + Marker symbol + + + + + Offset X + + + + + Offset Y + + + + + Update Interval / Offset from + + + + + Canvas Extents + + + + + Active Raster Layer + + + + + + Line + + + + + + Marker + + + + + + Horizontal + + + + + + Vertical + + + + + Horizontal and vertical + + + + + Boundary direction + + + + + Horizontal and Vertical + + + + + QgsDecorationNorthArrow + + + Bottom Left + + + + + Top Left + + + + + Top Right + + + + + Bottom Right + + + + + North arrow pixmap not found + + + + + QgsDecorationNorthArrowDialog + + + North Arrow Decoration + + + + + Preview of north arrow + + + + + Angle + + + + + Placement + + + + + Placement on screen + + + + + Top Left + + + + + Top Right + + + + + Bottom Left + + + + + Bottom Right + + + + + Enable North Arrow + + + + + Set direction automatically + + + + + Pixmap not found + + + + + QgsDecorationScaleBar + + + Bottom Left + + + + + Top Left + + + + + Top Right + + + + + Bottom Right + + + + + Tick Down + + + + + Tick Up + + + + + Bar + + + + + Box + + + + + km + + + + + mm + + + + + cm + + + + + m + + + + + miles + + + + + mile + + + + + inches + + + + + foot + + + + + feet + + + + + degree + + + + + degrees + + + + + unknown + + + + + QgsDecorationScaleBarDialog + + + Scale Bar Decoration + + + + + Placement + + + + + Top Left + + + + + Top Right + + + + + Bottom Left + + + + + Bottom Right + + + + + Scale bar style + + + + + Select the style of the scale bar + + + + + Tick Down + + + + + Tick Up + + + + + Box + + + + + Bar + + + + + Color of bar + + + + + + Click to select the color + + + + + Size of bar + + + + + Enable scale bar + + + + + Automatically snap to round number on resize + + + + + metres/km + + + + + feet/miles + + + + + degrees + + + + + QgsDelAttrDialogBase + + + Delete Attributes + + + + + QgsDelimitedTextPlugin + + + DelimitedTextLayer + + + + + &Add Delimited Text Layer + + + + + Add a delimited text file as a map layer. The file must have a header row containing the field names. The file must either contain X and Y fields with coordinates in decimal units or a WKT field. + + + + + Delimited Text + + + + + Cannot get Delimited Text select dialog from provider. + + + + + QgsDelimitedTextProvider + + + Error + + + + + Note: the following lines were not loaded because QGIS was unable to determine values for the x and y coordinates: + + + + + + QgsDelimitedTextSourceSelect + + + No layer name + + + + + Please enter a layer name before adding the layer to the map + + + + + Choose a delimited text file to open + + + + + Text files + + + + + Well Known Text files + + + + + All files + + + + + QgsDelimitedTextSourceSelectBase + + + Create a Layer from a Delimited Text File + + + + + File Name + + + + + Full path to the delimited text file + + + + + Full path to the delimited text file. In order to properly parse the fields in the file, the delimiter must be defined prior to entering the file name. Use the Browse button to the right of this field to choose the input file. + + + + + Layer name + + + + + Name to display in the map legend + + + + + Name displayed in the map legend + + + + + Browse to find the delimited text file to be processed + + + + + Use this button to browse to the location of the delimited text file. This button will not be enabled until a delimiter has been entered in the <i>Delimiter</i> box. Once a file is chosen, the X and Y field drop-down boxes will be populated with the fields from the delimited text file. + + + + + Browse... + + + + + Selected delimiters + + + + + + The delimiter is a regular expression + + + + + Regular expression + + + + + + The delimiter is taken as is + + + + + Plain characters + + + + + Tab + + + + + Space + + + + + Comma + + + + + Semicolon + + + + + Colon + + + + + Delimiter to use when splitting fields in the text file. The delimiter can be more than one character. + + + + + Delimiter to use when splitting fields in the delimited text file. The delimiter can be 1 or more characters in length. + + + + + Start import at row + + + + + The file contains X and Y coordinate columns + + + + + X Y fields + + + + + <p align="right">X field</p> + + + + + Name of the field containing x values + + + + + Name of the field containing x values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. + + + + + <p align="right">Y field</p> + + + + + + Name of the field containing y values + + + + + + Name of the field containing y values. Choose a field from the list. The list is generated by parsing the header row of the delimited text file. + + + + + The file contains a well known text geometry field + + + + + WKT field + + + + + Decimal point + + + + + Sample text + + + + + QgsDetailedItemWidgetBase + + + Form + + + + + Heading Label + + + + + Detail label + + + + + Category label + + + + + QgsDiagramProperties + + + + mm + + + + + Map units + + + + + Around Point + + + + + Over Point + + + + + Line + + + + + Horizontal + + + + + Free + + + + + On line + + + + + Above line + + + + + Below Line + + + + + Map orientation + + + + + Pie chart + + + + + Text diagram + + + + + Histogram + + + + + Height + + + + + + x-height + + + + + Area + + + + + Diameter + + + + + + None + + + + + Unknown diagram type. + + + + + The diagram type '%1' is unknown. A default type is selected for you. + + + + + Transparency: %1% + + + + + Background color + + + + + Pen color + + + + + No attributes added. + + + + + You did not add any attributes to this diagram layer. Please specify the attributes to visualize on the diagrams or disable diagrams. + + + + + No attribute value specified + + + + + You did not specify a maximum value for the diagram size. Please specify the attribute and a reference value as a base for scaling in the Tab Diagram / Size. + + + + + QgsDiagramPropertiesBase + + + Display diagrams + + + + + Diagram type + + + + + Priority: + + + + + Low + + + + + High + + + + + Appearance + + + + + Background color + + + + + Line color + + + + + Line width + + + + + Font... + + + + + Bar width + + + + + Transparency 0% + + + + + Only show diagrams with a size inside the specified range. + + + + + Hide diagrams with a size outside the specified range. + + + + + Scale dependent visibility + + + + + Minimum + + + + + Maximum + + + + + + Size + + + + + Fixed size + + + + + Size units + + + + + Scale linearly between 0 and the following attribute value / diagram size: + + + + + + Attribute + + + + + Find maximum value + + + + + Scale + + + + + Will scale diagrams with a size smaller than the minimum size to the minimum size + + + + + Increase size of small diagrams + + + + + Minimum size + + + + + Position + + + + + Placement + + + + + Line Options + + + + + Distance + + + + + Data defined position + + + + + x + + + + + y + + + + + Automated placement settings + + + + + Options + + + + + Label placement + + + + + Bar Orientation + + + + + Up + + + + + Down + + + + + Right + + + + + Left + + + + + Attributes + + + + + Available attributes + + + + + Assigned attributes + + + + + Drag and drop to reorder + + + + + Color + + + + + QgsDirectoryParamWidget + + + + Name + + + + + + Size + + + + + + Date + + + + + + Permissions + + + + + + Owner + + + + + + Group + + + + + + Type + + + + + folder + + + + + file + + + + + link + + + + + QgsDisplayAngle + + + %1 degrees + + + + + %1 radians + + + + + %1 gon + + + + + QgsDisplayAngleBase + + + Angle + + + + + QgsEncodingFileDialog + + + Encoding: + + + + + Cancel &All + + + + + QgsEngineConfigDialog + + + Dialog + + + + + Search method + + + + + Chain (fast) + + + + + Popmusic Tabu + + + + + Popmusic Chain + + + + + Popmusic Tabu Chain + + + + + FALP (fastest) + + + + + Number of candidates + + + + + Point + + + + + Line + + + + + Polygon + + + + + Show all labels and features for all layers + + + + + Show candidates (for debugging) + + + + + (i.e. including colliding objects) + + + + + QgsErrorDialog + + + Error + + + + + QgsErrorDialogBase + + + Dialog + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Summary</p></body></html> + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Detailed report.</p></body></html> + + + + + Always show details + + + + + Details >> + + + + + QgsExpressionBuilderDialogBase + + + Expression string builder + + + + + QgsExpressionBuilderWidget + + + + + + + + + + + + + + + + + + + + + Operators + + + + + (String Concatenation) + + + + + Joins two values together into a string + + + + + Usage + + + + + 'Dia' || Diameter + + + + + + Conditionals + + + + + Search + + + + + Fields and Values + + + + + Parser Error + + + + + Eval Error + + + + + Expression is invalid <a href=more>(more info)</a> + + + + + More info on expression error + + + + + Load top 10 unique values + + + + + Load all unique values + + + + + <h3>Oops! QGIS can't find help for this function.</h3>The help file for %1 was not found.<br> + + + + + (Showing English version as there was no help available in your language (%1). If you would like to create it, contact the QGIS translation team).<br> + + + + + It was neither available in your language (%1) nor English. + + + + + <br>If you would like to create it, contact the QGIS development team. + + + + + QgsExpressionBuilderWidgetBase + + + Form + + + + + Function List + + + + + Selected Function Help + + + + + Field Values + + + + + Load all unique values + + + + + Load 10 sample values + + + + + Operators + + + + + = + + + + + + + + + + + - + + + + + / + + + + + * + + + + + ^ + + + + + || + + + + + ( + + + + + ) + + + + + + Output preview is generated <br> using the first feature from the layer. + + + + + Output preview: + + + + + Expression + + + + + QgsFeatureAction + + + Run actions + + + + + QgsFieldCalculator + + + + Not available for layer + + + + + Evaluation error + + + + + Provider error + + + + + Could not add the new field to the provider. + + + + + Error + + + + + An error occured while evaluating the calculation string: +%1 + + + + + Please enter a field name + + + + + + The expression is invalid see (more info) for details + + + + + QgsFieldCalculatorBase + + + Field calculator + + + + + Only update selected features + + + + + Create a new field + + + + + Output field name + + + + + Output field type + + + + + Output field width + + + + + Width of complete output. For example 123,456 means 6 as field width. + + + + + Precision + + + + + Update existing field + + + + + QgsFieldsProperties + + + Label + + + + + Id + + + + + Name + + + + + Type + + + + + Length + + + + + Precision + + + + + Comment + + + + + Edit widget + + + + + Alias + + + + + + Name conflict + + + + + + The attribute could not be inserted. The name already exists in the table. + + + + + Added attribute + + + + + + Deleted attribute + + + + + Line edit + + + + + Unique values + + + + + Unique values editable + + + + + Classification + + + + + Value map + + + + + Edit range + + + + + Slider range + + + + + Dial range + + + + + File name + + + + + Enumeration + + + + + Immutable + + + + + Hidden + + + + + Checkbox + + + + + Text edit + + + + + Calendar + + + + + Value relation + + + + + UUID generator + + + + + Select edit form + + + + + UI file + + + + + QgsFieldsPropertiesBase + + + Field calculator + + + + + + Click to toggle table editing + + + + + Toggle editing mode + + + + + New column + + + + + Ctrl+N + + + + + Delete column + + + + + Ctrl+X + + + + + ... + + + + + Init function + + + + + Edit UI + + + + + + + + + + + - + + + + + > + + + + + ^ + + + + + v + + + + + Autogenerate + + + + + Drag and drop designer + + + + + Provide ui-file + + + + + Attribute editor layout: + + + + + QgsFormAnnotationDialog + + + Delete + + + + + Qt designer file + + + + + QgsFormAnnotationDialogBase + + + Dialog + + + + + ... + + + + + QgsGCPListModel + + + + map units + + + + + + pixels + + + + + QgsGCPListWidget + + + Recenter + + + + + Remove + + + + + QgsGPSDetector + + + internal GPS + + + + + local gpsd + + + + + QgsGPSDeviceDialog + + + New device %1 + + + + + Are you sure? + + + + + Are you sure that you want to delete this device? + + + + + QgsGPSDeviceDialogBase + + + GPS Device Editor + + + + + Devices + + + + + Delete + + + + + New + + + + + Update + + + + + Device name + + + + + This is the name of the device as it will appear in the lists + + + + + Commands + + + + + Track download + + + + + Route upload + + + + + Waypoint download + + + + + The command that is used to download routes from the device + + + + + Route download + + + + + The command that is used to upload waypoints to the device + + + + + Track upload + + + + + The command that is used to download tracks from the device + + + + + The command that is used to upload routes to the device + + + + + The command that is used to download waypoints from the device + + + + + The command that is used to upload tracks to the device + + + + + Waypoint upload + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'MS Shell Dlg 2'; font-size:8.25pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Sans Serif'; font-size:9pt;">In the download and upload commands there can be special words that will be replaced by QGIS when the commands are used. These words are:</span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%babel</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the path to GPSBabel<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%in</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the GPX filename when uploading or the port when downloading<br /></span><span style=" font-family:'Sans Serif'; font-size:9pt; font-style:italic;">%out</span><span style=" font-family:'Sans Serif'; font-size:9pt;"> - the port when uploading or the GPX filename when downloading</span></p></body></html> + + + + + QgsGPSInformationWidget + + + /gps + + + + + No path to the GPS port is specified. Please enter a path then try again. + + + + + Connecting... + + + + + Connecting to GPS device... + + + + + Timed out! + + + + + Failed to connect to GPS device. + + + + + Connected! + + + + + Dis&connect + + + + + Connected to GPS device. + + + + + Error opening log file. + + + + + Disconnected... + + + + + &Connect + + + + + Disconnected from GPS device. + + + + + %1 m + + + + + %1 km/h + + + + + Automatic + + + + + Manual + + + + + 3D + + + + + 2D + + + + + No fix + + + + + Differential + + + + + Non-differential + + + + + No position + + + + + Valid + + + + + Invalid + + + + + + Not enough vertices + + + + + Cannot close a line feature until it has at least two vertices. + + + + + Cannot close a polygon feature until it has at least three vertices. + + + + + + Feature added + + + + + + + + + Error + + + + + + Could not commit changes to layer %1 + +Errors: %2 + + + + + + The feature could not be added because removing the polygon intersections would change the geometry type + + + + + An error was reported during intersection removal + + + + + Cannot add feature. Unknown WKB type. Choose a different layer and try again. + + + + + Save GPS log file as + + + + + NMEA files + + + + + &Add feature + + + + + &Add Point + + + + + &Add Line + + + + + &Add Polygon + + + + + QgsGPSInformationWidgetBase + + + GPS Connect + + + + + &Add feature + + + + + Quick status indicator: +green = good or 3D fix +yellow = good 2D fix +red = no fix or bad fix +gray = no data + +2D/3D depends on this information being available + + + + + Add track point + + + + + Reset track + + + + + + + + + + + + ... + + + + + Position + + + + + Signal + + + + + Satellite + + + + + Options + + + + + Debug + + + + + &Connect + + + + + latitude of position fix (degrees) + + + + + Longitude + + + + + longitude of position fix (degrees) + + + + + antenna altitude with respect to geoid (mean sea level) + + + + + Altitude + + + + + Latitude + + + + + Time of fix + + + + + date/time of position fix (UTC) + + + + + speed over ground + + + + + Speed + + + + + track direction (degrees) + + + + + Direction + + + + + Horizontal Dilution of Precision + + + + + HDOP + + + + + Vertical Dilution of Precision + + + + + VDOP + + + + + Position Dilution of Precision + + + + + PDOP + + + + + GPS receiver configuration 2D/3D mode: Automatic or Manual + + + + + Mode + + + + + position fix dimensions: 2D, 3D or No fix + + + + + Dimensions + + + + + quality of the position fix: Differential, Non-differential or No position + + + + + Quality + + + + + position fix status: Valid or Invalid + + + + + Status + + + + + number of satellites used in the position fix + + + + + Satellites + + + + + H accurancy + + + + + V accurancy + + + + + Connection + + + + + Autodetect + + + + + Serial device + + + + + Refresh serial device list + + + + + Port + + + + + Host + + + + + Device + + + + + 00000; + + + + + gpsd + + + + + Internal + + + + + Digitizing + + + + + Track + + + + + Automatically add points + + + + + Track width in pixels + + + + + width + + + + + Color + + + + + save layer after every feature added + + + + + Automatically save added feature + + + + + save GPS data (NMEA sentences) to a file + + + + + Log File + + + + + browse for log file + + + + + Map centering + + + + + when leaving + + + + + % of map extent + + + + + never + + + + + always + + + + + Cursor + + + + + Small + + + + + Large + + + + + QgsGPSPlugin + + + &GPS Tools + + + + + &Create new GPX layer + + + + + + Creates a new GPX layer and displays it on the map canvas + + + + + + &GPS + + + + + Save new GPX file as... + + + + + GPS eXchange file + + + + + Could not create file + + + + + Unable to create a GPX file with the given name. Try again with another name or in another directory. + + + + + GPX Loader + + + + + Unable to read the selected file. +Please reselect a valid file. + + + + + + + + Could not start process + + + + + + + + Could not start GPSBabel! + + + + + + Importing data... + + + + + + + + Cancel + + + + + Could not import data from %1! + + + + + + + Error importing data + + + + + Could not convert data from %1! + + + + + + + Error converting data + + + + + + Not supported + + + + + This device does not support downloading of %1. + + + + + Downloading data... + + + + + Could not download data from GPS! + + + + + + + Error downloading data + + + + + This device does not support uploading of %1. + + + + + Uploading data... + + + + + Error while uploading data to GPS! + + + + + + + Error uploading data + + + + + QgsGPSPluginGui + + + + Waypoints + + + + + + Routes + + + + + + Tracks + + + + + + + Choose a file name to save under + + + + + + + + GPS eXchange format + + + + + + Select GPX file + + + + + Select file and format to import + + + + + Waypoints from a route + + + + + Waypoints from a track + + + + + Route from waypoints + + + + + Track from waypoints + + + + + GPS eXchange format (*.gpx) + + + + + QgsGPSPluginGuiBase + + + GPS Tools + + + + + Load GPX file + + + + + File + + + + + + + Browse... + + + + + Feature types + + + + + + Waypoints + + + + + + Routes + + + + + + Tracks + + + + + Import other file + + + + + File to import + + + + + + Feature type + + + + + + + Layer name + + + + + + GPX output file + + + + + + + Save As... + + + + + (Note: Selecting correct file type in browser dialog important!) + + + + + Download from GPS + + + + + + GPS device + + + + + Edit devices... + + + + + + Port + + + + + Refresh + + + + + Output file + + + + + Upload to GPS + + + + + Data layer + + + + + Edit devices + + + + + GPX Conversions + + + + + GPX input file + + + + + Conversion + + + + + QgsGPXProvider + + + Bad URI - you need to specify the feature type. + + + + + GPS eXchange file + + + + + Digitized in QGIS + + + + + QgsGdalProvider + + + Dataset Description + + + + + Band %1 + + + + + Dimensions: + + + + + X: %1 Y: %2 Bands: %3 + + + + + Origin: + + + + + Pixel Size: + + + + + Gauss + + + + + Cubic + + + + + Average + + + + + Mode + + + + + None + + + + + Cannot get GDAL raster band: %1 + + + + + QgsGenericProjectionSelector + + + Define this layer's coordinate reference system: + + + + + This layer appears to have no projection specification. + + + + + By default, this layer will now have its projection set to that of the project, but you may override this by selecting a different projection below. + + + + + QgsGenericProjectionSelectorBase + + + Coordinate Reference System Selector + + + + + QgsGeorefConfigDialog + + + A5 (148x210 mm) + + + + + A4 (210x297 mm) + + + + + A3 (297x420 mm) + + + + + A2 (420x594 mm) + + + + + A1 (594x841 mm) + + + + + A0 (841x1189 mm) + + + + + B5 (176 x 250 mm) + + + + + B4 (250 x 353 mm) + + + + + B3 (353 x 500 mm) + + + + + B2 (500 x 707 mm) + + + + + B1 (707 x 1000 mm) + + + + + B0 (1000 x 1414 mm) + + + + + Legal (8.5x14 inches) + + + + + ANSI A (Letter; 8.5x11 inches) + + + + + ANSI B (Tabloid; 11x17 inches) + + + + + ANSI C (17x22 inches) + + + + + ANSI D (22x34 inches) + + + + + ANSI E (34x44 inches) + + + + + Arch A (9x12 inches) + + + + + Arch B (12x18 inches) + + + + + Arch C (18x24 inches) + + + + + Arch D (24x36 inches) + + + + + Arch E (36x48 inches) + + + + + Arch E1 (30x42 inches) + + + + + QgsGeorefConfigDialogBase + + + Configure Georeferencer + + + + + Point tip + + + + + Show IDs + + + + + Show coords + + + + + Residual units + + + + + Pixels + + + + + Use map units if possible + + + + + PDF report + + + + + Left margin + + + + + + mm + + + + + Right margin + + + + + Show Georeferencer window docked + + + + + PDF map + + + + + Paper size + + + + + QgsGeorefDescriptionDialogBase + + + Description georeferencer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Droid Sans'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"></p></body></html> + + + + + QgsGeorefPlugin + + + + + &Georeferencer + + + + + QgsGeorefPluginGui + + + Georeferencer + + + + + All other files (*) + + + + + Open raster + + + + + %1 is not a supported raster data source + + + + + Unsupported Data Source + + + + + Raster loaded: %1 + + + + + Georeferencer - %1 + + + + + + + Transform: + + + + + + + + + + + + + + + Info + + + + + GDAL scripting is not supported for %1 transformation + + + + + Load GCP points + + + + + + GCP file + + + + + No GCP points to save + + + + + Save GCP points + + + + + + Please load raster to be georeferenced + + + + + + Help + + + + + Panels + + + + + Toolbars + + + + + Current transform parametrisation + + + + + Coordinate: + + + + + Current map coordinate + + + + + None + + + + + Coordinate of image(column/line) + + + + + Unable to open GCP points file %1 + + + + + Save GCPs + + + + + Save GCP points? + + + + + Failed to get linear transform parameters + + + + + World file exists + + + + + <p>The selected file already seems to have a world file! Do you want to replace it with the new world file?</p> + + + + + + Failed to compute GCP transform: Transform is not solvable + + + + + Error + + + + + Could not write to %1 + + + + + + + + map units + + + + + + pixels + + + + + Transformation parameters + + + + + Translation x + + + + + Translation y + + + + + Scale x + + + + + Scale y + + + + + Rotation [degrees] + + + + + Mean error [%1] + + + + + Residuals + + + + + yes + + + + + no + + + + + Translation (%1, %2) + + + + + Scale (%1, %2) + + + + + Rotation: %1 + + + + + Mean error: %1 + + + + + Copy in clipboard + + + + + %1 + + + + + GDAL script + + + + + Please set transformation type + + + + + Please set output raster name + + + + + %1 requires at least %2 GCPs. Please define more + + + + + Linear + + + + + Helmert + + + + + Polynomial 1 + + + + + Polynomial 2 + + + + + Polynomial 3 + + + + + Thin plate spline (TPS) + + + + + Projective + + + + + Not set + + + + + QgsGeorefPluginGuiBase + + + Georeferencer + + + + + + File + + + + + + View + + + + + + Edit + + + + + Settings + + + + + GCP table + + + + + toolBar + + + + + + Open raster + + + + + Ctrl+O + + + + + + Zoom In + + + + + Ctrl++ + + + + + + Zoom Out + + + + + Ctrl+- + + + + + + Zoom to Layer + + + + + Ctrl+Shift+F + + + + + + Pan + + + + + + Transformation settings + + + + + + Add point + + + + + Ctrl+A + + + + + + Delete point + + + + + Ctrl+D + + + + + + Quit + + + + + + Start georeferencing + + + + + Ctrl+G + + + + + + Generate GDAL script + + + + + Ctrl+C + + + + + + Link Georeferencer to QGis + + + + + + Link QGis to Georeferencer + + + + + + Save GCP points as... + + + + + Ctrl+S + + + + + + Load GCP points + + + + + Ctrl+L + + + + + Configure Georeferencer + + + + + Ctrl+P + + + + + Raster properties + + + + + + Move GCP point + + + + + Zoom Next + + + + + Zoom Last + + + + + Local histogram stretch + + + + + Full histogram stretch + + + + + QgsGlobePluginDialog + + + GDAL files + + + + + DEM files + + + + + + All files + + + + + Open raster file + + + + + Invalid Path: The file is either unreadable or does not exist + + + + + Invalid URL: + + + + + Do you want to add the datasource anyway? + + + + + Open 3D model file + + + + + Model files + + + + + QgsGlobePluginDialogGuiBase + + + Globe Settings + + + + + Elevation + + + + + + Type + + + + + Raster + + + + + TMS + + + + + URL/File + + + + + + ... + + + + + Up + + + + + Down + + + + + Add + + + + + Remove + + + + + Cache + + + + + Path + + + + + Model + + + + + Point Layer + + + + + 3D Model + + + + + Stereo + + + + + Stereo Mode + + + + + Screen distance (m) + + + + + Screen width (m) + + + + + Split stereo horizontal separation (px) + + + + + Split stereo vertical separation (px) + + + + + Split stereo vertical eye mapping + + + + + Screen height (m) + + + + + Eye separation (m) + + + + + Reset to defaults + + + + + Split stereo horizontal eye mapping + + + + + QgsGraduatedSymbolDialog + + + + + + Equal Interval + + + + + + + + + Quantiles + + + + + + + + Empty + + + + + QgsGraduatedSymbolDialogBase + + + graduated Symbol + + + + + Classification field + + + + + Mode + + + + + Number of classes + + + + + Classify + + + + + Delete class + + + + + QgsGraduatedSymbolRendererV2Widget + + + Column + + + + + + Symbol + + + + + change + + + + + Classes + + + + + Color ramp + + + + + Mode + + + + + Equal Interval + + + + + Quantile + + + + + Natural Breaks (Jenks) + + + + + Standard Deviation + + + + + Pretty Breaks + + + + + Classify + + + + + Add class + + + + + Delete class + + + + + Advanced + + + + + + Range + + + + + + Label + + + + + Symbol levels... + + + + + + + Error + + + + + There are no available color ramps. You can add them in Style Manager. + + + + + The selected color ramp is not available. + + + + + Renderer creation has failed. + + + + + QgsGrassAttributes + + + Column + + + + + Value + + + + + Type + + + + + Layer + + + + + Warning + + + + + ERROR + + + + + OK + + + + + QgsGrassAttributesBase + + + GRASS Attributes + + + + + Tab 1 + + + + + result + + + + + Update database record + + + + + Update + + + + + Add new category using settings in GRASS Edit toolbox + + + + + New + + + + + Delete selected category + + + + + Delete + + + + + QgsGrassBrowser + + + Tools + + + + + Add selected map to canvas + + + + + Copy selected map + + + + + Rename selected map + + + + + Delete selected map + + + + + Set current region to selected map + + + + + Refresh + + + + + + New name + + + + + + New name for layer "%1" + + + + + + + + Warning + + + + + Cannot copy map %1@%2 + + + + + + + <br>command: %1 %2<br>%3<br>%4 + + + + + Cannot rename map %1 + + + + + Information + + + + + Remove the selected layer(s) from QGis canvas before continue. + + + + + Question + + + + + Are you sure you want to delete %n selected layer(s)? + number of layers to delete + + + + + + + + Cannot delete map %1 + + + + + Cannot write new region + + + + + QgsGrassEdit + + + + + + + + + + + + + Warning + + + + + You are not owner of the mapset, cannot open the vector for editing. + + + + + Cannot open vector for update. + + + + + Edit tools + + + + + New point + + + + + New line + + + + + New boundary + + + + + New centroid + + + + + Move vertex + + + + + Add vertex + + + + + Delete vertex + + + + + Move element + + + + + Split line + + + + + Delete element + + + + + Edit attributes + + + + + Close + + + + + Background + + + + + Highlight + + + + + Dynamic + + + + + Point + + + + + Line + + + + + Boundary (no area) + + + + + Boundary (1 area) + + + + + Boundary (2 areas) + + + + + Centroid (in area) + + + + + Centroid (outside area) + + + + + Centroid (duplicate in area) + + + + + Node (1 line) + + + + + Node (2 lines) + + + + + Next not used + + + + + Manual entry + + + + + No category + + + + + Info + + + + + The table was created + + + + + Tool not yet implemented. + + + + + Cannot check orphan record: %1 + + + + + Orphan record was left in attribute table. <br>Delete the record? + + + + + Cannot delete orphan record: + + + + + Cannot describe table for field %1 + + + + + Left: %1 + + + + + -- Middle: %1 + + + + + -- Right: %1 + + + + + QgsGrassEditAddVertex + + + + + + Select line segment + + + + + New vertex position + + + + + Release + + + + + QgsGrassEditAttributes + + + Select element + + + + + QgsGrassEditBase + + + GRASS Edit + + + + + + Category + + + + + Mode + + + + + + Layer + + + + + Settings + + + + + Snapping in screen pixels + + + + + Symbology + + + + + Line width + + + + + Marker size + + + + + Disp + + + + + Color + + + + + + Type + + + + + Index + + + + + Table + + + + + Column + + + + + Length + + + + + Add Column + + + + + Create / Alter Table + + + + + QgsGrassEditDeleteLine + + + + + Select element + + + + + Delete selected / select next + + + + + Release selected + + + + + QgsGrassEditDeleteVertex + + + + + + Select vertex + + + + + Delete vertex + + + + + Release vertex + + + + + QgsGrassEditMoveLine + + + + + + Select element + + + + + New location + + + + + Release selected + + + + + QgsGrassEditMoveVertex + + + + + Select vertex + + + + + Select new position + + + + + QgsGrassEditNewLine + + + + + + + New vertex + + + + + + Undo last vertex + + + + + Close line + + + + + QgsGrassEditNewPoint + + + New centroid + + + + + New point + + + + + QgsGrassEditSplitLine + + + + Select position on line + + + + + Split the line + + + + + Release the line + + + + + + Select point on line + + + + + QgsGrassElementDialog + + + Cancel + + + + + Ok + + + + + <font color='red'>Enter a name!</font> + + + + + <font color='red'>This is name of the source!</font> + + + + + <font color='red'>Exists!</font> + + + + + Overwrite + + + + + QgsGrassMapcalc + + + Mapcalc tools + + + + + Add map + + + + + Add constant value + + + + + Add operator or function + + + + + Add connection + + + + + Select item + + + + + Delete selected item + + + + + Open + + + + + Save + + + + + Save as + + + + + Addition + + + + + Subtraction + + + + + Multiplication + + + + + Division + + + + + Modulus + + + + + Exponentiation + + + + + Equal + + + + + Not equal + + + + + Greater than + + + + + Greater than or equal + + + + + Less than + + + + + Less than or equal + + + + + And + + + + + Or + + + + + Absolute value of x + + + + + Inverse tangent of x (result is in degrees) + + + + + Inverse tangent of y/x (result is in degrees) + + + + + Current column of moving window (starts with 1) + + + + + Cosine of x (x is in degrees) + + + + + Convert x to double-precision floating point + + + + + Current east-west resolution + + + + + Exponential function of x + + + + + x to the power y + + + + + Convert x to single-precision floating point + + + + + Decision: 1 if x not zero, 0 otherwise + + + + + Decision: a if x not zero, 0 otherwise + + + + + Decision: a if x not zero, b otherwise + + + + + Decision: a if x > 0, b if x is zero, c if x < 0 + + + + + Convert x to integer [ truncates ] + + + + + Check if x = NULL + + + + + Natural log of x + + + + + Log of x base b + + + + + + Largest value + + + + + + Median value + + + + + + Smallest value + + + + + + Mode value + + + + + 1 if x is zero, 0 otherwise + + + + + Current north-south resolution + + + + + NULL value + + + + + Random value between a and b + + + + + Round x to nearest integer + + + + + Current row of moving window (Starts with 1) + + + + + Sine of x (x is in degrees) + sin(x) + + + + + Square root of x + sqrt(x) + + + + + Tangent of x (x is in degrees) + tan(x) + + + + + Current x-coordinate of moving window + + + + + Current y-coordinate of moving window + + + + + + Output + + + + + + + + + + + + + + + Warning + + + + + + Cannot get current region + + + + + Cannot check region of map %1 + + + + + Cannot get region of map %1 + + + + + No GRASS raster maps currently in QGIS + + + + + Cannot create 'mapcalc' directory in current mapset. + + + + + New mapcalc + + + + + Enter new mapcalc name: + + + + + Enter vector name + + + + + The file already exists. Overwrite? + + + + + + Save mapcalc + + + + + File name empty + + + + + Cannot open mapcalc file + + + + + The mapcalc schema (%1) not found. + + + + + Cannot open mapcalc schema (%1) + + + + + Cannot read mapcalc schema (%1): + + + + + +%1 +at line %2 column %3 + + + + + QgsGrassMapcalcBase + + + MainWindow + + + + + Output + + + + + QgsGrassModule + + + Module: %1 + + + + + + + + + + + + + + + Warning + + + + + The module file (%1) not found. + + + + + Cannot open module file (%1) + + + + + + Cannot read module file (%1) + + + + + + +%1 +at line %2 column %3 + + + + + Module %1 not found + + + + + Cannot find man page %1 + + + + + Please ensure you have the GRASS documentation installed. + + + + + Not available, description not found (%1) + + + + + Not available, cannot open description (%1) + + + + + Not available, incorrect description (%1) + + + + + + Run + + + + + + Cannot get input region + + + + + Input %1 outside current region! + + + + + Use Input Region + + + + + Output %1 exists! Overwrite? + + + + + Cannot find module %1 + + + + + Cannot start module: %1 + + + + + Stop + + + + + <B>Successfully finished</B> + + + + + <B>Finished with error</B> + + + + + <B>Module crashed or killed</B> + + + + + QgsGrassModuleBase + + + GRASS Module + + + + + Options + + + + + Output + + + + + Manual + + + + + TextLabel + + + + + Run + + + + + View output + + + + + Close + + + + + QgsGrassModuleField + + + Attribute field + + + + + Warning + + + + + 'layer' attribute in field tag with key= %1 is missing. + + + + + QgsGrassModuleFile + + + File + + + + + %1:&nbsp;missing value + + + + + %1:&nbsp;directory does not exist + + + + + QgsGrassModuleGdalInput + + + OGR/PostGIS/GDAL Input + + + + + + + Warning + + + + + Cannot find layeroption %1 + + + + + Cannot find whereoption %1 + + + + + Password + + + + + Select a layer + + + + + PostGIS driver in OGR does not support schemas!<br>Only the table name will be used.<br>It can result in wrong input if more tables of the same name<br>are present in the database. + + + + + %1:&nbsp;no input + + + + + QgsGrassModuleInput + + + Input + + + + + + + + Warning + + + + + Cannot find typeoption %1 + + + + + Cannot find values for typeoption %1 + + + + + Cannot find layeroption %1 + + + + + GRASS element %1 not supported + + + + + Use region of this map + + + + + Select a layer + + + + + %1:&nbsp;no input + + + + + QgsGrassModuleOption + + + + Warning + + + + + Cannot parse version_min %1 + + + + + Cannot parse version_max %1 + + + + + %1:&nbsp;missing value + + + + + QgsGrassModuleSelection + + + Selected categories + + + + + QgsGrassModuleStandardOptions + + + + + + + + + + + + Warning + + + + + Cannot find module %1 + + + + + Cannot start module %1 + + + + + <br>command: %1 %2<br>%3<br>%4 + + + + + Cannot read module description (%1): + + + + + +%1 +at line %2 column %3 + + + + + Cannot find key %1 + + + + + << Hide advanced options + + + + + Show advanced options >> + + + + + Item with key %1 not found + + + + + Item with id %1 not found + + + + + + Cannot get current region + + + + + Cannot check region of map %1 + + + + + Cannot set region of map %1 + + + + + QgsGrassNewMapset + + + Database + + + + + Location 1 + + + + + + System mapset + + + + + + + User's mapset + + + + + Location 2 + + + + + Enter path to GRASS database + + + + + The directory doesn't exist! + + + + + No writable locations, the database is not writable! + + + + + Enter location name! + + + + + The location exists! + + + + + Selected projection is not supported by GRASS! + + + + + + + + + + + + + + + Warning + + + + + Cannot create projection. + + + + + Cannot reproject previously set region, default region set. + + + + + North must be greater than south + + + + + East must be greater than west + + + + + Regions file (%1) not found. + + + + + Cannot open locations file (%1) + + + + + Cannot read locations file (%1): + + + + + +%1 +at line %2 column %3 + + + + + + + + Cannot create QgsCoordinateReferenceSystem + + + + + Cannot reproject selected region. + + + + + Cannot reproject region + + + + + Enter mapset name. + + + + + The mapset already exists + + + + + Database: + + + + + Location: + + + + + Mapset: + + + + + Create location + + + + + Cannot create new location: %1 + + + + + + + Create mapset + + + + + Cannot create new mapset directory + + + + + Cannot open DEFAULT_WIND + + + + + Cannot open WIND + + + + + + New mapset + + + + + New mapset successfully created, but cannot be opened: %1 + + + + + New mapset successfully created and set as current working mapset. + + + + + QgsGrassNewMapsetBase + + + New Mapset + + + + + GRASS Database + + + + + Tree + + + + + Comment + + + + + Example directory tree: + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">GRASS data are stored in tree directory structure. The GRASS database is the top-level directory in this tree structure.</p></body></html> + + + + + Database Error + + + + + + Database: + + + + + Browse... + + + + + Select existing directory or create a new one: + + + + + GRASS Location + + + + + Location + + + + + Select location + + + + + Create new location + + + + + Location Error + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">The GRASS location is a collection of maps for a particular territory or project.</p></body></html> + + + + + + Projection + + + + + Projection Error + + + + + Coordinate system + + + + + Not defined + + + + + Default GRASS Region + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">The GRASS region defines a workspace for raster modules. The default region is valid for one location. It is possible to set a different region in each mapset. It is possible to change the default location region later.</p></body></html> + + + + + Set current QGIS extent + + + + + Set + + + + + Region Error + + + + + S + + + + + W + + + + + E + + + + + N + + + + + + Mapset + + + + + New mapset: + + + + + Mapset Error + + + + + <p align="center">Existing masets</p> + + + + + Owner + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:9pt;">The GRASS mapset is a collection of maps used by one user. A user can read maps from all mapsets in the location but he can open for writing only his mapset (owned by user).</p></body></html> + + + + + Create New Mapset + + + + + Location: + + + + + Mapset: + + + + + QgsGrassPlugin + + + GrassVector + + + + + 0.1 + + + + + GRASS layer + + + + + Plugins + + + + + Open mapset + + + + + New mapset + + + + + Close mapset + + + + + Add GRASS vector layer + + + + + Add GRASS raster layer + + + + + + Open GRASS tools + + + + + Display Current Grass Region + + + + + Edit Current Grass Region + + + + + Edit Grass Vector layer + + + + + Create new Grass Vector + + + + + Adds a GRASS vector layer to the map canvas + + + + + Adds a GRASS raster layer to the map canvas + + + + + Displays the current GRASS region as a rectangle on the map canvas + + + + + Edit the current GRASS region + + + + + Edit the currently selected GRASS vector layer. + + + + + + + + + + + + + + + + + + + + + + + + &GRASS + + + + + GRASS + + + + + + + + + + + + + + + + + + + Warning + + + + + Cannot open vector %1 in mapset %2 on level 2 (topology not available, try to rebuild topology using v.build module). + + + + + Cannot open vector %1 in mapset %2 + + + + + Cannot open GRASS vector: + %1 + + + + + + GRASS Edit is already running. + + + + + + New vector name + + + + + Cannot create new vector: %1 + + + + + New vector created but cannot be opened by data provider. + + + + + Cannot start editing. + + + + + Cannot open vector for update. + + + + + GISDBASE, LOCATION_NAME or MAPSET is not set, cannot display current region. + + + + + Cannot read current region: %1 + + + + + Cannot open the mapset. %1 + + + + + Cannot close mapset. %1 + + + + + Cannot close current mapset. %1 + + + + + Cannot open GRASS mapset. %1 + + + + + QgsGrassProvider + + + GRASS vector map %1 does not have topology. Build topology? + + + + + QgsGrassRasterProvider + + + cellhd file %1 does not exist + + + + + Groups not yet supported + + + + + QgsGrassRegion + + + + + Warning + + + + + GISDBASE, LOCATION_NAME or MAPSET is not set, cannot display current region. + + + + + Cannot read current region: %1 + + + + + Cannot write region + + + + + QgsGrassRegionBase + + + GRASS Region Settings + + + + + Extent + + + + + North + + + + + West + + + + + East + + + + + South + + + + + Select the extent by dragging on canvas +or change the following values + + + + + Resolution + + + + + Cell width + + + + + Cell height + + + + + Columns + + + + + Rows + + + + + Border + + + + + Color + + + + + Width + + + + + QgsGrassSelect + + + Select GRASS Vector Layer + + + + + Select GRASS Raster Layer + + + + + Select GRASS mapcalc schema + + + + + Select GRASS Mapset + + + + + Choose existing GISDBASE + + + + + Wrong GISDBASE, no locations available. + + + + + Wrong GISDBASE + + + + + Select a map. + + + + + No map + + + + + No layer + + + + + No layers available in this map + + + + + QgsGrassSelectBase + + + Add GRASS Layer + + + + + Gisdbase + + + + + Location + + + + + Mapset + + + + + Map name + + + + + Select or type map name (wildcards '*' and '?' accepted for rasters) + + + + + Layer + + + + + Browse... + + + + + QgsGrassShell + + + Ctrl+Shift+V + + + + + Ctrl+Shift+C + + + + + + Warning + + + + + + Cannot rename the lock file %1 + + + + + QgsGrassTools + + + GRASS Tools + + + + + + GRASS Tools: %1/%2 + + + + + Browser + + + + + Cannot start command shell (%1) + + + + + + + + Warning + + + + + GRASS Shell is not compiled. + + + + + The config file (%1) not found. + + + + + Cannot open config file (%1). + + + + + Cannot read config file (%1): + + + + + +%1 +at line %2 column %3 + + + + + QgsGrassToolsBase + + + Grass Tools + + + + + Modules Tree + + + + + 1 + + + + + Modules List + + + + + Filter + + + + + QgsHandleBadLayers + + + Browse + + + + + Layer name + + + + + Type + + + + + Provider + + + + + New file + + + + + New datasource + + + + + none + + + + + Select file to replace '%1' + + + + + Please select exactly one file. + + + + + Select new directory of selected files + + + + + All files (*) + + + + + + Unhandled layer will be lost. + + + + + + There are still %n unhandled layer(s), that will be lost if you closed now. + unhandled layers + + + + + + + + QgsHandleBadLayersBase + + + Handle bad layers + + + + + Layer name + + + + + Type + + + + + Provider + + + + + Original filename + + + + + New filename + + + + + Original datasource + + + + + New datasource + + + + + QgsHelpViewer + + + <h3>Oops! QGIS can't find help for this form.</h3>The help file for %1 was not found for your language<br>If you would like to create it, contact the QGIS development team + + + + + Quantum GIS Help + + + + + Quantum GIS Help - %1 + + + + + + Error + + + + + Failed to get the help text from the database: + %1 + + + + + The QGIS help database is not installed + + + + + QgsHelpViewerBase + + + + QGIS Help + + + + + about:blank + + + + + &Home + + + + + Alt+H + + + + + &Forward + + + + + Alt+F + + + + + &Back + + + + + Alt+B + + + + + &Close + + + + + Alt+C + + + + + QgsHtmlAnnotationDialog + + + Delete + + + + + html + + + + + QgsHttpTransaction + + + WMS Server responded unexpectedly with HTTP Status Code %1 (%2) + + + + + Received %1 of %2 bytes + + + + + Received %1 bytes (total unknown) + + + + + HTTP response completed, however there was an error: %1 + + + + + HTTP transaction completed, however there was an error: %1 + + + + + Not connected + + + + + Looking up '%1' + + + + + Connecting to '%1' + + + + + Sending request '%1' + + + + + Receiving reply + + + + + Response is complete + + + + + Closing down connection + + + + + Network timed out after %n second(s) of inactivity. +This may be a problem in your network connection or at the WMS server. + inactivity timeout + + + + + + + + QgsIDWInterpolatorDialogBase + + + Dialog + + + + + Distance coefficient P + + + + + QgsIdentifyResults + + + Identify Results + + + + + Feature + + + + + Value + + + + + + (Derived) + + + + + (Actions) + + + + + + + Edit feature form + + + + + + + View feature form + + + + + Print + + + + + Zoom to feature + + + + + Copy attribute value + + + + + Copy feature attributes + + + + + Clear results + + + + + Clear highlights + + + + + Highlight all + + + + + Highlight layer + + + + + Layer properties... + + + + + Expand all + + + + + Collapse all + + + + + Attribute changes + + + + + Could not open url + + + + + Could not open URL '%1' + + + + + QgsIdentifyResultsBase + + + Identify Results + + + + + Expand tree. + + + + + + + + ... + + + + + Collapse tree. + + + + + New results will be expanded by default. + + + + + Print selected HTML response. + + + + + QgsImageWarper + + + Progress indication + + + + + QgsInterpolationDialog + + + + Triangular interpolation (TIN) + + + + + + Inverse Distance Weighting (IDW) + + + + + No input data for interpolation + + + + + Please add one or more input layers + + + + + Output file name invalid + + + + + Please enter a valid output file name + + + + + + Break lines + + + + + + Structure lines + + + + + Points + + + + + Save interpolated raster as... + + + + + QgsInterpolationDialogBase + + + Interpolation plugin + + + + + Input + + + + + Vector layers + + + + + Interpolation attribute + + + + + Use z-Coordinate for interpolation + + + + + Add + + + + + Remove + + + + + Vector layer + + + + + Attribute + + + + + Type + + + + + Output + + + + + Interpolation method + + + + + + ... + + + + + Number of columns + + + + + Number of rows + + + + + Cellsize X + + + + + Cellsize Y + + + + + X min + + + + + X max + + + + + Y min + + + + + Y max + + + + + Set to current extent + + + + + Output file + + + + + Add result to project + + + + + QgsInterpolationPlugin + + + + + &Interpolation + + + + + QgsItemPositionDialogBase + + + Set item position + + + + + Item reference point + + + + + Coordinates + + + + + x + + + + + y + + + + + Width + + + + + Height + + + + + Set Position + + + + + Close + + + + + QgsLUDialogBase + + + Enter class bounds + + + + + Lower value + + + + + Upper value + + + + + QgsLabelDialog + + + Auto + + + + + QgsLabelDialogBase + + + Form1 + + + + + Label Properties + + + + + + Placement + + + + + Below Right + + + + + Right + + + + + Below + + + + + Over + + + + + Above + + + + + Left + + + + + Below Left + + + + + Above Right + + + + + Above Left + + + + + Use scale dependent rendering + + + + + Maximum + + + + + Minimum + + + + + Buffer labels + + + + + Buffer size + + + + + + + In points + + + + + + + In map units + + + + + + Color + + + + + % + + + + + Transparency + + + + + Offset + + + + + X offset + + + + + Y offset + + + + + Basic label options + + + + + Field containing label + + + + + Default label + + + + + Font size + + + + + + Angle (deg) + + + + + ° + + + + + Font + + + + + Multiline labels? + + + + + Label only selected features + + + + + Advanced + + + + + Data defined placement + + + + + Data defined properties + + + + + &Font family + + + + + &Bold + + + + + &Italic + + + + + &Underline + + + + + &Size + + + + + Size units + + + + + &Color + + + + + Strikeout + + + + + Data defined buffer + + + + + Transparency: + + + + + Size: + + + + + Data defined position + + + + + X Coordinate + + + + + Y Coordinate + + + + + X Offset (pts) + + + + + Y Offset (pts) + + + + + Preview: + + + + + QGIS Rocks! + + + + + QgsLabelPropertyDialog + + + + Label font + + + + + Font color + + + + + Buffer color + + + + + QgsLabelPropertyDialogBase + + + Label properties + + + + + Text + + + + + + Font + + + + + + Size + + + + + Display + + + + + Scale-based + + + + + Min + + + + + Max + + + + + Show label + + + + + Ignores priority and permits collisions/overlaps + + + + + Always show (exceptions above) + + + + + Buffer + + + + + Position + + + + + Label distance + + + + + X Coordinate + + + + + Y Coordinate + + + + + Horizontal alignment + + + + + Vertical alignment + + + + + Rotation + + + + + QgsLabelingGui + + + (not found!) + + + + + Sample @ %1 pts (using map units) + + + + + Sample @ %1 pts (using map units, BUFFER IN MILLIMETERS) + + + + + Sample + + + + + Sample (BUFFER NOT SHOWN, in map units) + + + + + Expression based label + + + + + Mixed Case + + + + + All Uppercase + + + + + All Lowercase + + + + + Title Case + + + + + QgsLabelingGuiBase + + + Layer labeling settings + + + + + Label this layer with + + + + + Expression + + + + + + + + + + ... + + + + + Label settings + + + + + Sample + + + + + + Lorem Ipsum + + + + + Sample text + + + + + Reset sample text + + + + + Size for sample text in map units + + + + + Sample background color + + + + + Formatted numbers + + + + + Decimal places + + + + + Show plus sign + + + + + Multiple lines + + + + + Wrap on character + + + + + + Line height + + + + + Line height spacing for multi-line text + + + + + line + + + + + Alignment + + + + + Paragraph style alignment of multi-line text + + + + + + Left + + + + + Center + + + + + + Right + + + + + Text style + + + + + Available typeface styles + + + + + Underlined Text + + + + + U + + + + + Strikeout text + + + + + S + + + + + points + + + + + + + map units + + + + + Style + + + + + + + Transparency + + + + + + % + + + + + TextLabel + + + + + Capitalization style of text + + + + + + Word spacing + + + + + + Letter spacing + + + + + + Space in pixels or map units, relative to size unit choice + + + + + Type case + + + + + Font + + + + + + + Color + + + + + + + Size + + + + + Buffer + + + + + + mm + + + + + Pen Join style + + + + + Color area inside of pen stroke + + + + + Pixel size-based visibility + + + + + Labels will not show if larger than this on screen + + + + + + px + + + + + + Maximum + + + + + Labels will not show if smaller than this on screen + + + + + + Minimum + + + + + + + + < + + + + + Label in Map Units + + + + + Scale-based visibility + + + + + Label + + + + + Advanced + + + + + Priority + + + + + Low + + + + + High + + + + + Placement + + + + + Around point + + + + + Offset from point + + + + + Parallel + + + + + Curved + + + + + Horizontal + + + + + Offset from centroid + + + + + Around centroid + + + + + Horizontal (slow) + + + + + Free (slow) + + + + + Using perimeter + + + + + Centroid of + + + + + visible polygon + + + + + whole polygon + + + + + + In mm + + + + + + In map units + + + + + + degrees + + + + + + + Rotation + + + + + + + Label distance + + + + + Above line + + + + + On line + + + + + Below line + + + + + Line orientation dependent position + + + + + X + + + + + Y + + + + + Above Right + + + + + Above Left + + + + + Over + + + + + Above + + + + + Below Left + + + + + Below + + + + + Below Right + + + + + Options + + + + + Merge connected lines to avoid duplicate labels + + + + + Label every part of multi-part features + + + + + Add direction symbol + + + + + Suppress labeling of features smaller than + + + + + mm + + + + + Features don't act as obstacles for labels + + + + + Automated placement settings + + + + + Show all labels for this layer (including colliding labels) + + + + + Show upside-down labels + + + + + never + + + + + when rotation defined + + + + + always + + + + + Data defined settings + + + + + Buffer properties + + + + + Buffer size + + + + + Buffer color + + + + + Buffer transparency + + + + + Position + + + + + X Coordinate + + + + + Y Coordinate + + + + + Horizontal alignment + + + + + Vertical alignment + + + + + Uncheck to write labeling engine derived rotation on pin and NULL on unpin + + + + + Preserve existing rotation values during label pin/unpin operations + + + + + Display properties + + + + + Always show + + + + + Minimum scale + + + + + Show label + + + + + Maximum scale + + + + + Font properties + + + + + Bold + + + + + Italic + + + + + Underline + + + + + Strikeout + + + + + Font family + + + + + Capitalization + + + + + Multi-line align + + + + + Add label columns to attribute table + + + + + About data defined values + + + + + QgsLayerPropertiesWidget + + + Outline: %1 + + + + + QgsLegend + + + + sub-group + + + + + + group + + + + + Legend context + + + + + &Make to Toplevel Item + + + + + Zoom to Group + + + + + &Remove + + + + + &Set Group CRS + + + + + Re&name + + + + + &Group Selected + + + + + Copy Style + + + + + Paste Style + + + + + &Add New Group + + + + + &Expand All + + + + + &Collapse All + + + + + &Update Drawing Order + + + + + QgsLegendLayer + + + &Zoom to Layer Extent + + + + + &Zoom to Best Scale (100%) + + + + + &Stretch Using Current Extent + + + + + &Show in Overview + + + + + &Remove + + + + + &Duplicate + + + + + &Set Layer CRS + + + + + Set &Project CRS from Layer + + + + + &Open Attribute Table + + + + + + Save As... + + + + + Save Selection As... + + + + + &Query... + + + + + Show Feature Count + + + + + &Properties + + + + + Updating feature count for layer %1 + + + + + Abort + + + + + QgsLegendModel + + + Group + + + + + QgsManageConnectionsDialog + + + Select all + + + + + Clear selection + + + + + Select connections to import + + + + + Import + + + + + Export + + + + + Export/import error + + + + + You should select at least one connection from list. + + + + + Save connections + + + + + XML files (*.xml *.XML) + + + + + Saving connections + + + + + Cannot write file %1: +%2. + + + + + + + + + + + + + + + + + + + + + Loading connections + + + + + + Cannot read file %1: +%2. + + + + + + Parse error at line %1, column %2: +%3 + + + + + The file is not an WMS connections exchange file. + + + + + + The file is not an WFS connections exchange file. + + + + + The file is not an WCS connections exchange file. + + + + + + + The file is not an PostGIS connections exchange file. + + + + + The file is not an MSSQL connections exchange file. + + + + + The file is not an %1 connections exchange file. + + + + + + + + Connection with name '%1' already exists. Overwrite? + + + + + QgsManageConnectionsDialogBase + + + Manage connections + + + + + Select connections to export + + + + + QgsMapCanvas + + + Could not draw %1 because: +%2 + COMMENTED OUT + + + + + Could not draw %1 because: +%2 + + + + + QgsMapCoordsDialog + + + From map canvas + + + + + QgsMapCoordsDialogBase + + + Enter map coordinates + + + + + Enter X and Y coordinates (DMS (dd mm ss.ss), DD (dd.dd) or projected coordinates (mmmm.mm)) which correspond with the selected point on the image. Alternatively, click the button with icon of a pencil and then click a corresponding point on map canvas of QGIS to fill in coordinates of that point. + + + + + X / East: + + + + + Y / North: + + + + + Snap to background layers + + + + + QgsMapLayer + + + + Specify CRS for layer %1 + + + + + + + %1 at line %2 column %3 + + + + + style not found in database + + + + + Error: qgis element could not be found in %1 + + + + + + Loading style file %1 failed because: +%2 + + + + + + + Could not save symbology because: +%1 + + + + + + The directory containing your dataset needs to be writable! + + + + + + Created default style file as %1 + + + + + ERROR: Failed to created default style file as %1. Check file permissions and retry. + + + + + User database could not be opened. + + + + + The style table could not be created. + + + + + The style %1 was saved to database + + + + + The style %1 was updated in the database. + + + + + The style %1 could not be updated in the database. + + + + + The style %1 could not be inserted into database. + + + + + ERROR: Failed to created SLD style file as %1. Check file permissions and retry. + + + + + Unable to open file %1 + + + + + QgsMapRenderer + + + + Transform error caught: %1 + + + + + + CRS + + + + + QgsMapToolAddFeature + + + add feature + + + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer cannot be added to + + + + + The data provider for this layer does not support the addition of features. + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + + + Wrong editing tool + + + + + Cannot apply the 'capture point' tool on this vector layer + + + + + + Coordinate transform error + + + + + + Cannot transform the point to the layers coordinate system + + + + + + Feature added + + + + + Cannot apply the 'capture line' tool on this vector layer + + + + + Cannot apply the 'capture polygon' tool on this vector layer + + + + + + + + Error + + + + + + Cannot add feature. Unknown WKB type + + + + + The feature could not be added because removing the polygon intersections would change the geometry type + + + + + An error was reported during intersection removal + + + + + QgsMapToolAddPart + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + + No feature selected. Please select a feature with the selection tool or in the attribute table + + + + + Several features are selected. Please select only one feature to which an part should be added. + + + + + Error. Could not add part. + + + + + + Part added + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Selected feature is not multi part. + + + + + New part's geometry is not valid. + + + + + New polygon ring not disjoint with existing polygons. + + + + + Several features are selected. Please select only one feature to which an island should be added. + + + + + Selected geometry could not be found + + + + + Error, could not add part + + + + + QgsMapToolAddRing + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Ring added + + + + + A problem with geometry type occured + + + + + The inserted Ring is not closed + + + + + The inserted Ring is not a valid geometry + + + + + The inserted Ring crosses existing rings + + + + + The inserted Ring is not contained in a feature + + + + + An unknown error occured + + + + + Error, could not add ring + + + + + QgsMapToolAddVertex + + + Added vertex + + + + + QgsMapToolCapture + + + Validation started. + + + + + Validation finished. + + + + + QgsMapToolChangeLabelProperties + + + Label properties changed + + + + + QgsMapToolDeletePart + + + + Delete part + + + + + This isn't a multipart geometry. + + + + + Part of multipart feature deleted + + + + + Couldn't remove the selected part. + + + + + QgsMapToolDeleteRing + + + Ring deleted + + + + + QgsMapToolDeleteVertex + + + Vertex deleted + + + + + QgsMapToolFeatureAction + + + No active vector layer + + + + + To run an action, you must choose a vector layer by clicking on its name in the legend + + + + + No actions available + + + + + The active vector layer has no defined actions + + + + + No features at this position found. + + + + + QgsMapToolIdentify + + + No active layer + + + + + To identify features, you must choose an active layer by clicking on its name in the legend + + + + + Identifying on %1... + + + + + Identifying done. + + + + + No features at this position found. + + + + + + (clicked coordinate) + + + + + Length + + + + + firstX + attributes get sorted; translation for lastX should be lexically larger than this one + + + + + firstY + + + + + lastX + attributes get sorted; translation for firstX should be lexically smaller than this one + + + + + lastY + + + + + Area + + + + + feature id + + + + + new feature + + + + + Raster + + + + + QgsMapToolMoveFeature + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Feature moved + + + + + QgsMapToolMoveLabel + + + Label moved + + + + + QgsMapToolMoveVertex + + + Vertex moved + + + + + QgsMapToolNodeTool + + + Inserted vertex + + + + + QgsMapToolOffsetCurve + + + Offset curve + + + + + Offset: + + + + + Geometry error + + + + + Creating offset geometry failed + + + + + QgsMapToolPinLabels + + + Label pinned + + + + + Label unpinned + + + + + QgsMapToolReshape + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Reshape + + + + + QgsMapToolRotateLabel + + + Label rotated + + + + + QgsMapToolRotatePointSymbols + + + No point feature + + + + + No point feature was detected at the clicked position. Please click closer to the feature or enhance the search tolerance under Settings->Options->Digitizing->Serch radius for vertex edits + + + + + No rotation Attributes + + + + + The active point layer does not have a rotation attribute + + + + + Rotate symbol + + + + + QgsMapToolShowHideLabels + + + Label hidden + + + + + Label shown + + + + + QgsMapToolSimplify + + + Geometry simplified + + + + + + Unsupported operation + + + + + Multipart features are not supported for simplification. + + + + + This feature cannot be simplified. Check if feature has enough vertices to be simplified. + + + + + QgsMapToolSplitFeatures + + + Not a vector layer + + + + + The current layer is not a vector layer + + + + + Layer not editable + + + + + Cannot edit the vector layer. Use 'Toggle Editing' to make it editable. + + + + + Coordinate transform error + + + + + Cannot transform the point to the layers coordinate system + + + + + Features split + + + + + + + No feature split done + + + + + If there are selected features, the split tool only applies to the selected ones. If you like to split all features under the split line, clear the selection + + + + + Cut edges detected. Make sure the line splits features into multiple parts. + + + + + The geometry is invalid. Please repair before trying to split it. + + + + + Split error + + + + + An error occured during feature splitting + + + + + QgsMapToolVertexEdit + + + Snap tolerance + + + + + Don't show this message again + + + + + Could not snap segment. + + + + + Have you set the tolerance in Settings > Project Properties > General? + + + + + QgsMapserverExportBase + + + MapServer Export: Save project to MapFile + + + + + Use current project + + + + + Full path to the QGIS project file to export to MapServer map format + + + + + + + + Browse... + + + + + + Map file + + + + + Name for the map file to be created from the QGIS project file + + + + + Save As... + + + + + If checked, only the layer information will be processed + + + + + LAYER information only + + + + + Map + + + + + Name + + + + + Prefix attached to map, scalebar and legend GIF filenames created using this MapFile + + + + + Image type + + + + + Rendering + + + + + Width + + + + + Height + + + + + Units + + + + + MapServer url + + + + + The URL to the mapserver executable. + +For example: +http://my.host.com/cgi-bin/mapserv.exe + + + + + Paths + + + + + Inline + + + + + Symbolset + + + + + Use templates + + + + + Path to the MapServer template file + + + + + The file name of the fonts file. + + + + + Fontset + + + + + The file name of the symbols file. + + + + + Template + + + + + Header + + + + + Footer + + + + + Layer/label options + + + + + Forces labels on, regardless of collisions. Available only for cached labels. + + + + + Force + + + + + Should text be antialiased? Note that this requires more available colors, decreases drawing performance, and results in slightly larger output images. + + + + + Anti-alias + + + + + Can text run off the edge of the map? + + + + + Partials + + + + + Check to allow MapServer to return data in GML format. Useful when used with WMS GetFeatureInfo operations. + + + + + Dump + + + + meters + + + + dd + + + + feet + + + + miles + + + + inches + + + + kilometers + + + + + QgsMeasureBase + + + Measure + + + + + Total + + + + + Segments + + + + + QgsMeasureDialog + + + &New + + + + + The calculations are based on: + + + + + Project CRS transformation is turned off. + + + + + Canvas units setting is taken from project properties setting (%1). + + + + + Ellipsoidal calculation is not possible, as project CRS is undefined. + + + + + Project CRS transformation is turned on and ellipsoidal calculation is selected. + + + + + The coordinates are transformed to the chosen ellipsoid (%1), and the result is in meters + + + + + Project CRS transformation is turned on but ellipsoidal calculation is not selected. + + + + + The canvas units setting is taken from the project CRS (%1). + + + + + Finally, the value is converted from %2 to %3. + + + + + Segments [%1] + + + + + QgsMeasureTool + + + Incorrect measure results + + + + + <p>This map is defined with a geographic coordinate system (latitude/longitude) but the map extents suggests that it is actually a projected coordinate system (e.g., Mercator). If so, the results from line or area measurements will be incorrect.</p><p>To fix this, explicitly set an appropriate map coordinate system using the <tt>Settings:Project Properties</tt> menu. + + + + + QgsMemoryProvider + + + Whole number (integer) + + + + + Decimal number (real) + + + + + Text (string) + + + + + QgsMergeAttributesDialog + + + Id + + + + + Merge + + + + + + + feature %1 + + + + + + Minimum + + + + + + Maximum + + + + + + Median + + + + + + Sum + + + + + + Concatenation + + + + + + Mean + + + + + + + Skip attribute + + + + + Skipped + + + + + QgsMergeAttributesDialogBase + + + Merge feature attributes + + + + + Take attributes from selected feature + + + + + Remove feature from selection + + + + + QgsMessageBar + + + Remaining messages + + + + + Close all + + + + + Close + + + + + more + + + + + QgsMessageLogViewer + + + QGIS Log + + + + + No messages. + + + + + + %1 message(s) logged. + + + + + General + + + + + Timestamp + + + + + Message + + + + + Level + + + + + QgsMessageViewer + + + QGIS Message + + + + + Don't show this message again + + + + + QgsMssqlConnectionItem + + + Edit... + + + + + Delete + + + + + %1: Not a vector layer! + + + + + + %1: OK! + + + + + + Import to MSSQL database + + + + + Failed to import some layers! + + + + + + + Import was successful. + + + + + QgsMssqlNewConnection + + + Saving passwords + + + + + WARNING: You have opted to save your password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. + + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + + + + Test connection + + + + + Connection failed - Host name hasn't been specified. + + + + + + + Connection failed - Database name hasn't been specified. + + + + + + + Connection to %1 was successful + + + + + QgsMssqlNewConnectionBase + + + Create a New MSSQL connection + + + + + Connection Information + + + + + Name + + + + + Provider/DSN + + + + + Host + + + + + Database + + + + + Username + + + + + Password + + + + + Name of the new connection + + + + + Trusted Connection + + + + + Save Username + + + + + &Test Connect + + + + + Save Password + + + + + Only look in the geometry_columns metadata table + + + + + Also list tables with no geometry + + + + + Use estimated table parameters + + + + + QgsMssqlProvider + + + 8 Bytes integer + + + + + 4 Bytes integer + + + + + 2 Bytes integer + + + + + 1 Bytes integer + + + + + Decimal number (numeric) + + + + + Decimal number (decimal) + + + + + Decimal number (real) + + + + + Decimal number (double) + + + + + Text, fixed length (char) + + + + + Text, limited variable length (varchar) + + + + + Text, fixed length unicode (nchar) + + + + + Text, limited variable length unicode (nvarchar) + + + + + Text, unlimited length (text) + + + + + Text, unlimited length unicode (ntext) + + + + + QgsMssqlRootItem + + + New Connection... + + + + + QgsMssqlSchemaItem + + + %1 as %2 in %3 + + + + + as geometryless table + + + + + QgsMssqlSourceSelect + + + Add MSSQL Table(s) + + + + + &Add + + + + + &Build query + + + + + Build query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Schema + + + + + + Table + + + + + + Type + + + + + + Geometry column + + + + + + Primary key column + + + + + + SRID + + + + + + Sql + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + Select Table + + + + + You must select a table in order to add a layer. + + + + + + + + MSSQL Provider + + + + + Stop + + + + + Connect + + + + + QgsMssqlSourceSelectDelegate + + + Select... + + + + + QgsMssqlTableModel + + + Schema + + + + + Table + + + + + Type + + + + + Geometry column + + + + + SRID + + + + + Primary key column + + + + + Select at id + + + + + Sql + + + + + Detecting... + + + + + + + + Select... + + + + + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). + + + + + Enter... + + + + + Point + + + + + Multipoint + + + + + Line + + + + + Multiline + + + + + Polygon + + + + + Multipolygon + + + + + No Geometry + + + + + Unknown Geometry + + + + + QgsMultiBandColorRendererWidget + + + + + Not set + + + + + No enhancement + + + + + Stretch to MinMax + + + + + Stretch and clip to MinMax + + + + + Clip to MinMax + + + + + Red + + + + + Green + + + + + Blue + + + + + QgsMultiBandColorRendererWidgetBase + + + Form + + + + + Red band + + + + + Green band + + + + + Blue band + + + + + Min + + + + + Max + + + + + Contrast enhancement + + + + + QgsNetworkAccessManager + + + Network request %1 timed out + + + + + Network + + + + + QgsNewHttpConnection + + + Create a new %1 connection + + + + + Ignore GetCoverage URI reported in capabilities + + + + + Ignore axis orientation + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + Saving passwords + + + + + WARNING: You have entered a password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. +Note: giving the password is optional. It will be requested interactivly, when needed. + + + + + QgsNewHttpConnectionBase + + + Create a new WMS connection + + + + + Connection details + + + + + URL + + + + + If the service requires basic authentication, enter a user name and optional password + + + + + Password + + + + + &User name + + + + + Name + + + + + Name of the new connection + + + + + HTTP address of the Web Map Server + + + + + Ignore GetFeatureInfo URI reported in capabilities + + + + + Ignore GetMap URI reported in capabilities + + + + + Ignore axis orientation (WMS 1.3/WMTS) + + + + + Invert axis orientation + + + + + QgsNewOgrConnection + + + + Test connection + + + + + Connection failed - Check settings and try again. + +Extended error information: +%1 + + + + + Connection to %1 was successful + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + QgsNewOgrConnectionBase + + + Create a New OGR Database connection + + + + + Connection Information + + + + + Type + + + + + Name + + + + + Name of the new connection + + + + + Host + + + + + Database + + + + + Port + + + + + Username + + + + + Password + + + + + Save Password + + + + + &Test Connect + + + + + QgsNewSpatialiteLayerDialog + + + Text data + + + + + Whole number + + + + + Decimal number + + + + + New SpatiaLite Database File + + + + + SpatiaLite + + + + + + + + SpatiaLite Database + + + + + Unable to open the database + + + + + Error + + + + + Failed to load SRIDS: %1 + + + + + @ + + + + + Registered new database! + + + + + Unable to open the database: %1 + + + + + Error Creating SpatiaLite Table + + + + + Failed to create the SpatiaLite table %1. The database returned: +%2 + + + + + Error Creating Geometry Column + + + + + Failed to create the geometry column. The database returned: +%1 + + + + + Error Creating Spatial Index + + + + + Failed to create the spatial index. The database returned: +%1 + + + + + Invalid Layer + + + + + %1 is an invalid layer and cannot be loaded. + + + + + QgsNewSpatialiteLayerDialogBase + + + New Spatialite Layer + + + + + Database + + + + + Create a new Spatialite database + + + + + ... + + + + + Layer name + + + + + + Name for the new layer + + + + + Geometry column + + + + + geometry + + + + + + + Type + + + + + Point + + + + + Line + + + + + Polygon + + + + + MultiPoint + + + + + Multiline + + + + + Multipolygon + + + + + Spatial Reference Id + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify CRS + + + + + Add an integer id field as the primary key for the new layer + + + + + Create an autoincrementing primary key + + + + + New attribute + + + + + + Name + + + + + An attribute name + + + + + Add attribute to list + + + + + Add to attributes list + + + + + Attributes list + + + + + Delete selected attribute + + + + + Remove attribute + + + + + QgsNewVectorLayerDialog + + + Text data + + + + + Whole number + + + + + Decimal number + + + + + ESRI Shapefile + + + + + Save As + + + + + QgsNewVectorLayerDialogBase + + + New Vector Layer + + + + + File format + + + + + + + Type + + + + + Point + + + + + Line + + + + + Polygon + + + + + New attribute + + + + + + Name + + + + + + Width + + + + + + Precision + + + + + Add attribute to list + + + + + Add to attributes list + + + + + Attributes list + + + + + Delete selected attribute + + + + + Remove attribute + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify CRS + + + + + QgsOGRSublayersDialog + + + Layer ID + + + + + Layer name + + + + + Nb of features + + + + + Geometry type + + + + + QgsOGRSublayersDialogBase + + + Select layers to load + + + + + 1 + + + + + QgsOSMDataProvider + + + Open Street Map format + + + + + QgsOWSConnection + + + WMS Password for %1 + + + + + QgsOWSConnectionItem + + + Edit... + + + + + Delete + + + + + QgsOWSSourceSelect + + + &Add + + + + + Add selected layers to map + + + + + Always cache + + + + + Prefer cache + + + + + Prefer network + + + + + Always network + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + Coordinate Reference System (%n available) + crs count + + + + + + + + Coordinate Reference System + + + + + Could not understand the response: +%1 + + + + + WMS proxies + + + + + Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. + + + + + parse error at row %1, column %2: %3 + + + + + network error: %1 + + + + + The %1 connection already exists. Do you want to overwrite it? + + + + + Confirm Overwrite + + + + + QgsOWSSourceSelectBase + + + Add Layer(s) from a Server + + + + + Ready + + + + + + Layers + + + + + C&onnect + + + + + &New + + + + + Edit + + + + + Delete + + + + + Load connections from file + + + + + Load + + + + + Save connections to file + + + + + Save + + + + + Adds a few example WMS servers + + + + + Add default servers + + + + + ID + + + + + Name + + + + + + Title + + + + + Abstract + + + + + Time + + + + + Coordinate Reference System: + + + + + Selected Coordinate Reference System + + + + + Change ... + + + + + + Format + + + + + Options + + + + + Layer name + + + + + Tile size + + + + + Feature limit for GetFeatureInfo + + + + + Cache + + + + + Cache preference + +Always cache: load from cache, even if it expired + +Prefer cache: load from cache if available, otherwise load from network. Note that this can return possibly stale (but not expired) items from cache + +Prefer network: default value; load from the network if the cached entry is older than the network entry + +Always network: always load from network and do not check if the cache has a valid entry (similar to the "Reload" feature in browsers) + + + + + + Layer Order + + + + + Move selected layer UP + + + + + Up + + + + + Move selected layer DOWN + + + + + Down + + + + + Layer + + + + + Style + + + + + Tilesets + + + + + Styles + + + + + Size + + + + + CRS + + + + + Server Search + + + + + Search + + + + + Description + + + + + URL + + + + + Add selected row to WMS list + + + + + QgsOfflineEditing + + + Could not open the spatialite database + + + + + Unable to initialize SpatialMetadata: + + + + + + Could not create a new database + + + + + + Unable to activate FOREIGN_KEY constraints + + + + + Unknown data type %1 + + + + + QGIS wkbType %1 not supported + + + + + %v / %m features copied + + + + + + %v / %m features processed + + + + + %v / %m fields added + + + + + %v / %m features added + + + + + %v / %m features removed + + + + + %v / %m feature updates + + + + + %v / %m feature geometry updates + + + + + Offline Editing Plugin + + + + + Could not open the spatialite logging database + + + + + QgsOfflineEditingPlugin + + + Convert to offline project + + + + + Create offline copies of selected layers and save as offline project + + + + + + + + &Offline Editing + + + + + Synchronize + + + + + Synchronize offline project with remote layers + + + + + QgsOfflineEditingPluginGui + + + Select target database for offline data + + + + + SpatiaLite DB + + + + + All files + + + + + Offline Editing Plugin + + + + + Converting to offline project. + + + + + Offline database file '%1' exists. Overwrite? + + + + + QgsOfflineEditingPluginGuiBase + + + Create offline project + + + + + Offline data + + + + + Browse... + + + + + Select remote layers + + + + + Show only editable layers + + + + + QgsOfflineEditingProgressDialog + + + Layer %1 of %2.. + + + + + QgsOfflineEditingProgressDialogBase + + + Dialog + + + + + TextLabel + + + + + QgsOgrLayerItem + + + Couldn't open file %1.prj + + + + + + OGR + + + + + Couldn't open file %1.qpj + + + + + QgsOgrProvider + + + Data source is invalid, no layer found (%1) + + + + + + + + + OGR + + + + + Data source is invalid (%1) + + + + + Whole number (integer) + + + + + Decimal number (real) + + + + + Text (string) + + + + + OGR[%1] error %2: %3 + + + + + Unknown + + + + + Read attempt on an invalid OGR data source + + + + + OGR error creating wkb for feature %1: %2 + + + + + type %1 for attribute %2 not found + + + + + OGR error creating feature %1: %2 + + + + + type %1 for field %2 not found + + + + + OGR error creating field %1: %2 + + + + + OGR error deleting field %1: %2 + + + + + Deleting fields is not supported prior to GDAL 1.9.0 + + + + + + + OGR error on feature %1: id too large + + + + + Feature %1 for attribute update not found. + + + + + Field %1 of feature %2 doesn't exist. + + + + + Type %1 of attribute %2 of feature %3 unknown. + + + + + + OGR error setting feature %1: %2 + + + + + OGR error changing geometry: feature %1 not found + + + + + OGR error creating geometry for feature %1: %2 + + + + + OGR error in feature %1: geometry is null + + + + + OGR error setting geometry of feature %1: %2 + + + + + OGR error deleting feature %1: %2 + + + + + Shapefiles without attribute are considered read-only. + + + + + QgsOpenRasterDialog + + + Open raster + + + + + Raster file: + + + + + + ... + + + + + Save raster as: + + + + + Choose a name of the raster + + + + + + Error + + + + + + The selected file is not a valid raster file. + + + + + Choose a name for the modified raster + + + + + -modified + Georeferencer:QgsOpenRasterDialog.cpp - used to modify a user given file name + + + + + QgsOpenVectorLayerDialog + + + Open an OGR Supported Vector Layer + + + + + Open Directory + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + + + + Add vector layer + + + + + No database selected. + + + + + Password for + + + + + Please enter your password: + + + + + No protocol URI entered. + + + + + No layers selected. + + + + + No directory selected. + + + + + QgsOpenVectorLayerDialogBase + + + Add vector layer + + + + + Source type + + + + + File + + + + + Directory + + + + + + Database + + + + + + Protocol + + + + + Encoding + + + + + + + Type + + + + + URI + + + + + Source + + + + + Dataset + + + + + Browse + + + + + Connections + + + + + New + + + + + Edit + + + + + Delete + + + + + QgsOptions + + + None / Planimetric + + + + + Current layer + + + + + Top down, stop at first + + + + + Top down + + + + + Show all features + + + + + Show selected features + + + + + Show features in current canvas + + + + + Always + + + + + If needed + + + + + Never + + + + + Load all + + + + + Check file contents + + + + + Check extension + + + + + No + + + + + Basic scan + + + + + Full scan + + + + + + Cumulative pixel count cut + + + + + Minimum / maximum + + + + + Mean +/- standard deviation + + + + + Detected active locale on your system: %1 + + + + + To vertex + + + + + To segment + + + + + To vertex and segment + + + + + + map units + + + + + + pixels + + + + + + + Semi transparent circle + + + + + + + Cross + + + + + + + None + + + + + Off + + + + + QGIS + + + + + GEOS + + + + + Round + + + + + Mitre + + + + + Bevel + + + + + Central point (fastest) + + + + + Chain (fast) + + + + + Popmusic tabu chain (slow) + + + + + Popmusic tabu (slow) + + + + + Popmusic chain (very slow) + + + + + + + Save default project + + + + + You must set a default project + + + + + Current project saved as default + + + + + Error saving current project as default + + + + + Choose a directory to store project template files + + + + + Selection color + + + + + Create Options - %1 Driver + + + + + Create Options - pyramids + + + + + Parameters : + + + + + + + Choose a directory + + + + + Enter scale + + + + + Scale denominator + + + + + Load scales + + + + + + XML files (*.xml *.XML) + + + + + Save scales + + + + + No Stretch + + + + + Stretch To MinMax + + + + + Stretch And Clip To MinMax + + + + + Clip To MinMax + + + + + + Parameters: + + + + + Can only use ellipsoidal calculations when CRS transformation is enabled + + + + + QgsOptionsBase + + + Options + + + + + General + + + + + Project files + + + + + Prompt to save project changes when required + + + + + Warn when opening a project file saved with an older version of QGIS + + + + + Create new project from default project + + + + + Set current project as default + + + + + Reset default + + + + + Template folder + + + + + Browse + + + + + Reset + + + + + Enable macros + + + + + Never + + + + + Ask + + + + + For this session only + + + + + Always (not recommended) + + + + + Default Map Appearance (overridden by project properties) + + + + + Selection color + + + + + Background color + + + + + Application + + + + + Style <i>(QGIS restart required)</i> + + + + + Icon theme + + + + + Icon size + + + + + 16 + + + + + 24 + + + + + 32 + + + + + Font + + + + + Qt default + + + + + + Size + + + + + Double click action in legend + + + + + Open layer properties + + + + + Open attribute table + + + + + Capitalise layer names in legend + + + + + Display classification attribute names in legend + + + + + Create raster icons in legend + + + + + Hide splash screen at startup + + + + + Show tips at start up + + + + + Open identify results in a dock window (QGIS restart required) + + + + + Open snapping options in a dock window (QGIS restart required) + + + + + Open attribute table in a dock window (QGIS restart required) + + + + + Add PostGIS layers with double click and select in extended mode + + + + + Add new layers to selected or current group + + + + + Copy geometry in WKT representation from attribute table + + + + + Ignore shapefile encoding + + + + + Attribute table behaviour + + + + + Attribute table row cache + + + + + Representation for NULL values + + + + + Prompt for raster sublayers + + + + + Scan for valid items in the browser dock + + + + + Scan for contents of compressed files (.zip) in browser dock + + + + + GDAL + + + + + GDAL Drivers + + + + + In some cases more than one GDAL driver can be used to load the same raster format. Use the list below to specify which to use. + + + + + Name + + + + + ext + + + + + Flags + + + + + Description + + + + + GDAL Driver Options + + + + + Edit Pyramids Options + + + + + Edit Create Options + + + + + Plugins + + + + + Plugin paths + + + + + Path(s) to search for additional C++ plugins libraries + + + + + + + Add + + + + + + + Remove + + + + + Rendering + + + + + Rendering behavior + + + + + By default new la&yers added to the map should be displayed + + + + + <b>Note:</b> Use zero to prevent display updates until all features have been rendered + + + + + Use render caching where possible to speed up redraws + + + + + Enable back buffer (Better graphics performance at the cost of loosing the possibility to cancel rendering and incremental feature drawing) + + + + + Number of features to draw before updating the display + + + + + Map display will be updated (drawn) after this many features have been read from the data source + + + + + Rendering quality + + + + + Make lines appear less jagged at the expense of some drawing performance + + + + + Fix problems with incorrectly filled polygons + + + + + Compatibility + + + + + Use new generation symbology for rendering + + + + + SVG paths + + + + + Path(s) to search for Scalable Vector Graphic (SVG) symbols + + + + + Rasters + + + + + RGB band selection + + + + + Red band + + + + + Green band + + + + + Blue band + + + + + Contrast enhancement + + + + + Single band gray + + + + + Multi band color (byte / band) + + + + + Multi band color (> byte / band) + + + + + Limits (minimum/maximum) + + + + + Cumulative pixel count cut limits + + + + + - + + + + + + % + + + + + Standard deviation multiplier + + + + + Map tools + + + + + Identify + + + + + <b>Note:</b> Specify the search radius as a percentage of the map width + + + + + Search radius for identifying features and displaying map tips + + + + + Mode + + + + + Open feature form, if a single feature is identified + + + + + Panning and zooming + + + + + Zoom factor + + + + + Mouse wheel action + + + + + Zoom + + + + + Zoom and recenter + + + + + Zoom to mouse cursor + + + + + Nothing + + + + + Predefined scales + + + + + + + + + + ... + + + + + Measure tool + + + + + Semi-minor + + + + + Rubberband color + + + + + Preferred measurements units + + + + + Meters + + + + + Feet + + + + + Preferred angle units + + + + + Degrees + + + + + Radians + + + + + Decimal places + + + + + Keep base unit + + + + + Semi-major + + + + + Gon + + + + + Ellipsoid for distance calculations + + + + + Overlays + + + + + Position + + + + + Placement algorithm + + + + + Digitizing + + + + + Rubberband + + + + + Line width + + + + + Line width in pixels + + + + + Line color + + + + + Snapping + + + + + Default snap mode + + + + + Default snapping tolerance + + + + + Search radius for vertex edits + + + + + + map units + + + + + + pixels + + + + + Vertex markers + + + + + Show markers only for selected features + + + + + Marker style + + + + + Marker size + + + + + Other settings + + + + + Suppress attributes pop-up windows after each created feature + + + + + Reuse last entered attribute values + + + + + Validate geometries + + + + + Join style for curve offset + + + + + Quadrantsegments for curve offset + + + + + Miter limit for curve offset + + + + + CRS + + + + + Default Coordinate Reference System for new projects + + + + + + Select... + + + + + Always start new projects with this CRS + + + + + Automatically enable 'on the fly' reprojection if CRS of a new added layer differ from CRS of layer(s) already present. CRS of present layer(s) will be used. + + + + + Automatically enable 'on the fly' reprojection if layers have different CRS + + + + + Enable 'on the &fly' reprojection by default + + + + + Coordinate Reference System for new layers + + + + + When a new layer is created, or when a layer is loaded that has no Coordinate Reference System (CRS) + + + + + Prompt for &CRS + + + + + Use &project CRS + + + + + Use default CRS displa&yed below + + + + + Locale + + + + + Override system locale + + + + + Locale to use instead + + + + + <b>Note:</b> Enabling / changing overide on local requires an application restart + + + + + Additional Info + + + + + Detected active locale on your system: + + + + + Network + + + + + Use proxy for web access + + + + + Host + + + + + Port + + + + + User + + + + + + Leave this blank if no proxy username / password are required + + + + + Password + + + + + Proxy type + + + + + Exclude URLs (starting with) + + + + + Cache settings + + + + + Directory + + + + + Clear + + + + + WMS search address + + + + + Timeout for network requests (ms) + + + + + Default expiration period for WMS-C/WMTS tiles (hours) + + + + + QgsOraclePlugin + + + Add Oracle GeoRaster Layer... + + + + + Add a Oracle Spatial GeoRaster... + + + + + QgsOracleSelectGeoraster + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Password for %1/<password>@%2 + + + + + Please enter your password: + + + + + Open failed + + + + + The connection to %1 failed. Please verify your connection parameters. Make sure you have the GDAL GeoRaster plugin installed. + + + + + QgsPGConnectionItem + + + Failed to retrieve layers + + + + + No layers found. + + + + + Edit... + + + + + Delete + + + + + %1: Not a vector layer! + + + + + + %1: OK! + + + + + + Import to PostGIS database + + + + + Failed to import some layers! + + + + + + + Import was successful. + + + + + QgsPGLayerItem + + + + + Delete layer + + + + + Layer deleted successfully. + + + + + QgsPGRootItem + + + New Connection... + + + + + QgsPGSchemaItem + + + %1 as %2 in %3 + + + + + as geometryless table + + + + + QgsPalettedRendererWidgetBase + + + Form + + + + + Band + + + + + Value + + + + + Color + + + + + QgsPasteTransformations + + + &Add New Transfer + + + + + QgsPasteTransformationsBase + + + Paste Transformations + + + + + <b>Note: This function is not useful yet!</b> + + + + + Source + + + + + Destination + + + + + QgsPenCapStyleComboBox + + + Square + + + + + Flat + + + + + Round + + + + + QgsPenJoinStyleComboBox + + + Bevel + + + + + Miter + + + + + Round + + + + + QgsPenStyleComboBox + + + Solid Line + + + + + No Pen + + + + + Dash Line + + + + + Dot Line + + + + + Dash Dot Line + + + + + Dash Dot Dot Line + + + + + QgsPgNewConnection + + + disable + + + + + allow + + + + + prefer + + + + + require + + + + + Saving passwords + + + + + WARNING: You have opted to save your password. It will be stored in plain text in your project files and in your home directory on Unix-like systems, or in your user profile on Windows. If you do not want this to happen, please press the Cancel button. + + + + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + + Test connection + + + + + Connection to %1 was successful + + + + + Connection failed - Check settings and try again. + + + + + + + QgsPgNewConnectionBase + + + Create a New PostGIS connection + + + + + Connection Information + + + + + Name + + + + + Service + + + + + Host + + + + + Port + + + + + Database + + + + + SSL mode + + + + + Username + + + + + Password + + + + + Name of the new connection + + + + + 5432 + + + + + Restrict the displayed tables to those that are in the layer registries. + + + + + Restricts the displayed tables to those that are found in the layer registries (geometry_columns, geography_columns, topology.layer). This can speed up the initial display of spatial tables. + + + + + Only look in the layer registries + + + + + Restrict the search to the public schema for spatial tables not in the geometry_columns table + + + + + When searching for spatial tables that are not in the geometry_columns tables, restrict the search to tables that are in the public schema (for some databases this can save lots of time) + + + + + Only look in the 'public' schema + + + + + Save Username + + + + + &Test Connect + + + + + Save Password + + + + + Use estimated table statistics for the layer metadata. + + + + + <html> +<body> +<p>When the layer is setup various metadata is required for the PostGIS table. This includes information such as the table row count, geometry type and spatial extents of the data in the geometry column. If the table contains a large number of rows determining this metadata is time consuming.</p> +<p>By activating this option the following fast table metadata operations are done:</p> +<p>1) Row count is determined from table statistics obtained from running the PostgreSQL table analyse function.</p> +<p>2) Table extents are always determined with the estimated_extent PostGIS function even if a layer filter is applied.</p> +<p>3) If the table geometry type is unknown and is not exclusively taken from the geometry_columns table, then it is determined from the first 100 non-null geometry rows in the table.</p> +</body> +</html> + + + + + Use estimated table metadata + + + + + Also list tables with no geometry + + + + + QgsPgSourceSelect + + + &Add + + + + + &Build query + + + + + Build query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Schema + + + + + + Table + + + + + + Type + + + + + + Geometry column + + + + + + Primary key column + + + + + + SRID + + + + + + Sql + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + Select Table + + + + + You must select a table in order to add a layer. + + + + + Stop + + + + + + Postgres/PostGIS Provider + + + + + Could not open the Postgres/PostGIS Provider + + + + + No accessible tables or views found. Check the message log for possible errors. + + + + + Connect + + + + + QgsPgSourceSelectDelegate + + + Select... + + + + + QgsPgTableModel + + + Schema + + + + + Table + + + + + Column + + + + + Data Type + + + + + Spatial Type + + + + + SRID + + + + + Primary Key + + + + + Select at id + + + + + Sql + + + + + Detecting... + + + + + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). + + + + + Select... + + + + + Enter... + + + + + QgsPluginInstaller + + Nothing to remove! Plugin directory doesn't exist: + + + + Failed to remove the directory: + + + + Check permissions or remove it manually + + + + Fetch Python Plugins... + + + + Install more plugins from remote repositories + + + + Looking for new plugins... + + + + QGIS Plugin Installer update + + + + The Plugin Installer has been updated. Please restart QGIS prior to using it + + + + QGIS Plugin Conflict: + + + + The Plugin Installer has detected an obsolete plugin which masks a newer version shipped with this QGIS version. This is likely due to files associated with a previous installation of QGIS. Please use the Plugin Installer to remove that older plugin in order to unmask the newer version shipped with this copy of QGIS. + + + + There is a new plugin available + + + + There is a plugin update available + + + + QGIS Python Plugin Installer + + + + Error reading repository: + + + + Couldn't open the local plugin directory + + + + + QgsPluginInstallerDialog + + QGIS Python Plugin Installer + + + + Error reading repository: + + + + all repositories + + + + connected + + + + This repository is connected + + + + unavailable + + + + This repository is enabled, but unavailable + + + + disabled + + + + This repository is disabled + + + + This repository is blocked due to incompatibility with your Quantum GIS version + + + + orphans + + + + any status + + + + not installed + + + + installed + + + + upgradeable and news + + + + This plugin is not installed + + + + This plugin is installed + + + + This plugin is installed, but there is an updated version available + + + + This plugin is installed, but I can't find it in any enabled repository + + + + This plugin is not installed and is seen for the first time + + + + This plugin is installed and is newer than its version available in a repository + + + + This plugin is incompatible with your Quantum GIS version and probably won't work. + + + + The required Python module is not installed. +For more information, please visit its homepage and Quantum GIS wiki. + + + + This plugin seems to be broken. +It has been installed but can't be loaded. +Here is the error message: + + + + upgradeable + + + + new! + + + + invalid + + + + Note that it's an uninstallable core plugin + + + + installed version + + + + available version + + + + That's the newest available version + + + + There is no version available for download + + + + This plugin is broken + + + + This plugin requires a newer version of Quantum GIS + + + + at least + + + + This plugin requires a missing module + + + + only locally available + + + + Experimental plugin. Use at own risk + + + + - %d plugins available + + + + Install plugin + + + + Reinstall plugin + + + + Upgrade plugin + + + + Install/upgrade plugin + + + + Downgrade plugin + + + + Are you sure you want to downgrade the plugin to the latest available version? The installed one is newer! + + + + Plugin installation failed + + + + Plugin has disappeared + + + + The plugin seems to have been installed but I don't know where. Probably the plugin package contained a wrong named directory. +Please search the list of installed plugins. I'm nearly sure you'll find the plugin there, but I just can't determine which of them it is. It also means that I won't be able to determine if this plugin is installed and inform you about available updates. However the plugin may work. Please contact the plugin author and submit this issue. + + + + Plugin installed successfully + + + + Python plugin installed. +Now you need to enable it in Plugin Manager. + + + + Plugin reinstalled successfully + + + + Python plugin reinstalled. +You need to restart Quantum GIS in order to reload it. + + + + The plugin is designed for a newer version of Quantum GIS. The minimum required version is: + + + + The plugin depends on some components missing on your system. You need to install the following Python module in order to enable it: + + + + The plugin is broken. Python said: + + + + Plugin uninstall failed + + + + Are you sure you want to uninstall the following plugin? + + + + Warning: this plugin isn't available in any accessible repository! + + + + Plugin Installer update uninstalled. Plugin Installer will now close and revert to its primary version. You can find it in the Plugins menu and continue operation. + + + + Plugin Installer update uninstalled. Please restart QGIS in order to load its primary version. + + + + Plugin uninstalled successfully + + + + Python plugin uninstalled. Note that you may need to restart Quantum GIS in order to remove it completely. + + + + Unable to add another repository with the same URL! + + + + Are you sure you want to remove the following repository? + + + + + QgsPluginInstallerDialogBase + + + + QGIS Python Plugin Installer + + + + + Help + + + + + The plugins will be installed to ~/.qgis/python/plugins + + + + + + Close the Installer window + + + + + Close + + + + + Plugins + + + + + List of available and installed plugins + + + + + Filter: + + + + + + Display only plugins containing this word in their metadata + + + + + + Display only plugins from given repository + + + + + all repositories + + + + + + Display only plugins with matching status + + + + + State + + + + + + Status + + + + + + Name + + + + + Version + + + + + Description + + + + + Author + + + + + Repository + + + + + Upgrade all + + + + + + Install, reinstall or upgrade the selected plugin + + + + + Install/upgrade plugin + + + + + + Uninstall the selected plugin + + + + + Uninstall plugin + + + + + Repositories + + + + + List of plugin repositories + + + + + URL + + + + + + Add a new plugin repository + + + + + Add... + + + + + + Edit the selected repository + + + + + Edit... + + + + + + Remove the selected repository + + + + + Delete + + + + + + Add the contributed repository to the list + + + + + Add the contributed repository + + + + + + Remove depreciated repositories from the list + + + + + Delete depreciated repositories + + + + + Options + + + + + Configuration of the plugin installer + + + + + Check for updates on startup + + + + + every time QGIS starts + + + + + once a day + + + + + every 3 days + + + + + every week + + + + + every 2 weeks + + + + + every month + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> If this function is enabled, Quantum GIS will inform you whenever a new plugin or plugin update is available. Otherwise, fetching repositories will be performed during opening of the Plugin Installer window.</p></body></html> + + + + + Allowed plugins + + + + + Only show plugins from the official repository + + + + + Show all plugins except those marked as experimental + + + + + Show all plugins, even those marked as experimental + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-weight:600;">Note:</span> Experimental plugins are generally unsuitable for production use. These plugins are in early stages of development, and should be considered 'incomplete' or 'proof of concept' tools. QGIS does not recommend installing these plugins unless you intend to use them for testing purposes.</p></body></html> + + + + + QgsPluginInstallerFetchingDialog + + Success + + + + Resolving host name... + + + + Connecting... + + + + Host connected. Sending request... + + + + Downloading data... + + + + Idle + + + + Closing connection... + + + + Error + + + + + QgsPluginInstallerFetchingDialogBase + + + Fetching repositories + + + + + Overall progress: + + + + + Abort fetching + + + + + Repository + + + + + State + + + + + QgsPluginInstallerInstallingDialog + + Installing... + + + + Resolving host name... + + + + Connecting... + + + + Host connected. Sending request... + + + + Downloading data... + + + + Idle + + + + Closing connection... + + + + Error + + + + Failed to unzip the plugin package. Probably it's broken or missing from the repository. You may also want to make sure that you have write permission to the plugin directory: + + + + Aborted by user + + + + + QgsPluginInstallerInstallingDialogBase + + + QGIS Python Plugin Installer + + + + + Installing plugin: + + + + + Connecting... + + + + + QgsPluginInstallerOldReposBase + + + Plugin Installer + + + + + The Plugin Installer has detected that your copy of QGIS is configured to use a number of plugin repositories around the world. It was a typical situation in older versions of the program, but from the version 1.5, external plugins are collected in one central Contributed Repository, and all the old repositories are not necessary any more. Do you want to drop them now? If you're unsure what to do, probably you don't need them. However, if you choose to keep them in use, you will be able to remove them manually later. + + + + + Remove + + + + + Disable + + + + + Keep + + + + + Ask me later + + + + + QgsPluginInstallerPluginErrorDialog + + no error message received + + + + + QgsPluginInstallerPluginErrorDialogBase + + + Error loading plugin + + + + + The plugin seems to be invalid or have unfulfilled dependencies. It has been installed, but can't be loaded. If you really need this plugin, you can contact its author or <a href="http://lists.osgeo.org/mailman/listinfo/qgis-user">QGIS users group</a> and try to solve the problem. If not, you can just uninstall it. Here is the error message below: + + + + + Do you want to uninstall this plugin now? If you're unsure, probably you would like to do this. + + + + + QgsPluginInstallerRepositoryDetailsDialogBase + + + Repository details + + + + + Name: + + + + + + Enter a name for the repository + + + + + URL: + + + + + + Enter the repository URL, beginning with "http://" + + + + + + Enable or disable the repository (disabled repositories will be omitted) + + + + + Enabled + + + + + QgsPluginManager + + + &Select All + + + + + &Clear All + + + + + + Plugins + + + + + [ incompatible ] + + + + + + Installed in %1 menu/toolbar + + + + + No Plugins + + + + + No QGIS plugins found in %1 + + + + + Error + + + + + Failed to open plugin installer! + + + + + QgsPluginManagerBase + + + QGIS Plugin Manager + + + + + To enable / disable a plugin, click its checkbox or description + + + + + &Filter + + + + + Plugin Directory: + + + + + Directory + + + + + Plugin Installer + + + + + QgsPointDisplacementRendererWidget + + + + + None + + + + + + Label Font + + + + + Circle color + + + + + Label color + + + + + The point displacement renderer only applies to (single) point layers. +'%1' is not a point layer and cannot be displayed by the point displacement renderer + + + + + QgsPointDisplacementRendererWidgetBase + + + Form + + + + + Center symbol: + + + + + Renderer: + + + + + Renderer settings... + + + + + Displacement circles + + + + + Circle pen width: + + + + + Circle color: + + + + + Circle radius modification: + + + + + Point distance tolerance: + + + + + Labels + + + + + Label attribute: + + + + + Label font... + + + + + Label color: + + + + + Use scale dependent labelling + + + + + max scale denominator: + + + + + QgsPostgresConn + + + Connection to database failed + + + + + + + + + + + + + + + + + + + + + + + + + + + + PostGIS + + + + + error in setting encoding + + + + + undefined return value from encoding setting + + + + + Your database has no working PostGIS support. + + + + + Your PostGIS installation has no GEOS support. Feature selection and identification will not work properly. Please install PostGIS with GEOS support (http://geos.refractions.net) + + + + + SQL:%1 +result:%2 +error:%3 + + + + + + Database connection was successful, but the accessible tables could not be determined. + + + + + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: +%1 + + + + + + Database connection was successful, but the accessible tables could not be determined. +The error message from the database was: +%1 + + + + + Database connection was successful, but no accessible tables were found. Please verify that you have SELECT privilege on a table carrying PostGIS geometry. + + + + + Unable to get list of spatially enabled tables from the database + + + + + Retrieval of postgis version failed + + + + + Could not parse postgis version string '%1' + + + + + Connection error: %1 returned %2 [%3] + + + + + Erroneous query: %1 returned %2 [%3] + + + + + Query failed: %1 +Error: no result buffer + + + + + Not logged query failed: %1 +Error: no result buffer + + + + + Query: %1 returned %2 [%3] + + + + + %1 cursor states lost. +SQL: %2 +Result: %3 (%4) + + + + + resetting bad connection. + + + + + retry after reset succeeded. + + + + + retry after reset failed again. + + + + + connection still bad after reset. + + + + + bad connection, not retrying. + + + + + Point + + + + + Multipoint + + + + + Line + + + + + Multiline + + + + + Polygon + + + + + Multipolygon + + + + + No Geometry + + + + + Unknown Geometry + + + + + None + + + + + Geometry + + + + + Geography + + + + + TopoGeometry + + + + + + Query could not be canceled [%1] + + + + + PQgetCancel failed + + + + + QgsPostgresProvider + + + invalid PostgreSQL layer + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + PostGIS + + + + + Whole number (smallint - 16bit) + + + + + Whole number (integer - 32bit) + + + + + Whole number (integer - 64bit) + + + + + Decimal number (numeric) + + + + + Decimal number (decimal) + + + + + Decimal number (real) + + + + + Decimal number (double) + + + + + Text, fixed length (char) + + + + + Text, limited variable length (varchar) + + + + + Text, unlimited length (text) + + + + + Couldn't get the feature geometry in binary form + + + + + Read attempt on an invalid postgresql data source + + + + + nextFeature() without select() + + + + + + Fetching from cursor %1 failed +Database error: %2 + + + + + feature %1 not found + + + + + found %1 features instead of just one. + + + + + FAILURE: Field %1 not found. + + + + + + unexpected formatted field type '%1' for field %2 + + + + + Field %1 ignored, because of unsupported type %2 + + + + + Field %1 ignored, because of unsupported type type %2 + + + + + Duplicate field %1 found + + + + + + Unable to access the %1 relation. +The error message from the database was: +%2. +SQL: %3 + + + + + PostgreSQL is still in recovery after a database crash +(or you are connected to a (read-only) slave). +Write accesses will be denied. + + + + + Unable to determine table access privileges for the %1 relation. +The error message from the database was: +%2. +SQL: %3 + + + + + The custom query is not a select query. + + + + + Unable to execute the query. +The error message from the database was: +%1. +SQL: %2 + + + + + The table has no column suitable for use as a key. Quantum GIS requires a primary key, a PostgreSQL oid column or a ctid for tables. + + + + + Primary key field '%1' for view not unique. + + + + + Type '%1' of primary key field '%2' for view invalid. + + + + + Key field '%1' for view not found. + + + + + No key field for view given. + + + + + Unexpected relation type '%1'. + + + + + No key field for query given. + + + + + PostGIS error while adding features: %1 + + + + + PostGIS error while deleting features: %1 + + + + + PostGIS error while adding attributes: %1 + + + + + PostGIS error while deleting attributes: %1 + + + + + PostGIS error while changing attributes: %1 + + + + + PostGIS error while changing geometry values: %1 + + + + + result of extents query invalid: %1 + + + + + Geometry type and srid for empty column %1 of %2 undefined. + + + + + Feature type or srid for %1 of %2 could not be determined or was not requested. + + + + + Editing and adding disabled for 2D+ layer (%1; %2) + + + + + QgsProject + + + Unable to open %1 + + + + + Project File Read Error + + + + + %1 at line %2 column %3 + + + + + Project file read error: %1 at line %2 column %3 + + + + + %1 for file %2 + + + + + Unable to save to file %1 + + + + + %1 is not writable. Please adjust permissions (if possible) and try again. + + + + + Unable to save to file %1. Your project may be corrupted on disk. Try clearing some space on the volume and check file permissions before pressing save again. + + + + + QgsProjectBadLayerGuiHandler + + + Ignore + + + + + QGIS Project Read Error + + + + + Unable to open one or more project layers. +Choose ignore to continue loading without the missing layers. Choose cancel to return to your pre-project load state. Choose OK to try to find the missing layers. + + + + + QgsProjectLayerGroupDialog + + + Select project file + + + + + QGis files + + + + + Recursive embedding not possible + + + + + It is not possible to embed layers / groups from the current project. + + + + + QgsProjectLayerGroupDialogBase + + + Select layers and groups to embed + + + + + Project file + + + + + ... + + + + + QgsProjectProperties + + + Layer + + + + + Type + + + + + Identifiable + + + + + Vector + + + + + WMS + + + + + Raster + + + + + + Coordinate System Restriction + + + + + No coordinate systems selected. Disabling restriction. + + + + + Selection color + + + + + CRS %1 was already selected + + + + + Coordinate System Restrictions + + + + + The current selection of coordinate systems will be lost. +Proceed? + + + + + Select print composer + + + + + Composer Title + + + + + Select restricted layers and groups + + + + + Enter scale + + + + + Scale denominator + + + + + Load scales + + + + + + XML files (*.xml *.XML) + + + + + Save scales + + + + + Transparency %1% + + + + + Select a valid symbol + + + + + Invalid symbol : + + + + + QgsProjectPropertiesBase + + + Project Properties + + + + + General + + + + + General settings + + + + + Project title + + + + + Descriptive project name + + + + + Default project title + + + + + Selection color + + + + + Background color + + + + + absolute + + + + + relative + + + + + Save paths + + + + + Used when CRS transformation is turned off + + + + + Canvas units + + + + + Meters + + + + + Feet + + + + + Degree + + + + + Degree display + + + + + Decimal degrees + + + + + Degrees, Minutes + + + + + Degrees, Minutes, Seconds + + + + + Precision + + + + + Automatically sets the number of decimal places in the mouse position display + + + + + The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display + + + + + Automatic + + + + + + Sets the number of decimal places to use for the mouse position display + + + + + Manual + + + + + + The number of decimal places for the manual option + + + + + decimal places + + + + + Project scales + + + + + + + + + + + + ... + + + + + Coordinate Reference System (CRS) + + + + + Enable 'on the fly' CRS transformation + + + + + Identifiable layers + + + + + + Layer + + + + + Type + + + + + Identifiable + + + + + Default Styles + + + + + Default Symbols + + + + + Marker + + + + + Line + + + + + Fill + + + + + Color Ramp + + + + + Style Manager + + + + + Options + + + + + Assign random colors to symbols + + + + + Opacity + + + + + OWS Server + + + + + Service Capabilitities + + + + + Person + + + + + Title + + + + + Organization + + + + + Online resource + + + + + E-Mail + + + + + Phone + + + + + Abstract + + + + + Fees + + + + + Access constraints + + + + + Keyword list + + + + + WMS Capabilitities + + + + + Advertised Extent + + + + + Min. X + + + + + Min. Y + + + + + Max. X + + + + + Max. Y + + + + + Use Current Canvas Extent + + + + + Coordinate Systems Restrictions + + + + + Add + + + + + Remove + + + + + Used + + + + + Exclude composers + + + + + Exclude layers + + + + + Add WKT geometry to feature info response + + + + + Advertised WMS url + + + + + Maximum width + + + + + Maximum height + + + + + WFS Capabilitities + + + + + Published + + + + + Update + + + + + Insert + + + + + Delete + + + + + Unselect all + + + + + Select all + + + + + Macros + + + + + Python macros + + + + + QgsProjectionSelector + + + User Defined Coordinate Systems + + + + + Geographic Coordinate Systems + + + + + Projected Coordinate Systems + + + + + Resource Location Error + + + + + Error reading database file from: + %1 +Because of this the projection selector will not work... + + + + + QgsProjectionSelectorBase + + + Coordinate Reference System Selector + + + + + Filter + + + + + Recently used coordinate reference systems + + + + + + Coordinate Reference System + + + + + + Authority ID + + + + + + ID + + + + + Coordinate reference systems of the world + + + + + Hide deprecated CRSs + + + + + QgsQueryBuilder + + + &Test + + + + + &Clear + + + + + Query Result + + + + + The where clause returned %n row(s). + returned test rows + + + + + + + + + + Query Failed + + + + + + + An error occurred when executing the query. + + + + + + +The data provider said: +%1 + + + + + Error in Query + + + + + The subset string could not be set + + + + + QgsQueryBuilderBase + + + Query Builder + + + + + Datasource + + + + + Fields + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of fields in this vector file</p></body></html> + + + + + Values + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">List of values for the current field.</p></body></html> + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Take a <span style=" font-weight:600;">sample</span> of records in the vector file</p></body></html> + + + + + Sample + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Retrieve <span style=" font-weight:600;">all</span> the record in the vector file (<span style=" font-style:italic;">if the table is big, the operation can consume some time</span>)</p></body></html> + + + + + All + + + + + Use unfiltered layer + + + + + Operators + + + + + = + + + + + < + + + + + NOT + + + + + OR + + + + + AND + + + + + % + + + + + IN + + + + + NOT IN + + + + + != + + + + + > + + + + + LIKE + + + + + ILIKE + + + + + >= + + + + + <= + + + + + SQL where clause + + + + + QgsQuickPrint + + + Please wait while your report is generated + COMMENTED OUT + + + + + km + + + + + mm + + + + + cm + + + + + m + + + + + miles + + + + + mile + + + + + inches + + + + + foot + + + + + feet + + + + + degree + + + + + degrees + + + + + unknown + + + + + QgsRasterCalcDialog + + + Enter result file + + + + + Expression valid + + + + + Expression invalid + + + + + QgsRasterCalcDialogBase + + + Raster calculator + + + + + Raster bands + + + + + Result layer + + + + + Output layer + + + + + ... + + + + + Current layer extent + + + + + X min + + + + + XMax + + + + + Y min + + + + + Y max + + + + + Columns + + + + + Rows + + + + + Output format + + + + + Add result to project + + + + + Operators + + + + + + + + + + + * + + + + + sqrt + + + + + sin + + + + + ^ + + + + + acos + + + + + ( + + + + + - + + + + + / + + + + + cos + + + + + asin + + + + + tan + + + + + atan + + + + + ) + + + + + < + + + + + > + + + + + = + + + + + OR + + + + + AND + + + + + <= + + + + + >= + + + + + Raster calculator expression + + + + + QgsRasterDataProvider + + + Identify + + + + + Build Pyramids + + + + + Create Datasources + + + + + Remove Datasources + + + + + no data + + + + + Feature info + + + + + Band + + + + + Average + + + + + Nearest Neighbour + + + + + Gauss + + + + + Cubic + + + + + Mode + + + + + None + + + + + QgsRasterFormatSaveOptionsWidget + + + Default + + + + + + No compression + + + + + + Low compression + + + + + + High compression + + + + + + Lossy compression + + + + + Cannot get create options for driver %1 + + + + + No help available + + + + + Create Options: + +%1 + + + + + Valid + + + + + Invalid creation option : + +%1 + +Click on help button to get valid creation options for this format + + + + + Cannot validate + + + + + Profile name: + + + + + Use simple interface + + + + + Use table interface + + + + + QgsRasterFormatSaveOptionsWidgetBase + + + Form + + + + + New + + + + + Remove + + + + + Reset + + + + + Profile + + + + + Name + + + + + Value + + + + + + + + + + + Validate + + + + + Help + + + + + - + + + + + Insert KEY=VALUE pairs separated by spaces + + + + + QgsRasterHistogramWidget + + + Visibility + + + + + Show min/max markers + + + + + Show all bands + + + + + Show RGB/Gray band(s) + + + + + Show selected band + + + + + Reset + + + + + Load min/max + + + + + Estimate (faster) + + + + + Actual (slower) + + + + + Current extent + + + + + Use stddev (1.0) + + + + + Use stddev (custom) + + + + + Load for each band + + + + + Recompute Histogram + + + + + Band %1 + + + + + Choose a file name to save the map image as + + + + + QgsRasterHistogramWidgetBase + + + Form + + + + + Band + + + + + Min + + + + + Pick Min value on graph + + + + + + ... + + + + + Max + + + + + Pick Max value on graph + + + + + Prefs/Actions + + + + + Save plot + + + + + Save as image... + + + + + Compute Histogram + + + + + QgsRasterLayer + + + + + + + Not Set + + + + + QgsRasterLayer created + + + + + Retrieving stats for %1 + + + + + Could not reproject view extent: %1 + + + + + + + + Raster + + + + + Could not reproject layer extent: %1 + + + + + Cannot read data + + + + + null (no data) + + + + + Driver: + + + + + No Data Value + + + + + NoDataValue not set + + + + + Data Type: + + + + + GDT_Byte - Eight bit unsigned integer + + + + + GDT_UInt16 - Sixteen bit unsigned integer + + + + + GDT_Int16 - Sixteen bit signed integer + + + + + GDT_UInt32 - Thirty two bit unsigned integer + + + + + GDT_Int32 - Thirty two bit signed integer + + + + + GDT_Float32 - Thirty two bit floating point + + + + + GDT_Float64 - Sixty four bit floating point + + + + + GDT_CInt16 - Complex Int16 + + + + + GDT_CInt32 - Complex Int32 + + + + + GDT_CFloat32 - Complex Float32 + + + + + GDT_CFloat64 - Complex Float64 + + + + + Could not determine raster data type. + + + + + Pyramid overviews: + + + + + Layer Spatial Reference System: + + + + + Layer Extent (layer original source projection): + + + + + Project Spatial Reference System: + + + + + + Band + + + + + Band No + + + + + No Stats + + + + + No stats collected yet + + + + + Min Val + + + + + Max Val + + + + + Range + + + + + Mean + + + + + Sum of squares + + + + + Standard Deviation + + + + + Sum of all cells + + + + + Cell Count + + + + + Cannot instantiate the '%1' data provider + + + + + Provider is not valid (provider: %1, URI: %2 + + + + + <maplayer> not found. + + + + + GDAL data type %1 is not supported + + + + + QgsRasterLayerProperties + + + Not Set + + + + + Description + + + + + Large resolution raster layers can slow navigation in QGIS. + + + + + By creating lower resolution copies of the data (pyramids) performance can be considerably improved as QGIS selects the most suitable resolution to use depending on the level of zoom. + + + + + You must have write access in the directory where the original data is stored to build pyramids. + + + + + Please note that building internal pyramids may alter the original data file and once created they cannot be removed! + + + + + Please note that building internal pyramids could corrupt your image - always make a backup of your data first! + + + + + Layer Properties - %1 + + + + + + Nearest neighbour + + + + + + Bilinear + + + + + + Cubic + + + + + + Average + + + + + None + + + + + + Red + + + + + + Green + + + + + + Blue + + + + + + + + + Percent Transparent + + + + + + Gray + + + + + + Indexed Value + + + + + From + + + + + To + + + + + not defined + + + + + Columns: %1 + + + + + Rows: %1 + + + + + Columns: + + + + + + + + n/a + + + + + Rows: + + + + + + No-Data Value: + + + + + No-Data Value: %1 + + + + + + Write access denied + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + + Building pyramids failed. + + + + + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. + + + + + + Building pyramid overviews is not supported on this type of raster. + + + + + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. + + + + + Save file + + + + + + Textfile + + + + + QGIS Generated Transparent Pixel Value Export File + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + Open file + + + + + Import Error + + + + + The following lines contained errors + +%1 + + + + + Read access denied + + + + + Read access denied. Adjust the file permissions and try again. + + + + + + + + Default Style + + + + + Load layer properties from style file + + + + + + QGIS Layer Style File + + + + + + Saved Style + + + + + Save layer properties as style file + + + + + Filter + + + + + Bands + + + + + QgsRasterLayerPropertiesBase + + + Raster Layer Properties + + + + + Save Style ... + + + + + Load Style ... + + + + + Save As Default + + + + + Restore Default Style + + + + + Style + mRendererTab + + + + + Render type + + + + + Resampling + + + + + Zoomed in + + + + + Zoomed out + + + + + Oversampling + + + + + Transparency + + + + + Global transparency + + + + + None + + + + + 00% + + + + + <p align="right">Full</p> + + + + + No data value + + + + + Use original source no data value. + + + + + No data value: + + + + + Original data source no data value, if exists. + + + + + <src no data value> + + + + + + Additional user defined no data value. + + + + + Additional no data value + + + + + Custom transparency options + + + + + Transparency band + + + + + Transparent pixel list + + + + + Add values manually + + + + + + + + + + ... + + + + + Add Values from display + + + + + Remove selected row + + + + + Default values + + + + + Import from file + + + + + Export to file + + + + + General + + + + + Display name + + + + + Layer source + + + + + Columns + + + + + Rows + + + + + No Data + + + + + Scale dependent visibility + + + + + MInimum scale denominator. + + + + + Maximum scale: + + + + + Minimum scale (maximum scale denominator). + + + + + Maximum scale (minimum scale denominator). + + + + + Maximum scale denominator + + + + + Minimum scale + + + + + + Current + + + + + Coordinate reference system + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify... + + + + + Thumbnail + + + + + Legend + + + + + Palette + + + + + Metadata + + + + + Title + + + + + Abstract + + + + + Pyramids + + + + + Average + + + + + Nearest Neighbour + + + + + Build pyramids + + + + + Notes + + + + + Pyramid resolutions + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Cantarell'; font-size:11pt;"><br /></span></p></body></html> + + + + + Resampling method + + + + + Overview format + + + + + External + + + + + Internal (if possible) + + + + + External (Erdas Imagine) + + + + + Histogram + + + + + Pipe + + + + + QgsRasterLayerSaveAsDialog + + + From + + + + + To + + + + + Select output directory + + + + + Select output file + + + + + + layer + + + + + + user defined + + + + + Resolution (current: %1) + + + + + map view + + + + + Extent (current: %1) + + + + + Layer (%1, %2) + + + + + Project (%1, %2) + + + + + Selected (%1, %2) + + + + + QgsRasterLayerSaveAsDialogBase + + + Save raster layer as... + + + + + Output mode + + + + + Write out raw raster layer data. Optionally user defined no data values may be applied. + + + + + Raw data + + + + + Write out 3 bands RGB image rendered using current layer style. + + + + + Rendered image + + + + + Format + + + + + Save as + + + + + Browse... + + + + + CRS + + + + + Change ... + + + + + Extent + + + + + West + + + + + East + + + + + North + + + + + South + + + + + Layer extent + + + + + Map view extent + + + + + Resolution + + + + + Horizontal + + + + + Columns + + + + + Rows + + + + + Layer resolution + + + + + Layer size + + + + + Vertical + + + + + Create Options + + + + + Tiles + + + + + + Maximum number of columns in one tile. + + + + + Max columns + + + + + + Maximum number of rows in one tile. + + + + + Max rows + + + + + Create VRT + + + + + Additional no data values. The specified values will be set to no data in output raster. + + + + + No data values + + + + + Add values manually + + + + + + + + ... + + + + + Load user defined fully transparent (100%) values + + + + + Remove selected row + + + + + Clear all + + + + + Pyramids + + + + + Resolutions + + + + + Pyramid resolutions corresponding to levels given + + + + + Use existing + + + + + QgsRasterMinMaxWidgetBase + + + Form + + + + + Load min/max values + + + + + Cumulative count cut + + + + + - + + + + + % + + + + + Min / max + + + + + Mean +/- standard deviation × + + + + + Extent + + + + + Full + + + + + Current + + + + + Accuracy + + + + + Actual (slower) + + + + + Estimate (faster) + + + + + Load + + + + + QgsRasterPyramidsOptionsWidgetBase + + + Form + + + + + Custom levels + + + + + External + + + + + Internal (if possible) + + + + + External (Erdas Imagine) + + + + + Insert positive integer values separated by spaces + + + + + Average + + + + + Nearest Neighbour + + + + + Overview format + + + + + Create Options + + + + + Levels + + + + + Resampling method + + + + + QgsRasterRenderer + + + Unknown + + + + + User defined + + + + + Estimated + + + + + Exact + + + + + min / max + + + + + of + + + + + QgsRasterTerrainAnalysisDialog + + + Export Frequency distribution as csv + + + + + Export Colors and elevations as xml + + + + + Import Colors and elevations from xml + + + + + Error opening file + + + + + The relief color file could not be opened + + + + + Error parsing xml + + + + + The xml file could not be loaded + + + + + Enter result file + + + + + Enter lower elevation class bound + + + + + + Elevation + + + + + Enter upper elevation class bound + + + + + Select color for relief class + + + + + QgsRasterTerrainAnalysisDialogBase + + + Dialog + + + + + Elevation layer + + + + + Output layer + + + + + ... + + + + + Output format + + + + + Z factor + + + + + Add result to project + + + + + Illumination + + + + + Azimuth (horizontal angle) + + + + + Vertical angle + + + + + Relief colors + + + + + Create automatically + + + + + Export distribution... + + + + + Up + + + + + Down + + + + + + + + + + + - + + + + + Lower bound + + + + + Upper bound + + + + + Color + + + + + Export colors... + + + + + Import colors... + + + + + QgsRasterTerrainAnalysisPlugin + + + Terrain analysis + + + + + + Slope + + + + + + Aspect + + + + + + Hillshade + + + + + + Relief + + + + + Ruggedness index + + + + + Calculating hillshade... + + + + + + + + + Abort + + + + + Calculating relief... + + + + + Calculating slope... + + + + + Calculating aspect... + + + + + Ruggedness + + + + + Calculating ruggedness... + + + + + QgsRendererRulePropsDialog + + + Rule properties + + + + + Label + + + + + + Filter + + + + + ... + + + + + Test + + + + + Description + + + + + Scale range + + + + + Min. scale + + + + + + 1 : + + + + + Max. scale + + + + + Symbol + + + + + Error + + + + + Filter expression parsing error: + + + + + + Evaluation error + + + + + Filter returned %n feature(s) + number of filtered features + + + + + + + + QgsRendererV2DataDefinedMenus + + + Rotation field + + + + + Size scale field + + + + + + Scale area + + + + + + Scale diameter + + + + + + + - no field - + + + + + QgsRendererV2PropertiesDialog + + + Symbology + + + + + Do you wish to use the original symbology implementation for this layer? + + + + + QgsRendererV2PropsDialogBase + + + Renderer settings + + + + + Old symbology + + + + + This renderer doesn't implement a graphical interface. + + + + + QgsRendererV2Widget + + + Change color + + + + + Change transparency + + + + + Change output unit + + + + + Change width + + + + + Change size + + + + + Transparency + + + + + Change symbol transparency [%] + + + + + Symbol unit + + + + + Select symbol unit + + + + + + Millimeter + + + + + Map unit + + + + + Width + + + + + Change symbol width + + + + + Size + + + + + Change symbol size + + + + + QgsRuleBasedRendererV2Model + + + (no filter) + + + + + <li><nobr>%1 features also in rule %2</nobr></li> + + + + + Label + + + + + Rule + + + + + Min. scale + + + + + Max.scale + + + + + Count + + + + + Duplicate count + + + + + Number of features in this rule. + + + + + Number of features in this rule which are also present in other rule(s). + + + + + QgsRuleBasedRendererV2Widget + + + Add + + + + + Edit + + + + + Remove + + + + + Refine current rules + + + + + Count features + + + + + Rendering order... + + + + + Add scales to rule + + + + + Add categories to rule + + + + + Add ranges to rule + + + + + Refine a rule to categories + + + + + Refine a rule to ranges + + + + + + Scale refinement + + + + + Parent rule %1 must have a symbol for this operation. + + + + + Please enter scale denominators at which will split the rule, separate them by commas (e.g. 1000,5000): + + + + + Error + + + + + "%1" is not valid scale denominator, ignoring it. + + + + + Calculating feature count. + + + + + Abort + + + + + QgsRunProcess + + + <b>Starting %1...</b> + + + + + Action + + + + + Unable to run command +%1 + + + + + Done + + + + + Unable to run command %1 + + + + + QgsSLConnectionItem + + + Database does not exist + + + + + Failed to open database + + + + + Failed to check metadata + + + + + Failed to get list of tables + + + + + Unknown error + + + + + Delete + + + + + %1: Not a vector layer! + + + + + + %1: OK! + + + + + + Import to SpatiaLite database + + + + + Failed to import some layers! + + + + + + + Import was successful. + + + + + QgsSLLayerItem + + + + + Delete layer + + + + + Layer deleted successfully. + + + + + QgsSLRootItem + + + New Connection... + + + + + Create database... + + + + + New SpatiaLite Database File + + + + + SpatiaLite + + + + + + Create SpatiaLite database + + + + + The database has been created + + + + + Failed to create the database: + + + + + + QgsSVGFillSymbolLayerWidget + + + Select svg texture file + + + + + QgsSearchQueryBuilder + + + Search query builder + + + + + &Test + + + + + &Clear + + + + + &Save... + + + + + Save query to an xml file + + + + + &Load... + + + + + Load query from xml file + + + + + Search results + + + + + Found %n matching feature(s). + test result + + + + + + + + + Search string parsing error + + + + + Evaluation error + + + + + Error during search + + + + + No Records + + + + + The query you specified results in zero records being returned. + + + + + Save query to file + + + + + + + + Error + + + + + Could not open file for writing + + + + + Load query from file + + + + + Query files + + + + + All files + + + + + Could not open file for reading + + + + + File is not a valid xml document + + + + + File is not a valid query document + + + + + Select attribute + + + + + There is no attribute '%1' in the current vector layer. Please select an existing attribute + + + + + QgsSelectedFeature + + + Validation started. + + + + + Validation finished (%n error(s) found). + number of geometry errors + + + + + + + + ring %1, vertex %2 + + + + + polygon %1, ring %2, vertex %3 + + + + + polyline %1, vertex %2 + + + + + vertex %1 + + + + + point %1 + + + + + single point + + + + + QgsShapeFile + + + Scanning + + + + + + + The database gave an error while executing this SQL: +%1 +The error was: +%2 + + + + + + The database gave an error while executing this SQL: + + + + + ... (rest of SQL trimmed) + is appended to a truncated SQL statement + + + + + The error was: +%1 + + + + + + QgsSingleBandGrayRendererWidget + + + Black to white + + + + + White to black + + + + + No enhancement + + + + + Stretch to MinMax + + + + + Stretch and clip to MinMax + + + + + Clip to MinMax + + + + + QgsSingleBandGrayRendererWidgetBase + + + Form + + + + + Contrast enhancement + + + + + Gray band + + + + + Min + + + + + Max + + + + + Color gradient + + + + + QgsSingleBandPseudoColorRendererWidget + + + + + + + Discrete + + + + + + + + + + Linear + + + + + + + Exact + + + + + + Equal interval + + + + + Custom color map entry + + + + + Load Color Map + + + + + The color map for band %1 failed to load + + + + + Open file + + + + + + Textfile (*.txt) + + + + + Import Error + + + + + The following lines contained errors + + + + + + + Read access denied + + + + + Read access denied. Adjust the file permissions and try again. + + + + + + + Save file + + + + + QGIS Generated Color Map Export File + + + + + Write access denied + + + + + Write access denied. Adjust the file permissions and try again. + + + + + + + QgsSingleBandPseudoColorRendererWidgetBase + + + Form + + + + + Band + + + + + Color interpolation + + + + + Add values manually + + + + + + + + + + ... + + + + + Remove selected row + + + + + Load color map from band + + + + + Load color map from file + + + + + Export color map to file + + + + + Value + + + + + Color + + + + + Label + + + + + Generate new color map + + + + + Classes + + + + + Colors + + + + + Classify + + + + + Min + + + + + Max + + + + + Mode + + + + + Min / max origin: + + + + + Min / Max origin + + + + + Invert colors order + + + + + QgsSingleSymbolDialog + + + Refresh markers + + + + + + None + + + + + Texture + + + + + Open File + + + + + Images + + + + + QgsSingleSymbolDialogBase + + + Single Symbol + + + + + Point Symbol + + + + + Size + + + + + In map units + + + + + Label + + + + + Fill options + + + + + ... + + + + + Outline options + + + + + Width + + + + + Drawing by field + + + + + Rotation + + + + + Area scale + + + + + Symbol + + + + + QgsSingleSymbolRendererV2Widget + + + Symbol levels... + + + + + QgsSmartGroupConditionWidget + + + Form + + + + + The Symbol + + + + + QgsSmartGroupEditorDialog + + + Invalid name + + + + + The smart group name field is empty. Kindly provide a name + + + + + QgsSmartGroupEditorDialogBase + + + Smart Group Editor + + + + + Smart Group Name + + + + + Condition matches + + + + + Add Condition + + + + + Conditions + + + + + QgsSnappingDialog + + + Snapping and Digitizing Options + + + + + + to vertex + + + + + + to segment + + + + + to vertex and segment + + + + + map units + + + + + pixels + + + + + QgsSnappingDialogBase + + + Snapping options + + + + + Layer + + + + + Mode + + + + + Tolerance + + + + + Units + + + + + Avoid Int. + + + + + Avoid intersections of new polygons + + + + + Enable topological editing + + + + + Enable snapping on intersection + + + + + QgsSpatiaLiteConnection + + + + + unknown error cause + + + + + QgsSpatiaLiteProvider + + + Binary object (BLOB) + + + + + Text + + + + + Decimal number (double) + + + + + Whole number (integer) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SQLite error: %2 +SQL: %1 + + + + + + + + + + + + + + + + + + + + + + + + + + SpatiaLite + + + + + + + + + + + + + unknown cause + + + + + SQLite error getting feature: %1 + + + + + FAILURE: Field %1 not found. + + + + + QgsSpatiaLiteSourceSelect + + + Add SpatiaLite Table(s) + + + + + Databases + + + + + &Add + + + + + &Build Query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Table + + + + + + Type + + + + + + Geometry column + + + + + + Sql + + + + + @ + + + + + Choose a SpatiaLite/SQLite DB to open + + + + + SpatiaLite DB + + + + + All files + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Select Table + + + + + You must select a table in order to add a Layer. + + + + + + SpatiaLite DB Open Error + + + + + Database does not exist: %1 + + + + + Failure while connecting to: %1 + +%2 + + + + + SpatiaLite getTableInfo Error + + + + + Failure exploring tables from: %1 + +%2 + + + + + SpatiaLite Error + + + + + Unexpected error when working with: %1 + +%2 + + + + + QgsSpatiaLiteTableModel + + + Table + + + + + Type + + + + + Geometry column + + + + + Sql + + + + + Point + + + + + Multipoint + + + + + Line + + + + + Multiline + + + + + Polygon + + + + + Multipolygon + + + + + QgsSpatialQueryDialog + + + The spatial query requires at least two vector layers + + + + + %n selected geometries + selected geometries + + + + + + + + Selected geometries + + + + + %1)Query + + + + + Begin at %L1 + + + + + < %1 > + + + + + Total of features = %1 + + + + + Total of invalid features: + + + + + Finish at %L1 (processing time %L2 minutes) + + + + + Using the field "%1" for subset + + + + + Sorry! Only this providers are enable: OGR, POSTGRES and SPATIALITE. + + + + + + %1 of %2 + + + + + all = %1 + + + + + %1 of %2(selected features) + + + + + Create new selection + + + + + Add to current selection + + + + + Remove from current selection + + + + + Result query + + + + + Invalid source + + + + + Invalid reference + + + + + %1 of %2 selected by "%3" + + + + + user + + + + + Map "%1" "on the fly" transformation. + + + + + enable + + + + + disable + + + + + Coordinate reference system(CRS) of +"%1" is invalid(see CRS of provider). + + + + + + +CRS of map is %1. +%2. + + + + + Zoom to feature + + + + + Missing reference layer + + + + + Select reference layer! + + + + + Missing target layer + + + + + Select target layer! + + + + + Create new layer from items + + + + + + The query from "%1" using "%2" in field not possible. + + + + + Create new layer from selected + + + + + %1 of %2 identified + + + + + DEBUG + + + + + QgsSpatialQueryDialogBase + + + Spatial Query + + + + + Layer on which the topological operation will select geometries + + + + + Select source features from + + + + + Select the target layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will only consider selected geometries of the target layer</span></p></body></html> + + + + + + Selected feature(s) only + + + + + Where the feature + + + + + Select the topological operation + + + + + Layer whose geometries will be used as reference by the topological operation + + + + + Reference features of + + + + + Select the reference layer + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:8pt;">When checked the operation will be only consider selected geometries of the reference layer</span></p></body></html> + + + + + And use the result to + + + + + Selected features + + + + + + Number of selected features in map + + + + + Create layer with selected + + + + + Result feature ID's + + + + + Select one FID to identify geometry of feature + + + + + Create layer with list of items + + + + + Zoom to item + + + + + Check to show log processing of query + + + + + Log messages + + + + + Run query or close the window + + + + + QgsSpatialQueryPlugin + + + + + &Spatial Query + + + + + Query not executed + + + + + DEBUG + + + + + QgsSpatialiteSridsDialogBase + + + Select a Spatialite Spatial Reference System + + + + + + SRID + + + + + Authority + + + + + Reference Name + + + + + Search + + + + + Filter + + + + + Name + + + + + QgsSpit + + + File Name + + + + + Feature Class + + + + + Features + + + + + DB Relation Name + + + + + Schema + + + + + Are you sure you want to remove the [%1] connection and all associated settings? + + + + + Confirm Delete + + + + + Add Shapefiles + + + + + Shapefiles + + + + + All files + + + + + The following Shapefile(s) could not be loaded: + + + + + + + REASON: File cannot be opened + + + + + REASON: One or both of the Shapefile files (*.dbf, *.shx) missing + + + + + General Interface Help: + + + + + PostgreSQL Connections: + + + + + [New ...] - create a new connection + + + + + [Edit ...] - edit the currently selected connection + + + + + [Remove] - remove the currently selected connection + + + + + -you need to select a connection that works (connects properly) in order to import files + + + + + -when changing connections Global Schema also changes accordingly + + + + + Shapefile List: + + + + + [Add ...] - open a File dialog and browse to the desired file(s) to import + + + + + [Remove] - remove the currently selected file(s) from the list + + + + + [Remove All] - remove all the files in the list + + + + + [SRID] - Reference ID for the shapefiles to be imported + + + + + [Use Default (SRID)] - set SRID to -1 + + + + + [Geometry Column Name] - name of the geometry column in the database + + + + + [Use Default (Geometry Column Name)] - set column name to 'the_geom' + + + + + [Global Schema] - set the schema for all files to be imported into + + + + + [Import] - import the current shapefiles in the list + + + + + [Quit] - quit the program + + + + + + [Help] - display this help dialog + + + + + + + + + + + + + + + + + + + + + + Import Shapefiles + + + + + + You need to specify a Connection first + + + + + Password for %1 + + + + + Please enter your password: + + + + + Connection failed - Check settings and try again + + + + + PostGIS not available + + + + + <p>The chosen database does not have PostGIS installed, but this is required for storage of spatial data.</p> + + + + + You need to add shapefiles to the list first + + + + + Importing files + + + + + Cancel + + + + + Progress + + + + + Problem inserting features from file: + + + + + %1 +Invalid table name. + + + + + %1 +No fields detected. + + + + + %1 +The following fields are duplicates: +%2 + + + + + Importing files +%1 + + + + + + + + + + + + + %1 +<p>Error while executing the SQL:</p><p>%2</p><p>The database said:%3</p> + + + + + Import Shapefiles - Relation Exists + + + + + The Shapefile: +%1 +will use [%2] relation for its data, +which already exists and possibly contains data. +To avoid data loss change the "DB Relation Name" +for this Shapefile in the main dialog file list. + +Do you want to overwrite the [%2] relation? + + + + + %1 of %2 shapefiles could not be imported. + + + + + QgsSpitBase + + + SPIT - Shapefile to PostGIS Import Tool + + + + + PostgreSQL connections + + + + + + Connect to PostGIS + + + + + Connect + + + + + + Create a new PostGIS connection + + + + + New + + + + + + Edit the current PostGIS connection + + + + + Edit + + + + + + Remove the current PostGIS connection + + + + + + Remove + + + + + Import options and shapefile list + + + + + Geometry column name + + + + + + Set the geometry column name to the default value + + + + + Use default geometry column name + + + + + SRID + + + + + + Set the SRID to the default value + + + + + Use default SRID + + + + + Primary key column name + + + + + Global schema + + + + + + Add a shapefile to the list of files to be imported + + + + + Add + + + + + + Remove the selected shapefile from the import list + + + + + + Remove all the shapefiles from the import list + + + + + Remove All + + + + + QgsSpitPlugin + + + &Import Shapefiles to PostgreSQL + + + + + Import shapefiles into a PostGIS-enabled PostgreSQL database. The schema and field names can be customized on import + + + + + + &Spit + + + + + QgsSponsorsBase + + + QGIS Sponsors + + + + + TextLabel + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">We work really hard to make this nice software for you. See all the cool features it has? Get a warm fuzzy feeling when you use it? Quantum GIS is a labour of love by a dedicated team of developers. We want you to copy &amp; share it and put it in the hands of as many people as possible. If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of Quantum GIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project. Please see the </span><a href="http://qgis.org/en/sponsorship.html"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">QGIS Sponsorship Web Page</span></a><span style=" font-size:10pt;"> for more details. In the list below you can see the fine people and companies that are helping us financially - a great big 'thank you' to you all!</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">2011 Sponsors</span></p> +<hr /> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">SILVER SPONSORS</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.vorarlberg.at"><span style=" font-family:'Courier New,courier'; font-size:10pt; text-decoration: underline; color:#0000ff;">State of Vorarlberg</span></a><span style=" font-family:'Courier New,courier'; font-size:10pt;"> </span><span style=" font-family:'Courier New,courier'; font-size:10pt; color:#333333;">, Austria (11.2011)</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.agi.so.ch"><span style=" font-family:'Courier New,courier'; font-size:10pt; text-decoration: underline; color:#0000ff;">Kanton Solothurn</span></a><span style=" font-family:'Courier New,courier'; font-size:10pt; color:#333333;">, Switzerland (4.2011)</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">BRONZE SPONSORS</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gis.uster.ch/"><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; text-decoration: underline; color:#0000ff;">City of Uster</span></a><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; color:#0000ff;"> </span><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; color:#000000;">, Switzerland</span><span style=" font-family:'Helvetica,Arial,sans-serif'; color:#000000;"> (11.2011)</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.municipia.pt"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Municípia, SA</span></a></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">2010 Sponsors</span></p> +<hr /> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">BRONZE SPONSORS</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.gfosservices.com"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Studio Associato Gfosservices</span></a></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://nextgis.org"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">NEXTGIS</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;"></p></body></html> + + + + + QgsSqlAnywhereProvider + + + Failed to load interface + + + + + Failed to connect to database + + + + + A connection to the SQL Anywhere database cannot be established. + + + + + No suitable key column + + + + + The source relation %1 has no column suitable for use as a unique key. + +Quantum GIS requires that the relation has an integer column no larger than 32 bits containing unique values. + + + + + Error loading attributes + + + + + Ambiguous field! + + + + + Duplicate field %1 found + + + + + + Error describing bind parameters + + + + + Error binding parameters + + + + + Error inserting features + + + + + Error deleting features + + + + + Error adding attributes + + + + + Error deleting attributes + + + + + Attribute not found + + + + + Error updating attributes + + + + + Error updating features + + + + + Error verifying geometry column %1 + + + + + Unknown geometry type + + + + + Column %1 has a geometry type of %2, which Quantum GIS does not currently support. + + + + + Mixed Spatial Reference Systems + + + + + Column %1 is not restricted to a single SRID, which Quantum GIS requires. + + + + + Error checking database ReadOnly property + + + + + Error loading SRS definition + + + + + Because Quantum GIS supports only planar data, the SQL Anywhere data provider will transform the data to the compatible planar projection (SRID=%1). + + + + + Because Quantum GIS supports only planar data and no compatible planar projection was found, the SQL Anywhere data provider will attempt to transform the data to planar WGS 84 (SRID=%1). + + + + + Limited Support of Round Earth SRS + + + + + Column %1 (%2) contains geometries belonging to a round earth spatial reference system (SRID=%3). %4 + +Updates to geometry values will be disabled, and query performance may be poor because spatial indexes will not be utilized. To improve performance, consider creating a spatial index on a new (possibly computed) column containing a planar projection of these geometries. For help, refer to the descriptions of the ST_SRID(INT) and ST_Transform(INT) methods in the SQL Anywhere documentation. + + + + + QgsStyleV2ExportImportDialog + + + Select all + + + + + Clear selection + + + + + Import style(s) + + + + + Select symbols to import + + + + + Import + + + + + Export style(s) + + + + + Export + + + + + + Export/import error + + + + + You should select at least one symbol/color ramp. + + + + + Save styles + + + + + XML files (*.xml *.XML) + + + + + Error when saving selected symbols to file: +%1 + + + + + Import error + + + + + An error occured during import: +%1 + + + + + Group Name + + + + + Please enter a name for new group: + + + + + imported + + + + + New Group + + + + + New group cannot be created without a name. Kindly enter a name. + + + + + New group + + + + + Cannot create a group without name. Enter a name. + + + + + + Duplicate names + + + + + Symbol with name '%1' already exists. +Overwrite? + + + + + Color ramp with name '%1' already exists. +Overwrite? + + + + + Load styles + + + + + XML files (*.xml *XML) + + + + + Downloading style ... + + + + + HTTP Error! + + + + + Download failed: %1. + + + + + QgsStyleV2ExportImportDialogBase + + + Styles import/export + + + + + Import from + + + + + Location + + + + + Save to group + + + + + Select symbols to export + + + + + QgsStyleV2ManagerDialog + + + + Type here to filter symbols ... + + + + + Marker symbol (%1) + + + + + Line symbol (%1) + + + + + Fill symbol (%1) + + + + + Color ramp (%1) + + + + + + + Gradient + + + + + + + Random + + + + + + + ColorBrewer + + + + + + + cpt-city + + + + + new symbol + + + + + new marker + + + + + new line + + + + + new fill symbol + + + + + Symbol Name + + + + + Please enter a name for new symbol: + + + + + + Save symbol + + + + + Cannot save symbol without name. Enter a name. + + + + + Symbol with name '%1' already exists. Overwrite? + + + + + Color ramp type + + + + + Please select color ramp type: + + + + + new ramp + + + + + new gradient ramp + + + + + new random ramp + + + + + Color Ramp Name + + + + + Please enter a name for new color ramp: + + + + + Save Color Ramp + + + + + Cannot save color ramp without name. Enter a name. + + + + + Save color ramp + + + + + Color ramp with name '%1' already exists. Overwrite? + + + + + + Invalid Selection + + + + + The parent group you have selected is not user editable. +Kindly select a user defined group. + + + + + Operation Not Allowed + + + + + Creation of nested smart groups are not allowed +Select the 'Smart Group' to create a new group. + + + + + Invalid selection + + + + + Cannot delete system defined categories. +Kindly select a group or smart group you might want to delete. + + + + + Error! + + + + + New group could not be created. +There was a problem with your symbol database. + + + + + Database Error + + + + + There was a problem with the Symbols database while regrouping. + + + + + You have not selected a Smart Group. Kindly select a Smart Group to edit. + + + + + Database Error! + + + + + There was some error while editing the smart group. + + + + + QgsStyleV2ManagerDialogBase + + + Style Manager + + + + + Marker + + + + + Line + + + + + Fill + + + + + Color ramp + + + + + Tags + + + + + Add item + + + + + Edit item + + + + + Edit + + + + + Remove item + + + + + Share + + + + + QgsSvgAnnotationDialog + + + Delete + + + + + html + + + + + QgsSvgMarkerSymbolLayerV2Widget + + + Select SVG file + + + + + SVG files + + + + + QgsSymbolLevelsV2Dialog + + + Layer %1 + + + + + QgsSymbolLevelsV2DialogBase + + + Symbol Levels + + + + + Enable symbol levels + + + + + Define the order in which the symbol layers are rendered. The numbers in the cells define in which rendering pass the layer will be drawn. + + + + + QgsSymbolV2SelectorDialog + + + Invalid Selection! + + + + + Kindly select a symbol to add layer. + + + + + QgsSymbolV2SelectorDialogBase + + + Symbol selector + + + + + Symbol layers + + + + + Add symbol layer + + + + + Remove symbol layer + + + + + Lock layer's color + + + + + Move up + + + + + Move down + + + + + QgsSymbolsListWidget + + + Symbol name + + + + + Please enter name for the symbol: + + + + + New symbol + + + + + Save symbol + + + + + Symbol with name '%1' already exists. Overwrite? + + + + + Transparency %1% + + + + + QgsTINInterpolatorDialog + + + Linear + + + + + + Clough-Toucher (cubic) + + + + + Save triangulation to file + + + + + QgsTINInterpolatorDialogBase + + + Triangle based interpolation + + + + + Interpolation method + + + + + Export triangulation to shapefile after interpolation + + + + + Output file + + + + + ... + + + + + QgsTextAnnotationDialog + + + Delete + + + + + Select font color + + + + + Select background color + + + + + QgsTextAnnotationDialogBase + + + Annotation text + + + + + B + + + + + I + + + + + Background color + + + + + QgsTileScaleWidget + + + Form + + + + + Tile scale + + + + + QgsTipFactory + + + Quantum GIS is open source + + + + + Quantum GIS is open source software. This means that the software source code can be freely viewed and modified. The GPL places a restriction that any modifications you make must be made available in source form to whoever you give modified versions to, and that you can not create a new version of Quantum GIS under a 'closed source' license. Visit <a href="http://qgis.org"> the QGIS home page (http://qgis.org)</a> for more information. + + + + + QGIS Publications + + + + + If you write a scientific paper or any other article that refers to QGIS we would love to include your work in the <a href="http://www.qgis.org/en/community/qgis-case-studies.html">case studies section</a> of the Quantum GIS home page (http://http://www.qgis.org/en/community/qgis-case-studies.html). + + + + + Become an QGIS translator + + + + + Would you like to see QGIS in your native language? We are looking for more translators and would appreciate your help! The translation process is fairly straight forward - instructions are available in the QGIS wiki <a href="http://www.qgis.org/wiki/GUI_Translation">translator's page (http://www.qgis.org/wiki/GUI_Translation).</a> + + + + + QGIS Mailing lists + + + + + If you need help using QGIS we have a 'users' mailing list where users help each other with issues related to using our sofware. We also have a 'developers' mailing list. for those wanting help and to discuss things relating to the QGIS code base. Details on how to subscribe are in the <a href="http://www.qgis.org/en/community/mailing-lists.html">community section</a> of the QGIS home page (http://www.qgis.org/en/community/mailing-lists.html). + + + + + Is it 'QGIS' or 'Quantum GIS'? + + + + + Both are correct. For articles we suggest you write 'Quantum GIS (QGIS) is ....' and then refer to it as QGIS thereafter. + + + + + How do I refer to Quantum GIS? + + + + + QGIS is spelled in all caps. We have various subprojects of the QGIS project and it will help to avoid confusion if you refer to each by its name:<ul><li>QGIS Library - this is the C++ library that contains the core logic that is used to build the QGIS user interface and other applications.</li><li>QGIS Application - this is the desktop application that you know and love so much :-).</li><li>QGIS Mapserver - this is a server-side application based on the QGIS Library that will serve up your .qgs projects using the WMS protocol.</li></ul> + + + + + Add the current date to a map layout + + + + + You can add a current date variable to your map layout. Create a regular text label and add the string $CURRENT_DATE(yyyy-MM-dd) to the text box. See the <a href="http://doc.qt.nokia.com/latest/qdate.html#toString">QDate::toString format documentation</a> for the possible date formats. + + + + + Moving Elements and Maps in the Print Composer + + + + + In the print composer tool bar you can find two buttons for moving elements. The left one (a selection cursor with the hand symbol) selects and moves elements in the layout. After selecting the element with this tool you can also move them around with the arrow keys. For accurate positioning use the <strong>Position and Size</strong> dialogue, which can be found in the tab <strong>Item &rarr; General Options &rarr; Position and Size</strong>. For easier positioning you can also set specific anchor points of the element within this dialogue. The other move tool (the globe icon combined with the hand icon) allows one to move the map content within a map frame. + + + + + Lock an element in the layout view + + + + + By left clicking an element in the layout view you can select it, by right clicking an element you can lock it. A lock symbol will appear in the upper left corner of the selected element. This prevents the element from accidentally being moved with the mouse. While in a locked state, you cannot move an element with the mouse but you can still move it with the arrow keys or by absolutely positioning it by setting its <strong>Position and Size</strong>. + + + + + Rotating a map and linking a north arrow + + + + + You can rotate a map by setting its rotation value in the <strong>Item tab &rarr; Map</strong> section. To place a north arrow in your layout you can use the <strong>Add Image</strong> tool, the button with the little camera icon. QGIS comes with a selection of north arrows. After the placement of the north arrow in the layout you can link it with a specific map frame by activating the <strong>Sync with map</strong> checkbox and selecting a map frame. Whenever you change the rotation value of a linked map, the north arrow will now automatically adjust its rotation. + + + + + Numeric scale value in map layout linked to map frame + + + + + If you want to place a text label as a placeholder for the current scale, linked to a map frame, you need to place a scalebar and set the style to 'Numeric'. You also need to select the map frame, if there is more than one. + + + + + Using the mouse scroll wheel + + + + + You can use the scroll wheel on your mouse to zoom in, out and pan the map. Scroll forwards to zoom in, scroll backwards to zoom out and press and hold the scroll wheel down to pan the map. You can configure options for scroll wheel behaviour in the Options panel. + + + + + Stopping rendering + + + + + Sometimes you have a very large dataset which takes ages to draw. You can press 'esc' (the escape key), or click the small red 'X' icon in the status bar to the bottom right of the window at any time to halt rendering. If you are going to be performing several actions (e.g. modifying symbology options) and wish to temporarily disable map rendering while you do so, you can uncheck the 'Render' checkbox in the bottom right of the status bar. Don't forget to check it on again when you are ready to have the map draw itself again! + + + + + Join intersected polylines when rendering + + + + + When applying layered styles to a polyline layer, you can join intersecting lines together simply by enabling symbol levels. The image below shows a before (left) and after (right) view of an intersection when symbol levels are enabled. + + + + + Auto-enable on the fly projection + + + + + In the options dialog, under the CRS tab, you can set QGIS so that whenever you create a new project, 'on the fly projection' is enabled automatically and a pre-selected Coordinate Reference System of your choice is used. + + + + + Sponsor QGIS + + + + + If QGIS is saving you money or you like our work and have the financial ability to help, please consider sponsoring the development of Quantum GIS. We use money from sponsors to pay for travel and costs related to our bi-annual hackfests, and to generally support the goals of our project. Please see the <a href="http://qgis.org/en/sponsorship.html">QGIS Sponsorship Web Page</a> for more details. + + + + + Quantum GIS has Plugins! + + + + + Quantum GIS has plugins that extend its functionality. QGIS ships with some core plugins you can explore from the Plugins->Manage Plugins menu. In addition there are over 150 Python plugins contributed by the user community that can be installed from the Plugins->Fetch Python Plugins menu. Don't miss out on all QGIS has to offer---check out the plugins and see what they can do for you. + + + + + QgsTipGui + + + &Previous + + + + + &Next + + + + + QgsTipGuiBase + + + QGIS Tips! + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">A nice tip goes here...</span></p></body></html> + + + + + I've had enough tips, don't show this on start up any more! + + + + + QgsTransformOptionsDialog + + + Dialog + + + + + Select transformation type: + + + + + Linear + + + + + Polynomial 1 + + + + + Polynomial 2 + + + + + Polynomial 3 + + + + + Thin plate spline (TPS) + + + + + Generate ESRI world file (.tfw) + + + + + QgsTransformSettingsDialog + + + Transformation settings + + + + + Transformation type: + + + + + Resampling method: + + + + + Nearest neighbour + + + + + + + Linear + + + + + Cubic + + + + + Cubic Spline + + + + + Lanczos + + + + + Compression: + + + + + Output raster: + + + + + + + + ... + + + + + Target SRS: + + + + + Generate pdf report: + + + + + Set Target Resolution + + + + + Horizontal + + + + + Vertical + + + + + Create world file + + + + + Generate pdf map: + + + + + Use 0 for transparency when needed + + + + + Load in QGIS when done + + + + + Helmert + + + + + Polynomial 1 + + + + + Polynomial 2 + + + + + Polynomial 3 + + + + + Thin Plate Spline + + + + + Projective + + + + + + + Info + + + + + Please set output name + + + + + %1 requires at least %2 GCPs. Please define more + + + + + Invalid output file name + + + + + Save raster + + + + + + Select save PDF file + + + + + + PDF Format + + + + + _modified + Georeferencer:QgsOpenRasterDialog.cpp - used to modify a user given file name + + + + + QgsUniqueValueDialog + + + default + + + + + Confirm Delete + + + + + The classification field was changed from '%1' to '%2'. +Should the existing classes be deleted before classification? + + + + + QgsUniqueValueDialogBase + + + Form1 + + + + + Classification field + + + + + Classify + + + + + Add class + + + + + Delete classes + + + + + Randomize Colors + + + + + Reset Colors + + + + + Restrict changes to common properties + + + + + QgsVectorColorBrewerColorRampV2DialogBase + + + ColorBrewer ramp + + + + + Scheme name + + + + + Colors + + + + + Preview + + + + + QgsVectorDataProvider + + + Codec %1 not found. Falling back to system locale + + + + + Add Features + + + + + Delete Features + + + + + Change Attribute Values + + + + + Add Attributes + + + + + Delete Attributes + + + + + Create Spatial Index + + + + + Fast Access to Features at ID + + + + + Change Geometries + + + + + QgsVectorFieldSymbolLayerWidget + + + X attribute + + + + + Y attribute + + + + + Length attribute + + + + + Angle attribute + + + + + Height attribute + + + + + QgsVectorGradientColorRampV2Dialog + + + + + + Offset of the stop + + + + + + + + Please enter offset in percents (%) of the new stop + + + + + QgsVectorGradientColorRampV2DialogBase + + + Gradient color ramp + + + + + Color 1 + + + + + + Change + + + + + Color 2 + + + + + Multiple stops + + + + + Add stop + + + + + Remove stop + + + + + Color + + + + + Offset + + + + + Preview + + + + + QgsVectorLayer + + + Updating feature count for layer %1 + + + + + Abort + + + + + Unknown renderer + + + + + No renderer object + + + + + Classification field not found + + + + + renderer failed to save + + + + + no renderer + + + + + ERROR: no provider + + + + + ERROR: layer not editable + + + + + SUCCESS: %n attribute(s) deleted. + deleted attributes count + + + + + + + + ERROR: %n attribute(s) not deleted. + not deleted attributes count + + + + + + + + SUCCESS: %n attribute(s) added. + added attributes count + + + + + + + + ERROR: %n new attribute(s) not added + not added attributes count + + + + + + + + SUCCESS: attribute %1 was added. + + + + + ERROR: attribute %1 not added + + + + + SUCCESS: %n attribute value(s) changed. + changed attribute values count + + + + + + + + ERROR: %n attribute value change(s) not applied. + not changed attribute values count + + + + + + + + SUCCESS: %n feature(s) added. + added features count + + + + + + + + ERROR: %n feature(s) not added. + not added features count + + + + + + + + ERROR: %n feature(s) not added - provider doesn't support adding features. + not added features count + + + + + + + + SUCCESS: %n geometries were changed. + changed geometries count + + + + + + + + ERROR: %n geometries not changed. + not changed geometries count + + + + + + + + SUCCESS: %n feature(s) deleted. + deleted features count + + + + + + + + ERROR: %n feature(s) not deleted. + not deleted features count + + + + + + + + + Provider errors: + + + + + Commit errors: + %1 + + + + + General: + + + + + Layer comment: %1 + + + + + Storage type of this layer: %1 + + + + + Source for this layer: %1 + + + + + Geometry type of the features in this layer: %1 + + + + + The number of features in this layer: %1 + + + + + Editing capabilities of this layer: %1 + + + + + Extents: + + + + + In layer spatial reference system units : + + + + + + xMin,yMin %1,%2 : xMax,yMax %3,%4 + + + + + unknown extent + + + + + + In project spatial reference system units : + + + + + Layer Spatial Reference System: + + + + + Project (Output) Spatial Reference System: + + + + + (Invalid transformation of layer extents) + + + + + Attribute field info: + + + + + Field + + + + + Type + + + + + Length + + + + + Precision + + + + + Comment + + + + + QgsVectorLayerProperties + + + + + QGIS Layer Style File + + + + + + + SLD File + + + + + Layer Properties - %1 + + + + + + Stop editing mode to enable this. + + + + + Transparency: %1% + + + + + + Single Symbol + + + + + + Graduated Symbol + + + + + + Continuous Color + + + + + + Unique Value + + + + + Insert expression + + + + + This button opens the query builder and allows you to create a subset of features to display on the map canvas rather than displaying all features in the layer + + + + + The query used to limit the features in the layer is shown here. To enter or modify the query, click on the Query Builder button + + + + + + Spatial Index + + + + + Creation of spatial index successful + + + + + Creation of spatial index failed + + + + + + Default Style + + + + + Load layer properties from style file + + + + + Load Style + + + + + Save layer properties as style file + + + + + Saved Style + + + + + Symbology + + + + + Do you wish to use the new symbology implementation for this layer? + + + + + Save Style + + + + + Save Style... + + + + + QgsVectorLayerPropertiesBase + + + Layer Properties + + + + + Restore Default Style + + + + + Save As Default + + + + + Load Style ... + + + + + Save Style ... + + + + + Style + + + + + Legend type + + + + + Transparency + + + + + New symbology + + + + + Labels + + + + + Labels (deprecated) + + + + + Display labels + + + + + Fields + + + + + General + + + + + Options + + + + + CRS + + + + + Create Spatial Index + + + + + + Specify the coordinate reference system of the layer's geometry. + + + + + Specify CRS + + + + + Update Extents + + + + + Use scale dependent rendering + + + + + + Maximum scale (minimum scale denominator). + + + + + Minimum scale: + + + + + Minimum scale denominator. + + + + + Maximum scale: + + + + + Minimum scale (maximum scale denominator). + + + + + + Set current + + + + + Subset + + + + + Query Builder + + + + + Provider-specific options + + + + + Encoding + + + + + Display + + + + + Legend display text + + + + + Map Tip display text + + + + + Inserts an expression into the action + + + + + Insert expression... + + + + + The valid attribute names for this layer + + + + + Inserts the selected field into the action + + + + + Insert field + + + + + HTML + + + + + Field + + + + + Metadata + + + + + Title + + + + + Abstract + + + + + Actions + + + + + Joins + + + + + Join layer + + + + + Join field + + + + + Target field + + + + + Diagrams + + + + + QgsVectorLayerSaveAsDialog + + + Layer CRS + + + + + Project CRS + + + + + Selected CRS + + + + + Save layer as... + + + + + Select the coordinate reference system for the vector file. The data points will be transformed from the layer coordinate reference system. + + + + + QgsVectorLayerSaveAsDialogBase + + + Save vector layer as... + + + + + Save as + + + + + + Browse + + + + + Encoding + + + + + Format + + + + + OGR creation options + + + + + Data source + + + + + Layer + + + + + This allows one to surpress attribute creation as some OGR drivers (eg. DGN, DXF) don't support it. + + + + + Skip attribute creation + + + + + Add saved file to map + + + + + CRS + + + + + QgsVectorRandomColorRampV2DialogBase + + + Random color ramp + + + + + Hue + + + + + + + from + + + + + + + to + + + + + Saturation + + + + + Value + + + + + Classes + + + + + Preview + + + + + QgsWCSConnectionItem + + + Edit... + + + + + Delete + + + + + QgsWCSRootItem + + + New Connection... + + + + + QgsWCSSourceSelect + + + Select a layer + + + + + No CRS selected + + + + + QgsWFSConnectionItem + + + Edit... + + + + + Delete + + + + + Modify WFS connection + + + + + QgsWFSData + + + Loading WFS data +%1 + + + + + Abort + + + + + QgsWFSProvider + + + unknown + + + + + received %1 bytes from %2 + + + + + Error + + + + + QgsWFSRootItem + + + New Connection... + + + + + Create a new WFS connection + + + + + QgsWFSSourceSelect + + + Network Error + + + + + Capabilities document is not valid + + + + + Server Exception + + + + + Error + + + + + No Layers + + + + + capabilities document contained no layers. + + + + + Create a new WFS connection + + + + + Modify WFS connection + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + QgsWFSSourceSelectBase + + + Add WFS Layer from a Server + + + + + Server connections + + + + + C&onnect + + + + + &New + + + + + Edit + + + + + Delete + + + + + Load connections from file + + + + + Load + + + + + Save connections to file + + + + + Save + + + + + Title + + + + + Name + + + + + Abstract + + + + + Cache +Features + + + + + Filter + + + + + Coordinate reference system + + + + + Change ... + + + + + QgsWMSConnection + + + WMS Password for %1 + + + + + QgsWMSConnectionItem + + + Edit... + + + + + Delete + + + + + QgsWMSRootItem + + + New Connection... + + + + + QgsWMSSourceSelect + + + &Add + + + + + Add selected layers to map + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Load connections + + + + + XML files (*.xml *XML) + + + + + encoding %1 not supported. + + + + + WMS Provider + + + + + Could not open the WMS Provider + + + + + Options (%n coordinate reference systems available) + crs count + + + + + + + + Select layer(s) + + + + + Select layer(s) or a tileset + + + + + Select either layer(s) or a tileset + + + + + Coordinate Reference System (%n available) + crs count + + + + + + + + No common CRS for selected layers. + + + + + No CRS selected + + + + + No image encoding selected + + + + + %n Layer(s) selected + selected layer count + + + + + + + + Tileset selected + + + + + Could not understand the response. The %1 provider said: +%2 + + + + + WMS proxies + + + + + Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. + + + + + parse error at row %1, column %2: %3 + + + + + network error: %1 + + + + + The %1 connection already exists. Do you want to overwrite it? + + + + + Confirm Overwrite + + + + + QgsWMSSourceSelectBase + + + Add Layer(s) from a Server + + + + + Ready + + + + + Layers + + + + + C&onnect + + + + + &New + + + + + Edit + + + + + Delete + + + + + Adds a few example WMS servers + + + + + Add default servers + + + + + ID + + + + + Name + + + + + + + Title + + + + + Abstract + + + + + Image encoding + + + + + Save connections to file + + + + + Save + + + + + Load connections from file + + + + + Load + + + + + Options + + + + + Layer name + + + + + Coordinate Reference System + + + + + Change ... + + + + + Tile size + + + + + Feature limit for GetFeatureInfo + + + + + 10 + + + + + Layer Order + + + + + Move selected layer UP + + + + + Up + + + + + Move selected layer DOWN + + + + + Down + + + + + + Layer + + + + + + Style + + + + + Tilesets + + + + + Format + + + + + Tileset + + + + + CRS + + + + + Server Search + + + + + Search + + + + + Description + + + + + URL + + + + + Add selected row to WMS list + + + + + QgsWcsCapabilities + + + empty capabilities document + + + + + + +Tried URL: %1 + + + + + Capabilities request redirected. + + + + + empty of capabilities: %1 + + + + + Download of capabilities failed: %1 + + + + + WCS + + + + + %1 of %2 bytes of capabilities downloaded. + + + + + Exception + + + + + Could not get WCS capabilities: %1 + + + + + + + + Dom Exception + + + + + + + Could not get WCS capabilities in the expected format (DTD): no %1 found. +This might be due to an incorrect WCS Server URL. +Tag:%3 +Response was: +%4 + + + + + Version not supported + + + + + WCS server version %1 is not supported by Quantum GIS (supported versions: 1.0.0, 1.1.0, 1.1.2) + + + + + Could not get WCS capabilities: %1 at line %2 column %3 +This is probably due to an incorrect WCS Server URL. +Response was: + +%4 + + + + + QgsWcsProvider + + + Cannot describe coverage + + + + + Coverage not found + + + + + Cannot calculate extent + + + + + Cannot get test dataset. + + + + + Received coverage has wrong extent %1 (expected %2) + + + + + + + + + + + + + + + + + + + + WCS + + + + + Rotating raster + + + + + Block read OK + + + + + Received coverage has wrong size %1 x %2 (expected %3 x %4) + + + + + Getting map via WCS. + + + + + Map request error (Status: %1; Reason phrase: %2; URL:%3) + + + + + Map request error:<br>Title: %1<br>Error: %2<br>URL: <a href='%3'>%3</a>) + + + + + Map request error (Status: %1; Response: %2; URL:%3) + + + + + Cannot find boundary in multipart content type + + + + + Expected 2 parts, %1 received + + + + + More than 2 parts (%1) received + + + + + Map request error (Title:%1; Error:%2; URL: %3) + + + + + Map request error (Response: %1; URL:%2) + + + + + Content-Transfer-Encoding %1 not supported + + + + + No data received + + + + + Cannot create memory file + + + + + Map request failed [error:%1 url:%2] + + + + + Not logging more than 100 request errors. + + + + + %1 of %2 bytes of map downloaded. + + + + + Dom Exception + + + + + Could not get WCS Service Exception at %1: %2 at line %3 column %4 + +Response was: + +%5 + + + + + Request contains a format not offered by the server. + + + + + Request is for a Coverage not offered by the service instance. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. + + + + + Request does not include a parameter value, and the server instance did not declare a default value for that dimension. + + + + + Request contains an invalid parameter value. + + + + + No other exceptionCode specified by this service and server applies to this exception. + + + + + Operation request contains an output CRS that can not be used within the output format. + + + + + Operation request specifies to "store" the result, but not enough storage is available to do this. + + + + + (No error code was reported) + + + + + (Unknown error code) + + + + + The WCS vendor also reported: + + + + + composed error message '%1'. + + + + + + Property + + + + + + Value + + + + + Name (identifier) + + + + + + Title + + + + + + Abstract + + + + + Fixed Width + + + + + Fixed Height + + + + + Native CRS + + + + + Native Bounding Box + + + + + WGS 84 Bounding Box + + + + + + Available in CRS + + + + + + (and %n more) + crs + + + + + + + + + Available in format + + + + + + Coverages + + + + + Cache Stats + + + + + Server Properties + + + + + Keywords + + + + + Online Resource + + + + + Contact Person + + + + + Fees + + + + + Access Constraints + + + + + Image Formats + + + + + GetCapabilitiesUrl + + + + + Get Coverage Url + + + + + &nbsp;<font color="red">(advertised but ignored)</font> + + + + + And %1 more coverages + + + + + QgsWmsProvider + + + Cannot parse URI + + + + + Cannot calculate extent + + + + + Cannot set CRS + + + + + Number of layers and styles don't match + + + + + + + + + + + + + + + + + + + + + WMS + + + + + Number of tile layers must be one + + + + + Tile layer not found + + + + + Tile layer or tile matrix set not found + + + + + Getting map via WMS. + + + + + Getting tiles. + + + + + + %n tile requests in background + tile request count + + + + + + + + + , %n cache hits + tile cache hits + + + + + + + + + , %n cache misses. + tile cache missed + + + + + + + + + , %n errors. + errors + + + + + + + + image is NULL + + + + + unexpected image size + + + + + Tile request error + + + + + Status: %1 +Reason phrase: %2 + + + + + Tile request error (Title:%1; Error:%2; URL: %3) + + + + + Tile request error (Status:%1; Content-Type:%2; Length:%3; URL: %4) + + + + + + Returned image is flawed [%1] + + + + + Tile request failed [error:%1 url:%2] + + + + + + Not logging more than 100 request errors. + + + + + Map request error (Status: %1; Reason phrase: %2; URL:%3) + + + + + Map request error (Title:%1; Error:%2; URL: %3) + + + + + Map request error (Status: %1; Response: %2; URL:%3) + + + + + Map request failed [error:%1 url:%2] + + + + + empty capabilities document + + + + + +Tried URL: %1 + + + + + Capabilities request redirected. + + + + + empty of capabilities: %1 + + + + + Download of capabilities failed: %1 + + + + + %1 of %2 bytes of capabilities downloaded. + + + + + %1 of %2 bytes of map downloaded. + + + + + + + Dom Exception + + + + + Could not get WMS capabilities: %1 at line %2 column %3 +This is probably due to an incorrect WMS Server URL. +Response was: + +%4 + + + + + Could not get WMS capabilities in the expected format (DTD): no %1 or %2 found. +This might be due to an incorrect WMS Server URL. +Tag:%3 +Response was: +%4 + + + + + Could not get WMS Service Exception at %1: %2 at line %3 column %4 + +Response was: + +%5 + + + + + Request contains a format not offered by the server. + + + + + Request contains a CRS not offered by the server for one or more of the Layers in the request. + + + + + Request contains a SRS not offered by the server for one or more of the Layers in the request. + + + + + GetMap request is for a Layer not offered by the server, or GetFeatureInfo request is for a Layer not shown on the map. + + + + + Request is for a Layer in a Style not offered by the server. + + + + + GetFeatureInfo request is applied to a Layer which is not declared queryable. + + + + + GetFeatureInfo request contains invalid X or Y value. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. + + + + + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. + + + + + Request does not include a sample dimension value, and the server did not declare a default value for that dimension. + + + + + Request contains an invalid sample dimension value. + + + + + Request is for an optional operation that is not supported by the server. + + + + + (No error code was reported) + + + + + (Unknown error code) + + + + + The WMS vendor also reported: + + + + + composed error message '%1'. + + + + + Extent for layer %1 not found in capabilities + + + + + + + + Property + + + + + + + + Value + + + + + + Name + + + + + Visibility + + + + + Visible + + + + + Hidden + + + + + + + Title + + + + + + + Abstract + + + + + Can Identify + + + + + + + + Yes + + + + + + + + No + + + + + Can be Transparent + + + + + Can Zoom In + + + + + Cascade Count + + + + + Fixed Width + + + + + Fixed Height + + + + + WGS 84 Bounding Box + + + + + + Available in CRS + + + + + (and %n more) + crs + + + + + + + + Available in style + + + + + + Server Properties + + + + + + Selected Layers + + + + + + Other Layers + + + + + Tile Layer Properties + + + + + Cache Stats + + + + + WMS Version + + + + + Keywords + + + + + Online Resource + + + + + Contact Person + + + + + Fees + + + + + Access Constraints + + + + + Image Formats + + + + + Identify Formats + + + + + Layer Count + + + + + Tile Layer Count + + + + + GetCapabilitiesUrl + + + + + GetMapUrl + + + + + + &nbsp;<font color="red">(advertised but ignored)</font> + + + + + GetFeatureInfoUrl + + + + + GetTileUrl + + + + + Tile templates + + + + + FeatureInfo templates + + + + + Tileset Properties + + + + + WMTS + + + + + WMS-C + + + + + Selected + + + + + Available Styles + + + + + CRS + + + + + Bounding Box + + + + + Available Tilesets + + + + + Cache stats + + + + + Hits + + + + + Misses + + + + + Errors + + + + + identify request redirected. + + + + + Map getfeatureinfo error %1: %2 + + + + + ERROR: GetFeatureInfo failed + + + + + Map getfeatureinfo error: %1 [%2] + + + + + QgsWmtsDimensionsBase + + + Dialog + + + + + Dimension + + + + + + Value + + + + + Abstract + + + + + Default + + + + + QgsZonalStatisticsDialogBase + + + Dialog + + + + + Raster layer: + + + + + Polygon layer containing the zones: + + + + + Output column prefix: + + + + + QgsZonalStatisticsPlugin + + + + + &Zonal statistics + + + + + Calculating zonal statistics... + + + + + Abort... + + + + + RgExportDlg + + + Export feature + + + + + Select destination layer + + + + + New temporary layer + + + + + RgLineVectorLayerSettingsWidget + + + Transportation layer + + + + + Layer + + + + + Direction field + + + + + Value for forward direction + + + + + Value for reverse direction + + + + + Value two-way direction + + + + + Speed field + + + + + km/h + + + + + m/s + + + + + Default settings + + + + + Direction + + + + + Two-way direction + + + + + Forward direction + + + + + Reverse direction + + + + + Cost + + + + + Line lengths + + + + + Speed + + + + + + Always use default + + + + + RgSettingsDlg + + + Road graph plugin settings + + + + + Time unit + + + + + Distance unit + + + + + Topology tolerance + + + + + second + + + + + hour + + + + + meter + + + + + kilometer + + + + + RgShortestPathWidget + + + Shortest path + + + + + Start + + + + + Stop + + + + + Criterion + + + + + + Length + + + + + + Time + + + + + Calculate + + + + + Export + + + + + Clear + + + + + Help + + + + + Point not selected + + + + + First, select start and stop points. + + + + + Plugin isn't configured + + + + + Plugin isn't configured! + + + + + + Tie point failed + + + + + Start point doesn't tie to the road! + + + + + Stop point doesn't tie to the road! + + + + + Path not found + + + + + RoadGraphPlugin + + + Settings + + + + + Road graph plugin settings + + + + + + Road graph + + + + + SEXTANTE + + Analysis + + + + &SEXTANTE toolbox + + + + &SEXTANTE modeler + + + + &SEXTANTE history and log + + + + &SEXTANTE options and configuration + + + + &SEXTANTE results viewer + + + + &SEXTANTE help + + + + + SaDbTableModel + + + Schema + + + + + Table + + + + + Type + + + + + SRID + + + + + Line Interpretation + + + + + Geometry column + + + + + Sql + + + + + SaNewConnection + + + Save connection + + + + + Should the existing connection %1 be overwritten? + + + + + Failed to load interface + + + + + + Test connection + + + + + Connection to %1 was successful + + + + + Connection failed. Check settings and try again. + +SQL Anywhere error code: %1 +Description: %2 + + + + + SaNewConnectionBase + + + Create a new SQL Anywhere connection + + + + + Connection Information + + + + + Name + + + + + Host + + + + + Port + + + + + Server + + + + + Database + + + + + Connection Parameters + + + + + Username + + + + + Password + + + + + Name of the new connection + + + + + Name or IP address of computer hosting the database server (leave blank for local connections) + + + + + Port number used by the database server (leave blank for default 2638) + + + + + Name of the database server (leave blank for default server on host) + + + + + Name of the database (leave blank for default database on server) + + + + + Additional connection parameters + + + + + Database username + + + + + Database password + + + + + Save the connection username in the registry + + + + + Save Username + + + + + &Test Connect + + + + + Save the connection password in the registry (WARNING: NOT SECURE) + + + + + Save Password + + + + + Encrypt packets using simple encryption + + + + + Simple Encryption + + + + + Use estimates for certain layer properties such as cardinality, extent, etc. (improves performance) + + + + + Estimate table metadata + + + + + Search for geometry columns in tables owned by other users + + + + + Search other users' tables + + + + + SaSourceSelect + + + &Add + + + + + &Build Query + + + + + + Wildcard + + + + + + RegExp + + + + + + All + + + + + + Schema + + + + + + Table + + + + + + Type + + + + + + SRID + + + + + + Line Interpretation + + + + + + Geometry column + + + + + + Sql + + + + + Are you sure you want to remove the %1 connection and all associated settings? + + + + + Confirm Delete + + + + + Select Table + + + + + You must select a table in order to add a layer. + + + + + Failed to load interface + + + + + Connection failed + + + + + Connection to database %1 failed. Check settings and try again. + +SQL Anywhere error code: %2 +Description: %3 + + + + + No accessible tables found + + + + + Database connection was successful, but no tables containing geometry columns were %1. + + + + + found + + + + + found in your schema + + + + + SaSourceSelectBase + + + Add SQL Anywhere layer + + + + + SQL Anywhere Connections + + + + + Delete + + + + + Edit + + + + + New + + + + + Connect + + + + + Search options + + + + + Search + + + + + Search mode + + + + + Search in columns + + + + + SelectGeoRasterBase + + + Select Oracle Spatial GeoRaster + + + + + Server Connections + + + + + Edit + + + + + Delete + + + + + &New + + + + + C&onnect + + + + + Subdatasets + + + + + Selection + + + + + Update + + + + + Ready + + + + + SettingsDialog + + + Font + + + + + Size + + + + + API file + + + + + Browse + + + + + Use preloaded API file + + + + + SextanteToolbox + + SEXTANTE Toolbox + + + + Click here to configure +additional algorithm providers + + + + Execute + + + + Execute as batch process + + + + Edit rendering styles for outputs + + + + Warning + + + + Recently used algorithms + + + + + SimplifyLineDialog + + + Simplify line tolerance + + + + + Set tolerance + + + + + OK + + + + + SqlAnywhere + + + Add SQL Anywhere Layer... + + + + + Store vector layers within a SQL Anywhere database + + + + + Invalid Layer + + + + + %1 is an invalid layer and cannot be loaded. + + + + + SymbolsListWidget + + + Form + + + + + Unit + + + + + Millimeter + + + + + Map unit + + + + + Opacity + + + + + Color + + + + + Change + + + + + Size + + + + + Rotation + + + + + ° + + + + + Width + + + + + Saved styles + + + + + Symbol Name + + + + + Style + + + + + Advanced + + + + + UndoWidget + + + Undo/Redo + + + + + Undo + + + + + Redo + + + + + ValidateDialog + + Check geometry validity + + + + Geometry errors + + + + Total encountered errors + + + + Error! + + + + Please specify input vector layer + + + + Please specify input field + + + + Cancel + + + + Feature + + + + Error(s) + + + + + VisualDialog + + Error! + + + + Please specify input vector layer + + + + Please specify input field + + + + List unique values + + + + Unique values + + + + Total unique values + + + + Basics statistics + + + + Statistics output + + + + Nearest neighbour analysis + + + + Nearest neighbour statistics + + + + Cancel + + + + Parameter + + + + Value + + + + + WidgetCentroidFill + + + Form + + + + + WidgetEllipseBase + + + Form + + + + + Settings + + + + + Border color + + + + + + Change + + + + + + Fill color + + + + + + Symbol width + + + + + + Outline width + + + + + + Symbol height + + + + + + Rotation + + + + + Data defined settings + + + + + Outline color + + + + + Shape + + + + + WidgetFontMarker + + + Form + + + + + Size + + + + + Change + + + + + Font family + + + + + ° + + + + + Offset X,Y + + + + + Color + + + + + Rotation + + + + + WidgetLineDecoration + + + Form + + + + + Change + + + + + Pen width + + + + + Color + + + + + WidgetLinePatternFill + + + Form + + + + + Line width + + + + + Color + + + + + Angle + + + + + Change + + + + + Distance + + + + + Offset + + + + + WidgetMarkerLine + + + Form + + + + + Marker placement + + + + + with interval + + + + + on every vertex + + + + + on last vertex only + + + + + on first vertex only + + + + + Rotate marker + + + + + Line offset + + + + + on central point + + + + + WidgetPointPatternFill + + + Form + + + + + Horizontal distance + + + + + Vertical distance + + + + + Horizontal displacement + + + + + Vertical displacement + + + + + WidgetSVGFill + + + Form + + + + + Border color + + + + + Color + + + + + + Change + + + + + Texture width + + + + + Rotation + + + + + Border width + + + + + SVG Groups + + + + + SVG Symbols + + + + + ... + + + + + WidgetSimpleFill + + + Form + + + + + Border color + + + + + Fill style + + + + + Color + + + + + Offset X,Y + + + + + + Change + + + + + Border style + + + + + Border width + + + + + WidgetSimpleLine + + + Form + + + + + Color + + + + + + Change + + + + + Pen width + + + + + Offset + + + + + Pen style + + + + + Use custom dash pattern + + + + + Join style + + + + + Cap style + + + + + WidgetSimpleMarker + + + Form + + + + + Angle + + + + + + Change + + + + + Border color + + + + + Size + + + + + Fill color + + + + + Offset X,Y + + + + + WidgetSvgMarker + + + Form + + + + + Size + + + + + + Change + + + + + Offset X,Y + + + + + Angle + + + + + Border color + + + + + Border width + + + + + Color + + + + + SVG Groups + + + + + SVG Image + + + + + ... + + + + + WidgetVectorFieldBase + + + Form + + + + + X attribute + + + + + Y attribute + + + + + Scale + + + + + Vector field type + + + + + Height only + + + + + Polar + + + + + Cartesian + + + + + Angle units + + + + + Degrees + + + + + Radians + + + + + Angle orientation + + + + + Counterclockwise from east + + + + + Clockwise from north + + + + + [pluginname]GuiBase + + + QGIS Plugin Template + + + + + Plugin Template + + + + + dxf2shpConverter + + + Converts DXF files in Shapefile format + + + + + + &Dxf2Shp + + + + + dxf2shpConverterGui + + + Dxf Importer + + + + + Input and output + + + + + Input DXF file + + + + + + ... + + + + + Output file + + + + + Export text labels + + + + + Output file type + + + + + Polyline + + + + + Polygon + + + + + Point + + + + + + Warning + + + + + Please specify a file to convert. + + + + + Please specify an output file + + + + + Fields description: +* Input DXF file: path to the DXF file to be converted +* Output Shp file: desired name of the shape file to be created +* Shp output file type: specifies the type of the output shape file +* Export text labels checkbox: if checked, an additional shp points layer will be created, and the associated dbf table will contain information about the "TEXT" fields found in the dxf file, and the text strings themselves + +--- +Developed by Paolo L. Scala, Barbara Rita Barricelli, Marco Padula +CNR, Milan Unit (Information Technology), Construction Technologies Institute. +For support send a mail to scala@itc.cnr.it + + + + + + Choose a DXF file to open + + + + + DXF files + + + + + Choose a file name to save to + + + + + Shapefile + + + + + eVis + + + eVis Database Connection + + + + + eVis Event Id Tool + + + + + eVis Event Browser + + + + + Create layer from a database query + + + + + Open an Event Browers and display the selected feature + + + + + Open an Event Browser to explore the current layer's features + + + + + eVisDatabaseConnectionGui + + + + Undefined + + + + + No predefined queries loaded + + + + + + + + + Open File + + + + + New Database connection requested... + + + + + Error: You must select a database type + + + + + Error: No host name entered + + + + + Error: No database name entered + + + + + Connection to [%1.%2] established + + + + + connected + + + + + Tables + + + + + Connection to [%1.%2] failed: %3 + + + + + Error: Parse error at line %1, column %2: %3 + + + + + Error: Unabled to open file [%1] + + + + + Error: Query failed: %1 + + + + + Error: Could not create temporary file, process halted + + + + + Error: A database connection is not currently established + + + + + eVisDatabaseConnectionGuiBase + + + + Database Connection + + + + + Predefined Queries + + + + + Load predefined queries + + + + + Loads an XML file with predefined queries. Use the Open File window to locate the XML file that contains one or more predefined queries using the format described in the user guide. + + + + + The description of the selected query. + + + + + Select the predefined query you want to use from the drop-down list containing queries identified from the file loaded using the Open File icon above. To run the query you need to click on the SQL Query tab. The query will be automatically entered in the query window. + + + + + not connected + + + + + <html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Sans Serif'; font-size:9pt; font-weight:400; font-style:normal; text-decoration:none;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-style:italic;">Connection Status: </span></p></body></html> + + + + + Database Host + + + + + Enter the database host. If the database resides on your desktop you should enter ¨localhost¨. If you selected ¨MSAccess¨ as the database type this option will not be available. + + + + + Password to access the database. + + + + + Enter the name of the database. + + + + + Username + + + + + Enter the port through which the database must be accessed if a MYSQL database is used. + + + + + Connect to the database using the parameters selected above. If the connection was successful a message will be displayed in the Output Console below saying the connection was established. + + + + + Connect + + + + + User name to access the database. + + + + + Select the type of database from the list of supported databases in the drop-down menu. + + + + + Database Name + + + + + Password + + + + + Database Type + + + + + Port + + + + + SQL Query + + + + + Run the query entered above. The status of the query will be displayed in the Output Console below. + + + + + Run Query + + + + + Enter the query you want to run in this window. + + + + + A window for status messages to be displayed. + + + + + Output Console + + + + + eVisDatabaseLayerFieldSelectionGuiBase + + + Database File Selection + + + + + The name of the field that contains the Y coordinate of the points. + + + + + The name of the field that contains the X coordinate of the points. + + + + + Enter the name for the new layer that will be created and displayed in QGIS. + + + + + Y Coordinate + + + + + X Coordinate + + + + + Name of New Layer + + + + + eVisGenericEventBrowserGui + + + Generic Event Browser + + + + + Field + + + + + Value + + + + + + + + Warning + + + + + + This tool only supports vector data + + + + + + No active layers found + + + + + + Error + + + + + Unable to connect to either the map canvas or application interface + + + + + An invalid feature was received during initialization + + + + + Event Browser - Displaying records 01 of %1 + + + + + Attribute Contents + + + + + + Event Browser - Displaying records %1 of %2 + + + + + Select Application + + + + + All ( * ) + + + + + eVisGenericEventBrowserGuiBase + + + Display + + + + + Use the Previous button to display the previous photo when more than one photo is available for display. + + + + + Previous + + + + + Use the Next button to display the next photo when more than one photo is available for display. + + + + + Next + + + + + All of the attribute information for the point associated with the photo being viewed is displayed here. If the file type being referenced in the displayed record is not an image but is of a file type defined in the “Configure External Applications” tab then when you double-click on the value of the field containing the path to the file the application to open the file will be launched to view or hear the contents of the file. If the file extension is recognized the attribute data will be displayed in green. + + + + + 1 + + + + + Image display area + + + + + Display area for the image. + + + + + Options + + + + + File path + + + + + Attribute containing path to file + + + + + Use the drop-down list to select the field containing a directory path to the image. This can be an absolute or relative path. + + + + + If checked the path to the image will be defined appending the attribute in the field selected from the “Attribute Containing Path to Image” drop-down list to the “Base Path” defined below. + + + + + Path is relative + + + + + If checked, the relative path values will be saved for the next session. + + + + + + + + + + Remember this + + + + + + + + + + Reset to default + + + + + + Resets the values on this line to the default setting. + + + + + + + + + + Reset + + + + + Compass bearing + + + + + Attribute containing compass bearing + + + + + Use the drop-down list to select the field containing the compass bearing for the image. This bearing usually references the direction the camera was pointing when the image was acquired. + + + + + If checked an arrow pointing in the direction defined by the attribute in the field selected from the drop-down list to the right will be displayed in the QGIS window on top of the point for this image. + + + + + Display compass bearing + + + + + If checked, the Display Compass Bearing values will be saved for the next session. + + + + + Compass offset + + + + + Define the compass offset manually. + + + + + Manual + + + + + A value to be added to the compass bearing. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. + + + + + Define the compass offset using a field from the vector layer attribute table. + + + + + From Attribute + + + + + Use the drop-down list to select the field containing the compass bearing offset. This allows you to compensate for declination (adjust bearings collected using magnetic bearings to true north bearings). East declinations should be entered using positive values and west declinations should use negative values. + + + + + If checked, the compass offset values will be saved for the next session. + + + + + Resets the compass offset values to the default settings. + + + + + Relative paths + + + + + The base path or url from which images and documents can be “relative” + + + + + + Base Path + + + + + The Base Path onto which the relative path defined above will be appended. + + + + + If checked, the Base Path will be saved for the next session. + + + + + Enters the default “Base Path” which is the path to the directory of the vector layer containing the image information. + + + + + If checked, the Base Path will append only the file name instead of the entire relative path (defined above) to create the full directory path to the file. + + + + + Replace entire path/url stored in image path attribute with user defined +Base Path (i.e. keep only filename from attribute) + + + + + + If checked, the current check-box setting will be saved for the next session. + + + + + + Clears the check-box on this line. + + + + + If checked, the same path rules that are defined for images will be used for non-image documents such as movies, text documents, and sound files. If not checked the path rules will only apply to images and other documents will ignore the Base Path parameter. + + + + + Apply Path to Image rules when loading docs in external applications + + + + + Clicking on Save will save the settings without closing the Options pane. Clicking on Restore Defaults will reset all of the fields to their default settings. It has the same effect as clicking all of the “Reset to default” buttons. + + + + + Configure External Applications + + + + + File extension and external application in which to load a document of that type + + + + + A table containing file types that can be opened using eVis. Each file type needs a file extension and the path to an application that can open that type of file. This provides the capability of opening a broad range of files such as movies, sound recording, and text documents instead of only images. + + + + + Extension + + + + + Application + + + + + Add new file type + + + + + Add a new file type with a unique extension and the path for the application that can open the file. + + + + + Delete current row + + + + + Delete the file type highlighted in the table and defined by a file extension and a path to an associated application. + + + + + eVisImageDisplayWidget + + + Zoom in + + + + + Zoom in to see more detail. + + + + + Zoom out + + + + + Zoom out to see more area. + + + + + Zoom to full extent + + + + + Zoom to display the entire image. + + + + + fTools + + Quantum GIS version detected: + + + + This version of fTools requires at least QGIS version 1.0.0 +Plugin will not be enabled. + + + + &Analysis Tools + + + + Distance matrix + + + + Sum line lengths + + + + Points in polygon + + + + Basic statistics + + + + List unique values + + + + Nearest neighbour analysis + + + + Mean coordinate(s) + + + + Line intersections + + + + &Research Tools + + + + Random selection + + + + Random selection within subsets + + + + Random points + + + + Regular points + + + + Vector grid + + + + Select by location + + + + Polygon from layer extent + + + + &Geoprocessing Tools + + + + Convex hull(s) + + + + Buffer(s) + + + + Intersect + + + + Union + + + + Symetrical difference + + + + Clip + + + + Dissolve + + + + Difference + + + + Eliminate sliver polygons + + + + G&eometry Tools + + + + Export/Add geometry columns + + + + Check geometry validity + + + + Polygon centroids + + + + Delaunay triangulation + + + + Voronoi Polygons + + + + Extract nodes + + + + Simplify geometries + + + + Densify geometries + + + + Multipart to singleparts + + + + Singleparts to multipart + + + + Polygons to lines + + + + Lines to polygons + + + + &Data Management Tools + + + + Define current projection + + + + Join attributes by location + + + + Split vector layer + + + + Merge shapefiles to one + + + + Create spatial index + + + + + geometryThread + + Merge all + + + + Polygon area + + + + Polygon perimeter + + + + Line length + + + + Point x coordinate + + + + Point y coordinate + + + + + grasslabel + + + (1-256) + + + + + (Optional) column to read labels + + + + + 3D-Viewer (NVIZ) + + + + + 3d Visualization + + + + + Add a value to the current category values + + + + + Add elements to layer (ALL elements of the selected layer type!) + + + + + Add missing centroids to closed boundaries + + + + + Add one or more columns to attribute table + + + + + Allocate network + + + + + Assign constant value to column + + + + + Assign new constant value to column only if the result of query is TRUE + + + + + Assign new value as result of operation on columns to column in attribute table + + + + + Assign new value to column as result of operation on columns only if the result of query is TRUE + + + + + Attribute field + + + + + Attribute field (interpolated values) + + + + + Attribute field to (over)write + + + + + Attribute field to join + + + + + Auto-balancing of colors for LANDSAT-TM raster + + + + + Bicubic or bilinear spline interpolation with Tykhonov regularization + + + + + Bilinear interpolation utility for raster maps + + + + + Blend color components for two rasters by given ratio + + + + + Blend red, green, raster layers to obtain one color raster + + + + + Break (topologically clean) polygons (imported from non topological format, like ShapeFile). Boundaries are broken on each point shared between 2 and more polygons where angles of segments are different + + + + + Break lines at each intersection of vector + + + + + Brovey transform to merge multispectral and high-res panchromatic channels + + + + + Buffer + + + + + Build polylines from lines + + + + + Calculate average of raster within areas with the same category in a user-defined base map + + + + + Calculate covariance/correlation matrix for user-defined rasters + + + + + Calculate error matrix and kappa parameter for accuracy assessment of classification result + + + + + Calculate geometry statistics for vectors + + + + + Calculate linear regression from two rasters: y = a + b*x + + + + + Calculate median of raster within areas with the same category in a user-defined base map + + + + + Calculate mode of raster within areas with the same category in a user-defined base map + + + + + Calculate optimal index factor table for LANDSAT-TM raster + + + + + Calculate raster surface area + + + + + Calculate shadow maps from exact sun position + + + + + Calculate shadow maps from sun position determinated by date/time + + + + + Calculate statistics for raster + + + + + Calculate univariate statistics for numeric attributes in a data table + + + + + Calculate univariate statistics from raster based on vector objects + + + + + Calculate univariate statistics from the non-null cells of raster + + + + + Calculate univariate statistics of vector map features + + + + + Calculate volume of data clumps, and create vector with centroids of clumps + + + + + Category or object oriented statistics + + + + + Cats + + + + + Cats (select from the map or using their id) + + + + + Change category values and labels + + + + + Change field + + + + + Change layer number + + + + + Change resolution + + + + + Change the type of boundary dangle to line + + + + + Change the type of bridges connecting area and island or 2 islands from boundary to line + + + + + Change the type of geometry elements + + + + + Choose appropriate format + + + + + Columns management + + + + + Compares bit patterns with raster + + + + + Compress and decompress raster + + + + + Compress raster + + + + + Computes a coordinate transformation based on the control points + + + + + Concentric circles + + + + + Connect nodes by shortest route (traveling salesman) + + + + + Connect selected nodes by shortest tree (Steiner tree) + + + + + Connect vector to database + + + + + Convert 2D vector to 3D by sampling raster + + + + + Convert 2D vector to 3D vector by sampling of elevation raster. Default sampling by nearest neighbour + + + + + Convert GRASS binary vector to GRASS ASCII vector + + + + + Convert a raster to vector within GRASS + + + + + Convert a vector to raster within GRASS + + + + + Convert bearing and distance measurements to coordinates and vice versa + + + + + Convert boundaries to lines + + + + + Convert centroids to points + + + + + Convert coordinates + + + + + Convert coordinates from one projection to another (cs2cs frontend) + + + + + Convert lines to boundaries + + + + + Convert points to centroids + + + + + Convert raster to vector areas + + + + + Convert raster to vector lines + + + + + Convert raster to vector points + + + + + Convert vector to raster using attribute values + + + + + Convert vector to raster using constant + + + + + Convex hull + + + + + Copy a table + + + + + Copy also attribute table (only the table of layer 1 is currently supported) + + + + + Count of neighbouring points + + + + + Create 3D volume map based on 2D elevation and value rasters + + + + + Create a MASK for limiting raster operation + + + + + Create a map containing concentric rings + + + + + Create a raster plane + + + + + Create and add new table to vector + + + + + Create and/or modify raster support files + + + + + Create aspect raster from DEM (digital elevation model) + + + + + Create cross product of category values from multiple rasters + + + + + Create fractal surface of given fractal dimension + + + + + Create grid in current region + + + + + Create new GRASS location and transfer data into it + + + + + Create new GRASS location from metadata file + + + + + Create new GRASS location from raster data + + + + + Create new GRASS location from vector data + + + + + Create new layer with category values based upon user's reclassification of categories in existing raster + + + + + Create new location from .prj (WKT) file + + + + + Create new raster by combining other rasters + + + + + Create new vector by combining other vectors + + + + + Create new vector with current region extent + + + + + Create nodes on network + + + + + Create parallel line to input lines + + + + + Create points + + + + + Create points along input lines + + + + + Create points/segments from input vector lines and positions + + + + + Create quantization file for floating-point raster + + + + + Create random 2D/3D vector points + + + + + Create random cell values with spatial dependence + + + + + Create random points + + + + + Create random vector point contained in raster + + + + + Create raster images with textural features from raster (first serie of indices) + + + + + Create raster of distance to features in input layer + + + + + Create raster of gaussian deviates with user-defined mean and standard deviation + + + + + Create raster of uniform random deviates with user-defined range + + + + + Create raster with contiguous areas grown by one cell + + + + + Create raster with textural features from raster (second serie of indices) + + + + + Create red, green and blue rasters combining hue, intensity, and saturation (his) values from rasters + + + + + Create shaded map + + + + + Create slope raster from DEM (digital elevation model) + + + + + Create standard vectors + + + + + Create surface from rasterized contours + + + + + Create vector contour from raster at specified levels + + + + + Create vector contour from raster at specified steps + + + + + Create watershed basin + + + + + Create watershed subbasins raster + + + + + Cut network by cost isolines + + + + + DXF vector layer + + + + + Database + + + + + Database connection + + + + + Database file + + + + + Database management + + + + + Delaunay triangulation (areas) + + + + + Delaunay triangulation (lines) + + + + + Delaunay triangulation, Voronoi diagram and convex hull + + + + + Delete category values + + + + + Develop images and group + + + + + Develop map + + + + + Directory of rasters to be linked + + + + + Disconnect vector from database + + + + + Display general DB connection + + + + + Display list of category values found in raster + + + + + Display projection information from PROJ.4 projection description file + + + + + Display projection information from PROJ.4 projection description file and create a new location based on it + + + + + Display projection information from a georeferenced file (raster, vector or image) and create a new location based on it + + + + + Display projection information from georeferenced ASCII file containing WKT projection description + + + + + Display projection information from georeferenced ASCII file containing WKT projection description and create a new location based on it + + + + + Display projection information from georeferenced file (raster, vector or image) + + + + + Display projection information of the current location + + + + + Display raster category values and labels + + + + + Display results of SQL selection from database + + + + + Display the HTML manual pages of GRASS + + + + + Display vector attributes + + + + + Display vector map attributes with SQL + + + + + Dissolves boundaries between adjacent areas sharing a common category number or attribute + + + + + Download and import data from WMS server + + + + + Drop column from attribute table + + + + + E00 vector layer + + + + + Elevation raster for height extraction (optional) + + + + + Execute any SQL statement + + + + + Export 3 GRASS rasters (R,G,B) to PPM image at the resolution of the current region + + + + + Export from GRASS + + + + + Export raster as non-georeferenced PNG image format + + + + + Export raster from GRASS + + + + + Export raster series to MPEG movie + + + + + Export raster to 8/24bit TIFF image at the resolution of the current region + + + + + Export raster to ASCII text file + + + + + Export raster to ESRI ARCGRID + + + + + Export raster to GRIDATB.FOR map file (TOPMODEL) + + + + + Export raster to Geo TIFF + + + + + Export raster to POVRAY height-field file + + + + + Export raster to PPM image at the resolution of the current region + + + + + Export raster to VTK-ASCII + + + + + Export raster to Virtual Reality Modeling Language (VRML) + + + + + Export raster to binary MAT-File + + + + + Export raster to binary array + + + + + Export raster to text file as x,y,z values based on cell centers + + + + + Export raster to various formats (GDAL library) + + + + + Export vector from GRASS + + + + + Export vector table from GRASS to database format + + + + + Export vector to DXF + + + + + Export vector to GML + + + + + Export vector to Mapinfo + + + + + Export vector to POV-Ray + + + + + Export vector to PostGIS (PostgreSQL) database table + + + + + Export vector to SVG + + + + + Export vector to Shapefile + + + + + Export vector to VTK-ASCII + + + + + Export vector to various formats (OGR library) + + + + + Exports attribute tables into various format + + + + + Extract features from vector + + + + + Extract selected features + + + + + Extracts terrain parameters from DEM + + + + + Extrudes flat vector object to 3D with fixed height + + + + + Extrudes flat vector object to 3D with height based on attribute + + + + + Fast fourier transform for image processing + + + + + Feature type (for polygons, choose Boundary) + + + + + File management + + + + + Fill lake from seed at given level + + + + + Fill lake from seed point at given level + + + + + Fill no-data areas in raster using v.surf.rst splines interpolation + + + + + Filter and create depressionless elevation map and flow direction map from elevation raster + + + + + Filter image + + + + + Find nearest element in vector 'to' for elements in vector 'from'. Various information about this relation may be uploaded to attribute table of input vector 'from' + + + + + Find shortest path on vector network + + + + + GRASS MODULES + + + + + GRASS shell + + + + + Gaussian kernel density + + + + + Generalization + + + + + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) coordinates + + + + + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) raster + + + + + Generate raster of cumulative cost of moving between locations based on cost input raster and starting point(s) vector + + + + + Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) coordinates + + + + + Generate raster of cumulative cost of moving between locations, based on elevation and friction input rasters and starting point(s) vector + + + + + Generate surface + + + + + Generate vector contour lines + + + + + Generates area statistics for rasters + + + + + Georeferencing, rectification, and import Terra-ASTER imagery and DEM using gdalwarp + + + + + Graphical raster map calculator + + + + + Help + + + + + Hue Intensity Saturation (HIS) to Red Green Blue (RGB) raster color transform function + + + + + Hydrologic modelling + + + + + Imagery + + + + + Import ASCII raster + + + + + Import DXF vector + + + + + Import ESRI ARC/INFO ASCII GRID + + + + + Import ESRI E00 vector + + + + + Import GDAL supported raster + + + + + Import GDAL supported raster and create a fitted location + + + + + Import GRIDATB.FOR (TOPMODEL) + + + + + Import MapGen or MatLab vector + + + + + Import OGR vector + + + + + Import OGR vector and create a fitted location + + + + + Import OGR vectors in a given data source combining them in a GRASS vector + + + + + Import SPOT VGT NDVI + + + + + Import SRTM HGT + + + + + Import US-NGA GEOnet Names Server (GNS) country file + + + + + Import all OGR/PostGIS vectors in a given data source and create a fitted location + + + + + Import attribute tables in various formats + + + + + Import binary MAT-File(v4) + + + + + Import binary raster + + + + + Import from database into GRASS + + + + + Import geonames.org country files + + + + + Import into GRASS + + + + + Import loaded raster + + + + + Import loaded raster and create a fitted location + + + + + Import loaded vector + + + + + Import loaded vector and create a fitted location + + + + + Import only some layers of a DXF vector + + + + + Import raster from ASCII polygon/line + + + + + Import raster from coordinates using univariate statistics + + + + + Import raster into GRASS + + + + + Import raster into GRASS from QGIS view + + + + + Import raster into GRASS from external data sources in GRASS + + + + + Import text file + + + + + Import vector from gps using gpsbabel + + + + + Import vector from gps using gpstrans + + + + + Import vector into GRASS + + + + + Import vector points from database table containing coordinates + + + + + Input nodes + + + + + Input table + + + + + Interpolate surface + + + + + Inverse distance squared weighting raster interpolation + + + + + Inverse distance squared weighting raster interpolation based on vector points + + + + + Inverse fast fourier transform for image processing + + + + + Join table to existing vector table + + + + + Layers categories management + + + + + Line-of-sight raster analysis + + + + + Link GDAL supported raster as GRASS raster + + + + + Link GDAL supported raster loaded in QGIS as GRASS raster + + + + + Link all GDAL supported rasters in a directory as GRASS rasters + + + + + Loaded layer + + + + + Locate the closest points between objects in two raster maps + + + + + Make each output cell function of the values assigned to the corresponding cells in the input rasters + + + + + Manage features + + + + + Manage image colors + + + + + Manage map colors + + + + + Manage raster cells value + + + + + Manage training dataset + + + + + Map algebra + + + + + Map type conversion + + + + + MapGen or MatLab vector layer + + + + + Mask + + + + + Maximal tolerance value (higher value=more simplification) + + + + + Metadata support + + + + + Minimum size for each basin (number of cells) + + + + + Mosaic up to 4 images + + + + + Name for new raster file (specify file extension) + + + + + Name for new vector file (specify file extension) + + + + + Name for output vector map (optional) + + + + + Name for the output raster map (optional) + + + + + Neighborhood analysis + + + + + Network analysis + + + + + Network maintenance + + + + + Number of rows to be skipped + + + + + Others + + + + + Output GML file + + + + + Output Shapefile + + + + + Output layer name (used in GML file) + + + + + Output raster values along user-defined transect line(s) + + + + + Overlay + + + + + Overlay maps + + + + + Path to GRASS database of input location (optional) + + + + + Path to the OGR data source + + + + + Percentage of first layer (0-99) + + + + + Perform affine transformation (shift, scale and rotate, or GPCs) on vector + + + + + Print projection information from a georeferenced file + + + + + Print projection information from a georeferenced file and create a new location based on it + + + + + Print projection information of the current location + + + + + Projection conversion of vector + + + + + Projection management + + + + + Put geometry variables in database + + + + + Query rasters on their category values and labels + + + + + Random location perturbations of vector points + + + + + Randomly partition points into test/train sets + + + + + Raster + + + + + Raster buffer + + + + + Raster file matrix filter + + + + + Raster neighbours analysis + + + + + Raster support + + + + + Re-project raster from a location to the current location + + + + + Rebuild topology of a vector in mapset + + + + + Rebuild topology of all vectors in mapset + + + + + Recategorize contiguous cells to unique categories + + + + + Reclass category values + + + + + Reclass category values using a column attribute (integer positive) + + + + + Reclass category values using a rules file + + + + + Reclass raster using reclassification rules + + + + + Reclass raster with patches larger than user-defined area size (in hectares) + + + + + Reclass raster with patches smaller than user-defined area size (in hectares) + + + + + Reclassify raster greater or less than user-defined area size (in hectares) + + + + + Recode categorical raster using reclassification rules + + + + + Recode raster + + + + + Reconnect vector to a new database + + + + + Red Green Blue (RGB) to Hue Intensity Saturation (HIS) raster color transformation function + + + + + Region settings + + + + + Register external data sources in GRASS + + + + + Regularized spline with tension raster interpolation based on vector points + + + + + Reinterpolate and compute topographic analysis using regularized spline with tension and smoothing + + + + + Remove all lines or boundaries of zero length + + + + + Remove bridges connecting area and island or 2 islands + + + + + Remove dangles + + + + + Remove duplicate area centroids + + + + + Remove duplicate lines (pay attention to categories!) + + + + + Remove existing attribute table of vector + + + + + Remove outliers from vector point data + + + + + Remove small angles between lines at nodes + + + + + Remove small areas, the longest boundary with adjacent area is removed + + + + + Remove vertices in threshold from lines and boundaries, boundary is pruned only if topology is not damaged (new intersection, changed attachement of centroid), first and last segment of the boundary is never changed + + + + + Rename column in attribute table + + + + + Reports + + + + + Reports and statistics + + + + + Reproject raster from another Location + + + + + Reproject vector from another Location + + + + + Resample raster using aggregation + + + + + Resample raster using interpolation + + + + + Resample raster. Set new resolution first + + + + + Rescale the range of category values in raster + + + + + Sample raster at site locations + + + + + Save the current region as a named region + + + + + Select features by attributes + + + + + Select features overlapped by features in another map + + + + + Separator (| , etc.) + + + + + Set PostgreSQL DB connection + + + + + Set boundary definitions by edge (n-s-e-w) + + + + + Set boundary definitions for raster + + + + + Set boundary definitions from raster + + + + + Set boundary definitions from vector + + + + + Set boundary definitions to current or default region + + + + + Set color rules based on stddev from a map's mean value + + + + + Set general DB connection + + + + + Set general DB connection with a schema (PostgreSQL only) + + + + + Set raster color table + + + + + Set raster color table from existing raster + + + + + Set raster color table from setted tables + + + + + Set raster color table from user-defined rules + + + + + Set region to align to raster + + + + + Set the region to match multiple rasters + + + + + Set the region to match multiple vectors + + + + + Set user/password for driver/database + + + + + Sets the boundary definitions for a raster map + + + + + Show database connection for vector + + + + + Shrink current region until it meets non-NULL data from raster + + + + + Simple map algebra + + + + + Simplify vector + + + + + Snap lines to vertex in threshold + + + + + Solar and irradiation model + + + + + Spatial analysis + + + + + Spatial models + + + + + Split lines to shorter segments + + + + + Statistics + + + + + Sum raster cell values + + + + + Surface management + + + + + Tables management + + + + + Tabulate mutual occurrence (coincidence) of categories for two rasters + + + + + Take vector stream data, transform it to raster, and subtract depth from the output DEM + + + + + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 4 raster + + + + + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 5 raster + + + + + Tasseled Cap (Kauth Thomas) transformation for LANDSAT-TM 7 raster + + + + + Tassled cap vegetation index + + + + + Terrain analysis + + + + + Tests of normality on vector points + + + + + Text file + + + + + Thin no-zero cells that denote line features + + + + + Toolset for cleaning topology of vector map + + + + + Topology management + + + + + Trace a flow through an elevation model + + + + + Transform cells with value in null cells + + + + + Transform features + + + + + Transform image + + + + + Transform null cells in value cells + + + + + Transform value cells in null cells + + + + + Type in map names separated by a comma + + + + + Update raster statistics + + + + + Update vector map metadata + + + + + Upload raster values at positions of vector points to the table + + + + + Upload vector values at positions of vector points + + + + + Vector + + + + + Vector buffer + + + + + Vector geometry analysis + + + + + Vector intersection + + + + + Vector non-intersection + + + + + Vector subtraction + + + + + Vector union + + + + + Vector update by other maps + + + + + Visibility graph construction + + + + + Voronoi diagram (area) + + + + + Voronoi diagram (lines) + + + + + Watershed Analysis + + + + + Which column for the X coordinate? The first is 1 + + + + + Which column for the Y coordinate? + + + + + Which column for the Z coordinate? If 0, z coordinate is not used + + + + + Work with vector points + + + + + Write only features link to a record + + + + + Zero-crossing edge detection raster function for image processing + + + + + visualThread + + Max. len: + + + + Min. len: + + + + Mean. len: + + + + Filled: + + + + Empty: + + + + N: + + + + Mean: + + + + StdDev: + + + + Sum: + + + + Min: + + + + Max: + + + + CV: + + + + Number of unique values: + + + + Range: + + + + Median: + + + + Observed mean distance: + + + + Expected mean distance: + + + + Nearest neighbour index: + + + + Z-Score: + + + + diff --git a/i18n/qgis_uk.ts b/i18n/qgis_uk.ts index 9c0d71042473..1b4d2125cb16 100644 --- a/i18n/qgis_uk.ts +++ b/i18n/qgis_uk.ts @@ -1,39 +1,16 @@ - - AboutDialog - - - <img src="qrc:/sextante/images/sextante_logo.png" /> - <h2>SEXTANTE for QGIS</h2> - <p>SEXTANTE, a geoprocessing platform for QGIS</p> - <p>A development by Victor Olaya (volayaf@gmail.com).</p> - <p>Portions of this software contributed by: - <ul> - <li>Alexander Bruy</li> - <li>Carson Farmer (fTools algorithms)</li> - <li>Julien Malik (Orfeo Toolbox connectors)</li> - <li>Evgeniy Nikulin (Original Field Pyculator code)</li> - <li>Michael Nimm (mmqgis algorithms)</li> - <li>Camilo Polymeris (Threading). Developed as part of Google - Summer of Code 2012</li> - </ul> - </p> - <p>You are currently using SEXTANTE v%1</p> - <p>This software is distributed under the terms of the GNU GPL License v2. - <p>For more information, please visit our website at - <a href="http://sextantegis.com">http://sextantegis.com</a></p> - - - - CharacterWidget - <p>Character: <span style="font-size: 24pt; font-family: %1%2</span><p>Value: 0x%3"> - <p>Символ: <span style="font-size: 24pt; font-family: %1%2</span><p>Значення: 0x%3"> + <p>Символ: <span style="font-size: 24pt; font-family: %1%2</span><p>Значення: 0x%3"> + + + + <p>Character: <span style="font-size: 24pt; font-family: %1">%2</span><p>Value: 0x%3 + <p>Символ: <span style="font-size: 24pt; font-family: %1">%2</span><p>Значення: 0x%3 @@ -179,6 +156,7 @@ p, li { white-space: pre-wrap; } Вихідний точковий шейп-файл + @@ -204,6 +182,7 @@ p, li { white-space: pre-wrap; } Обробка даних + @@ -427,6 +406,49 @@ were reduced to %2 vertices after simplification Please specify input polygon vector layer Будь ласка, вкажіть вхідний полігональний шар + + Selected features: %1 + + + + Eliminate + + + + No selection in input layer + + + + Error creating output file + + + + Could not replace geometry of feature with id + + + + Could not delete feature with id + + + + Commit error + + + + Commit Error + + + + Created output shapefile: +%1 + Створений новий шейпфайл: +%1 + + + Could not eliminate features with these ids: +%1 + + Please specify input line vector layer Будь ласка, вкажіть вхідний лінійний шар @@ -1431,11 +1453,38 @@ Are you sure you want to proceed? + + Eliminate sliver polygons + + + + + area + площа + + + + Selected features: + + + + + common boundary + + + + + Merge selection with the neighbouring polygon with the largest + + + + Save to new file + Add result to canvas @@ -1477,16 +1526,6 @@ Are you sure you want to proceed? Dialog Діалог - - - About SEXTANTE - - - - - about:blank - - DlgAddGeometryColumn @@ -1566,22 +1605,22 @@ Are you sure you want to proceed? Add constraint - + Додати обмеження Column - Поле + Поле Primary key - + Первинний ключ Unique - + Унікальне @@ -1589,17 +1628,17 @@ Are you sure you want to proceed? Create index - + Створити індекс Column - Поле + Поле Name - Ім'я + Ім'я @@ -1716,22 +1755,22 @@ Are you sure you want to proceed? Database Error - Помилка БД + Помилка бази даних An error occured: - + Виявлено помилку: An error occured when executing a query: - + Виявлена помилка при виконанні запита: Query: - + Запит: @@ -2576,7 +2615,7 @@ Do you want terminate it anyway? Processing completed. - + Обробку завершено. %1 not created. @@ -2904,7 +2943,7 @@ Disable the "Use intersected extent" option to have a nonempty output. Select... - Вибрати... + Вибрати... @@ -4631,28 +4670,39 @@ Input CRS error: One or more input layers missing coordinate reference informati GlobePlugin - + Launch Globe - + Globe Settings - + + Unload Globe + + + + Overlay data on a 3D globe - + Settings for 3D globe - + Unload globe + + + + + + &Globe @@ -4849,22 +4899,35 @@ Input CRS error: One or more input layers missing coordinate reference informati + + Help + + + Dialog + + + + + about:blank + + + LayerPropertiesWidget Form - + Symbol layer type - Тип шару + Тип шару This layer doesn't have any editable properties - + Цей шар не має жодних налаштуваннь, які можна змінити @@ -4919,12 +4982,12 @@ Input CRS error: One or more input layers missing coordinate reference informati - + &Settings &Установки - + &Plugins П&лагіни @@ -4934,12 +4997,12 @@ Input CRS error: One or more input layers missing coordinate reference informati &Оформлення - + &Raster &Растр - + &Help &Довідка @@ -4949,274 +5012,274 @@ Input CRS error: One or more input layers missing coordinate reference informati - + File Файл - + Manage Layers Управління шарами - + Digitizing Оцифровка - + Advanced Digitizing Розширена оцифровка - + Map Navigation Навігація по карті - + Attributes Атрибути - + Plugins Плагіни - + Help Довідка - + Raster Растр - + Label Підпис - + Vector Вектор - + Database База даних - + Web Веб-сайт - + &New Project &Новий проект - + Ctrl+N Ctrl+N - + &Open Project... &Відкрити проект... - + Ctrl+O Ctrl+O - + &Save Project &Зберегти проект - + Ctrl+S Ctrl+S - + Save Project &As... Зберегти проект &як... - + Ctrl+Shift+S - + Save as Image... Зберегти як зображення... - + &New Print Composer &Нова компоновка карти - + Ctrl+P Ctrl+P - + Composer Manager... - + Add Feature - + Merge Selected Features - + Merge Attributes of Selected Features - + Select Single Feature - + Select Features by Rectangle - + Select Features by Polygon - + Select Features by Freehand - + Select Features by Radius - + Deselect Features from All Layers - + Form Annotation - + Layer Labeling Options - + Add PostGIS Layers... - + Toggle Editing - + Save Edits - + Save As... Зберегти як... - + Save Selection as Vector File... - + Set Project CRS from Layer - + Rotate Label Ctl (Cmd) increments by 15 deg. - + Embed Layers and Groups... - + Run Feature Action - - + + Touch zoom and pan - + Offset Curve - + Copy style - + Paste style - + Add WCS Layer... - + &Grid - + Grid - + Pin/Unpin Labels - + Pin/Unpin Labels Click or marquee on label to pin Shift unpins, Ctl (Cmd) toggles state @@ -5224,44 +5287,44 @@ Acts on all editable layers - - + + Highlight Pinned Labels - - + + New Blank Project - + Local Cumulative Cut Stretch - + Local cumulative cut stretch using current extent, default limits and estimated values. - + Full Dataset Cumulative Cut Stretch - + Cumulative cut stretch using full dataset extent, default limits and estimated values. - + Show/Hide Labels - + Show/Hide Labels Click or marquee on feature to show label Shift+click or marquee on label to hide it @@ -5269,72 +5332,83 @@ Acts on currently active editable layer - - + + Html Annotation + + + + Duplicate Layer(s) + + + + + SVG annotation + + Composer manager... Менеджер компоновок... - + Exit Вихід - + Ctrl+Q Ctrl+Q - + &Undo В&ідмінити - + Ctrl+Z Ctrl+Z - + &Redo &Повторити - + Ctrl+Shift+Z Ctrl+Shift+Z - + Cut Features Вирізати об'єкти - + Ctrl+X Ctrl+X - + Copy Features Копіювати об'єкти - + Ctrl+C Ctrl+C - + Paste Features Вставити об'єкти - + Ctrl+V Ctrl+V @@ -5343,7 +5417,7 @@ Acts on currently active editable layer Створити точку - + Ctrl+. Ctrl+. @@ -5368,47 +5442,47 @@ Acts on currently active editable layer Додати об'єкт - + Move Feature(s) Перемістити об'єкт(и) - + Reshape Features Відкоректувати об'єкти - + Split Features Розділити об'єкти - + Delete Selected Видалити виділені - + Add Ring Додати кільце - + Add Part Додати частину - + Simplify Feature Спростити об'єкт - + Delete Ring Видалити кільце - + Delete Part Видалити частину @@ -5417,42 +5491,42 @@ Acts on currently active editable layer Об'єднати виділені об'єкти - + Node Tool Інструмент редагування вузлів - + Rotate Point Symbols Повернути точкові символи - + Snapping Options... - + Pan Map Прокрутка карти - + Zoom In Збільшити - + Ctrl++ Ctrl++ - + Zoom Out Зменшити - + Ctrl+- Ctrl+- @@ -5477,128 +5551,128 @@ Acts on currently active editable layer Зняти виділення в усіх шарах - + Identify Features Визначити об'єкти - + Ctrl+Shift+I Ctrl+Shift+I - + Measure Line - - + + Ctrl+Shift+M Ctrl+Shift+M - + Measure Area Виміряти площу - + Ctrl+Shift+J Ctrl+Shift+J - + Measure Angle Виміряти кут - + Zoom Full Повне охоплення - + Ctrl+Shift+F Ctrl+Shift+F - + Zoom to Layer Збільшити до шару - + Zoom to Selection Збільшити до виділеного - + Ctrl+J Ctrl+J - + Zoom Last Попереднє охоплення - + Zoom Next Наступне охоплення - + Zoom Actual Size Фактичний розмір - + Zoom to Native Pixel Resolution - + Map Tips Інтерактивна довідка - + Show information about a feature when the mouse is hovered over it Показати інформацію про об'єкт, коли курсор миші знаходиться над ним - + New Bookmark... Нова закладка... - + Ctrl+B Ctrl+B - + Show Bookmarks Показати закладки - + Ctrl+Shift+B Ctrl+Shift+B - + Refresh Оновити - + Ctrl+R Ctrl+R - + Text Annotation Текстова анотація @@ -5607,57 +5681,57 @@ Acts on currently active editable layer Діалогова анотація - + Move Annotation Перемістити анотацію - + Labeling Підписи - + New Shapefile Layer... Новий шар Shapefile... - + Ctrl+Shift+N Ctrl+Shift+N - + New SpatiaLite Layer ... Новий шар SpatiaLite... - + Ctrl+Shift+A - + Raster calculator ... - + Add Vector Layer... Додати векторний шар... - + Ctrl+Shift+V Ctrl+Shift+V - + Add Raster Layer... Додати растровий шар... - + Ctrl+Shift+R Ctrl+Shift+R @@ -5666,37 +5740,37 @@ Acts on currently active editable layer Додати шар PostGIS... - + Ctrl+Shift+D Ctrl+Shift+D - + Add SpatiaLite Layer... Додати шар SpatiaLite... - + Ctrl+Shift+L Ctrl+Shift+L - + Add MSSQL Spatial Layer... - + Add WMS Layer... Додати шар WMS... - + Ctrl+Shift+W Ctrl+Shift+W - + Open Attribute Table Відкрити таблицю атрибутів @@ -5705,7 +5779,7 @@ Acts on currently active editable layer Режим редагування - + Toggles the editing state of the current layer Переключити поточний шар в режим редагування @@ -5714,7 +5788,7 @@ Acts on currently active editable layer Зберегти зміни - + Save edits to current layer, but continue editing Зберегти зміни в поточному шарі і продовжити редагування @@ -5727,22 +5801,22 @@ Acts on currently active editable layer Зберегти виділене як... - + Remove Layer(s) - + Ctrl+D Ctrl+D - + Set CRS of Layer(s) - + Ctrl+Shift+C @@ -5751,94 +5825,94 @@ Acts on currently active editable layer Рівень деталізації - + Remove All from Overview - + Style Manager... - + Stretch Histogram to Full Dataset - + Customization... - + mActionCatchForCustomization - + This is here just to avoid shortcut conflicts, the shortcut is caught in QgsCustomization - + Ctrl+M Ctrl+M - + Embed layers and groups from other project files - + &Copyright Label &Знак авторського права - + Creates a copyright label that is displayed on the map canvas. Створює знак авторського права, що відображається на полотні карти. - + &North Arrow &Стрілка Півночі - + "Creates a north arrow that is displayed on the map canvas" - + &Scale Bar &Масштабна лінійка - - + + Creates a scale bar that is displayed on the map canvas Створює масштабну лінійку в області відображення карти - + Add WFS Layer... - + Add WFS Layer - + Feature Action - - + + Pan Map to Selection @@ -5847,27 +5921,27 @@ Acts on currently active editable layer GPS-стеження реального часу - + Properties... Властивості... - + Query... Запит... - + Add to Overview Додати до огляду - + Ctrl+Shift+O Ctrl+Shift+O - + Add All to Overview Додати все до огляду @@ -5876,133 +5950,133 @@ Acts on currently active editable layer Видалити все з огляду - + Show All Layers Показати всі шари - + Ctrl+Shift+U Ctrl+Shift+U - + Hide All Layers Зховати всі шари - + Ctrl+Shift+H Ctrl+Shift+H - + Manage Plugins... Керування плагінами... - + Toggle Full Screen Mode Ввімкнути повноекранний режим - + Ctrl+F - + Project Properties... Властивості проекта... - + Ctrl+Shift+P Ctrl+Shift+P - + Options... Параметри... - + Custom CRS... Користувальницька система координат... - + Configure shortcuts... Налаштувати комбінації клавіш... - + Local Histogram Stretch - + Stretch histogram of active raster to view extents - + Help Contents Зміст довідки - + F1 F1 - + API documentation - + QGIS Home Page Веб-сайт QGIS - + Ctrl+H Ctrl+H - + Check QGIS Version - + Check if your QGIS version is up to date (requires internet access) Перевірити, чи є твоя версія QGIS останньою (потрібен доступ в Інтернет) - + About Про програму - + QGIS Sponsors - - + + Move Label - + Rotate Label - + Change Label @@ -6011,12 +6085,12 @@ Acts on currently active editable layer Менеджер стилів... - + Python Console Python-консоль - + Full histogram stretch @@ -7069,7 +7143,7 @@ Please change this situation first, because OSM Plugin doesn't know what la PointsInPolygonThread point count field - Поле кількості точок + Поле кількості точок @@ -7121,6 +7195,10 @@ Please change this situation first, because OSM Plugin doesn't know what la Clear console + + Settings + Установки + Import Class @@ -7130,11 +7208,19 @@ Please change this situation first, because OSM Plugin doesn't know what la - Import sextante class + Import Sextante class + + + + Import QgisInterface class + + + + Import PyQt.QtCore class - Import iface class + Import PyQt.QtGui class @@ -7186,27 +7272,27 @@ use qgis.utils.iface object (instance of QgisInterface class). QGis::UnitType - + meters - + метри - + feet - + фути - - - + + + degrees - градусів + градусів - + <unknown> - + <невідомо> @@ -7243,117 +7329,117 @@ use qgis.utils.iface object (instance of QgisInterface class). Видалені вузли - + Moved vertices Перенесені вузли - + Python is not enabled in QGIS. - - - - - - - + + + + + + + - - + + Plugins Плагіни - + Loaded %1 (package: %2) - + Library name is %1 - - + + Failed to load %1 (Reason: %2) - + Attempting to resolve the classFactory function - + Loaded %1 (Path: %2) - + Error Loading Plugin Помилка завантаження модуля - + There was an error loading a plugin.The following diagnostic information may help the QGIS developers resolve the issue: %1. Під час завантаження модуля виникла помилка. Можливо, наступна інформація допоможе розробника вирішити проблему: %1. - + Unable to find the class factory for %1. - + Plugin %1 did not return a valid type and cannot be loaded - + Python error Помилка Python - + Error when reading metadata of plugin %1 Помилка читання метаданих модуля %1 - + Could not open CRS database %1 Error(%2): %3 - - + + CRS - + Generated CRS A CRS automatically generated from layer info get this prefix for description СК, автоматично згенерована з інформації шару, має цей префікс для опису Згенерована СК - + Saved user CRS [%1] - + Imported from GDAL @@ -7566,7 +7652,7 @@ Error(%2): %3 - + @@ -7643,7 +7729,6 @@ Error(%2): %3 - @@ -7655,12 +7740,11 @@ Error(%2): %3 - - - - - - + + + + + Warning Попередження @@ -8349,19 +8433,27 @@ Would you like to specify path (GISBASE) to your GRASS installation? Пд - Diagram Overlay - Накладення діаграм + Накладення діаграм + + + + Diagram Overlay (Legacy) + - + A plugin for placing diagrams on vector layers Плагін для розміщення діаграм на векторних шарах - + + Version 0.0.1 (Legacy) + + + Version 0.0.1 - Версія 0.0.1 + Версія 0.0.1 @@ -8493,232 +8585,245 @@ Would you like to specify path (GISBASE) to your GRASS installation? - + OGR driver for '%1' not found (OGR error: %2) Не знайдено драйвер OGR для «%1» (помилка OGR:%2) - + trimming attribute name '%1' to ten significant characters produces duplicate column name. скорочення імені атрибута «%1» до десяти значущих символів породжує дублюючися імена полів. - + creation of data source failed (OGR error:%1) не вдалося створити джерело даних (помилка OGR: %1) - + creation of layer failed (OGR error:%1) не вдалося створити шар (помилка OGR: %1) - + unsupported type for field %1 тип поля %1 не підтримується - + creation of field %1 failed (OGR error: %2) не вдалося створити поле %1 (помилка OGR: %2) - + created field %1 not found (OGR error: %2) створене поле %1 не знайдене (помилка OGR: %2) - + Invalid variant type for field %1[%2]: received %3 with type %4 - - + + Feature geometry not imported (OGR error: %1) - + Feature creation error (OGR error: %1) - + Failed to transform a point while drawing a feature of type '%1'. Writing stopped. (Exception: %2) Не вдалося трансформувати точку при виведенні об'єкта типу «%1». Запис зупинений (виняток: %2) - + Feature write errors: - + Stopping after %1 errors - + Only %1 of %2 features written. - + Arc/Info ASCII Coverage - + Atlas BNA - + Comma Separated Value - + ESRI Shapefile ESRI Shapefile - + FMEObjects Gateway - + GeoJSON - + GeoRSS - + Geography Markup Language [GML] - + Generic Mapping Tools [GMT] - + GPS eXchange Format [GPX] - + Keyhole Markup Language [KML] - + + Mapinfo TAB + + + + + Mapinfo MIF + + + + Spatial Data Transfer Standard [SDTS] - + + SpatiaLite + + + + ESRI FileGDB - + INTERLIS 1 - + INTERLIS 2 - Mapinfo File - + Microstation DGN - + S-57 Base file - + SQLite - + AutoCAD DXF - + Geoconcept - Groups not yet supported - Групи растрів не підтримуються в даний момент + Групи растрів не підтримуються в даний момент - - - + + + Cannot draw raster Не вдалося показати растр - + CRS undefined - defaulting to project CRS Не визначена система координат. Відкіт на значення за замовчуванням для проекта - + CRS undefined - defaulting to default CRS: %1 - + Reading raster @@ -8968,11 +9073,11 @@ You are seeing this message most likely because you have no DISPLAY environment - - - + - + + + @@ -9121,8 +9226,7 @@ You are seeing this message most likely because you have no DISPLAY environment - - + Cannot get GDAL raster band: %1 @@ -9147,18 +9251,18 @@ You are seeing this message most likely because you have no DISPLAY environment - + [GDAL] All files (*) [GDAL] Всі файли (*) - + GDAL/OGR VSIFileHandler - + This raster file has no bands and is invalid as a raster layer. Цей растровий файл не має каналів і не є дійсним растровим шаром @@ -9292,115 +9396,122 @@ You are seeing this message most likely because you have no DISPLAY environment - - - - - - - - - - - - - + + + + + + + + + + + + + Math - - - - - - - + + + + + + + Conversions - + Conditionals - - - - - - - - - + + + + + + + + + Date and Time - - - - - - - - - - - - - - + + + + + + + + + + + + + + + String - - - - - - - + + + + + + + Geometry Геометрія - - - + + + + Record - - + + Special + + + + + No root node! Parsing failed? - + (no root) - + Unary minus only for numeric values. - + Can't preform /, *, or % on DateTime and Interval - + [unsupported type;%1; value:%2] - + Column '%1' not found @@ -9436,12 +9547,12 @@ You are seeing this message most likely because you have no DISPLAY environment - + Globe - + Overlay data on a 3D globe @@ -9461,27 +9572,27 @@ You are seeing this message most likely because you have no DISPLAY environment - - + + - + Connection to database failed - + Creation of data source %1 failed: %2 - + Loading of the layer %1 failed - - + + Unable to delete layer %1: %2 @@ -9493,13 +9604,13 @@ You are seeing this message most likely because you have no DISPLAY environment - + Unsupported type for field %1 - + Creation of fields failed @@ -9519,24 +9630,24 @@ You are seeing this message most likely because you have no DISPLAY environment - + Unable to initialize SpatialMetadata: - + Could not create a new database - + Unable to activate FOREIGN_KEY constraints [%1] - + Unable to delete table %1: @@ -9567,60 +9678,60 @@ You are seeing this message most likely because you have no DISPLAY environment - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + Exception: %1 - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + GEOS - + GEOS prior to 3.2 doesn't support GEOSInterpolate @@ -9632,42 +9743,42 @@ You are seeing this message most likely because you have no DISPLAY environment - - + + Reading raster part %1 of %2 - + Building pyramids failed - write access denied - + Write access denied. Adjust the file permissions and try again. Закритий доступ на запис. Виправте права доступа до файлу і спробуйте ще раз. - - - - + + + + Building pyramids failed. Не вдалося побудувати піраміди. - + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. Запис у файл неможлива. Деякі формати не підтримують оглядові піраміди. Зверніться до документації GDAL за додатковою інформацією. - - + + Building pyramid overviews is not supported on this type of raster. Побудова пірамід не підтримується для даного типу растра. - + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. Побудова вбудованих оглядових пірамід для растрових шарів з JPEG-стисненням не підтримується поточною версією бібліотеки libtiff. @@ -9783,75 +9894,75 @@ You are seeing this message most likely because you have no DISPLAY environment QgisApp - + Multiple Instances of QgisApp Кілька екземплярів QgisApp - + Multiple instances of Quantum GIS application object detected. Please contact the developers. Кілька екземплярів Quantum GIS виявлено. Будь ласка, зв'яжіться з розробниками. - + Checking database Перевірка бази даних - + Reading settings Зчитування настройок - + Setting up the GUI Настройка користувальницького інтерфейсу - + Log Messages - + Quantum GIS - %1 ('%2') Quantum GIS - %1 ('%2') - + QGIS starting... - + Checking provider plugins Перевірка постачальника плагінів - + Starting Python Запуск Python - + Restoring loaded plugins Відновлення завантажених плагінів - + Initializing file filters Ініціалізація файлових фільтрів - + Restoring window state Відновлення стану вікна - - + + QGIS Ready! QGIS Готовий! @@ -9916,7 +10027,7 @@ Please contact the developers. Зберегти карту як зображення - + Quantum GIS Quantum GIS @@ -10332,7 +10443,7 @@ Please contact the developers. Оновити карту - + Labeling Підписи @@ -10571,38 +10682,38 @@ Please contact the developers. Налаштувати комбінації клавіш - + Minimize Мінімізувати - + Ctrl+M Minimize Window Ctrl+M - + Minimizes the active window to the dock Мінімізувати активне вікно в док - + Zoom Збільшити - + Toggles between a predefined size and the window size set by the user Переключення між попередньо встановленим та заданим користувачем розміром вікна - + Bring All to Front Все на передній план - + Bring forward all open windows Показати всі відкриті вікна @@ -10658,7 +10769,7 @@ Please contact the developers. Показати менеджер стилів - + Failed to open Python console: Не вдалося відкрити консоль Python: @@ -10679,12 +10790,12 @@ Please contact the developers. &Правка - + Panels Панелі - + Toolbars Панелі інструментів @@ -10757,24 +10868,24 @@ Please contact the developers. Довідка - + Progress bar that displays the status of rendering layers and other time-intensive operations Індикатор ходу процесу відтворення шарів та інших довготривалих операцій Индикатор ходу процесу - + Toggle extents and mouse position display Переключити вивід меж або позиції курсору - - + + Coordinate: Координати: - + Current map coordinate Поточні координати на карті @@ -10787,42 +10898,42 @@ Please contact the developers. Поточні координати на карті (у форматі x, y) - + Scale Масштаб - + Current map scale Поточний масштаб карти - + Displays the current map scale Показати поточний масштаб карти - + Current map scale (formatted as x:y) Поточний масштаб карти (у форматі x:y) - + Stop map rendering Зупинити рендерінг карти - + Render Render - + When checked, the map layers are rendered in response to map navigation commands and other events. When not checked, no rendering is done. This allows you to add a large number of layers and symbolize them before rendering. Якщо включено, рендерінг шарів карти виконується відразу у відповідь на команди навігації та інші події. Якщо вимкнено, рендерінг не виконується. Наприклад, це дозволяє додати велику кількість шарів і призначити їм умовні позначення до їх відображення. - + Toggle map rendering Переключити рендерінг карти @@ -10839,17 +10950,17 @@ Please contact the developers. Вихід... - + This icon shows whether on the fly coordinate reference system transformation is enabled or not. Click the icon to bring up the project properties dialog to alter this behaviour. Ця іконка показує, чи було ввімкнене перетворення координат на льоту. Натисніть на іконку, щоб відкрити діалогове вікно властивостей проекту для зміни цього режиму. - + CRS status - Click to open coordinate reference system dialog Статус СК - Клацніть для відкриття діалогу властивостей системи координат - + Ready Готовий @@ -11096,39 +11207,39 @@ This copy of QGIS has been built with GDAL/OGR %1. Підтримує більше операторів GEOS - + Select raster layers to add... Виберіть растровий шар для додавання... - + Raster Растр - + Select vector layers to add... Виберіть векторний шар для додавання... - + Please select a vector layer first. Будь ласка, спочатку виберіть векторний шар. - - - + + + Not enough features selected Недостатньо об'єктів вибрано - + Union operation canceled Операція об'єднання скасована - + SSL errors occured accessing URL %1: Виникла помилка SSL при доступі до URL %1: @@ -11145,17 +11256,17 @@ Ignore errors? Виникла помилка SSL - + Map canvas. This is where raster and vector layers are displayed when added to the map Робоча область. Це область, в якій відображаються растрові та векторні шари, коли додані до карти - + Vect&or - + &Web @@ -11190,23 +11301,23 @@ This copy of QGIS has been built without PostgreSQL support. Дана версія QGIS зібрана без підтримки PostgreSQL. - + Warning Попередження - + This layer doesn't have a properties dialog. Цей шар не має діалога властивостей. - + Authentication required встановлення автентичності Потрібна аутентифікація - + Proxy authentication required Необхідна аутентифікація проксі-сервера @@ -11245,14 +11356,14 @@ This binary was compiled against Qt %1,and is currently running against Qt %2Версія - + %1 is not a valid or recognized data source %1 не є дійсним чи розпізнаним джерелом даних - - - + + + Invalid Data Source Недійсне джерело даних @@ -11262,7 +11373,7 @@ This binary was compiled against Qt %1,and is currently running against Qt %2Ctrl+D - + &Database @@ -11271,12 +11382,15 @@ This binary was compiled against Qt %1,and is currently running against Qt %2Підпис - + + + + Invalid Layer Недійсний шар - + %1 is an invalid layer and cannot be loaded. Шар %1 не дійсний і не може бути завантаженим. @@ -11285,18 +11399,18 @@ This binary was compiled against Qt %1,and is currently running against Qt %2Зберегти як - + Calculating... - - + + Abort... Відмінити... - + Choose a QGIS project file to open Виберіть файл проекта QGIS для відкриття @@ -11309,124 +11423,134 @@ This binary was compiled against Qt %1,and is currently running against Qt %2Помилка зчитування проекта QGIS - + Unable to open project Не вдається відкрити проект - + + project macros have been disabled. + + + + + Enable macros + + + + Choose a QGIS project file Виберіть файл проекта QGIS - - + + Saved project to: %1 Проект збережений до: %1 - - + + Unable to save project %1 Не вдається зберегти проект %1 - + Choose a file name to save the QGIS project file as Виберіть ім'я файлу для збереження файлу проекту QGIS як - + Unable to load %1 - + Choose a file name to save the map image as Виберіть ім'я файлу для збереження зображення карти як - + Saved map image to %1 Зображення карти збережено в %1 - + Layer labeling settings Установки підписів шару - + Saving done Збереження виконано - + Export to vector file has been completed Експорт у векторний файл закінчено - + Save error Помилка збереження - + Export to vector file failed. Error: %1 Не вдалося експортувати у векторний файл. Помилка: %1 - - + + No Layer Selected Шар не вибраний - + To delete features, you must select a vector layer in the legend Для видалення об'єктів необхідно вибрати векторний шар в легенді - + No Vector Layer Selected Векторний шар не вибраний - + Deleting features only works on vector layers Видалення об'єктів працює тільки на векторном шарі - + Provider does not support deletion Джерело не підтримує видалення - + Data provider does not support deleting features Джерело даних не підтримує видалення об'єктів - - - + + + Layer not editable Шар не підтримує редагування - + The current layer is not editable. Choose 'Start editing' in the digitizing toolbar. Для поточного шару не вибраний режим редагування. Виберіть 'Розпочати редагування' на панелі інструментів оцифровки. - + Delete features Видалити об'єкти - + Delete %n feature(s)? number of features to delete @@ -11436,207 +11560,236 @@ Error: %1 - + Features deleted Об'єкти видалено - + Problem deleting features Помилка видалення об'єктів - + A problem occured during deletion of features Виникла проблема під час видалення об'єктів - + Merging features... Об'єднання об'єктів... - + Abort Скасувати - - + + Composer %1 Компоновка %1 - - + + No active layer Не має активного шару - - + + No active layer found. Please select a layer in the layer list Не знайдений активний шар. Будь ласка, виберіть шар в списку шарів - - + + Active layer is not vector Активний шар не є векторним - - + + The merge features tool only works on vector layers. Please select a vector layer from the layer list Інструмент об'єднання об'єктів працює тільки на векторних шарах. Будь ласка, виберіть векторний шар з списку шарів - - + + Merging features can only be done for layers in editing mode. To use the merge tool, go to Layer->Toggle editing Об'єднання об'єктів можливе лише в режимі редагування шарів. Для виконання об'єднання, виберіть Шар -> Режим редагування - - - + + + The merge tool requires at least two selected features Для об'єднання об'єктів необхідно вибрати хоча б два об'єкта - + Merged feature attributes - - + + Merge failed Помилка об'єднання - - + + An error occured during the merge operation Виникла помилка під час об'днання об'єктів - - + + The union operation would result in a geometry type that is not compatible with the current layer and therefore is canceled Операція об'єднання призведе до зміни геометричного типу, який не сумістний з поточним шаром, і тому відмінена - + Merged features Об'єднані об'єкти - + Features cut Вирізка об'єктів - + Features pasted Об'єкти вставлені - + Cannot copy style: %1 - + Cannot parse style: %1:%2:%3 - + Cannot read style: %1 - + Start editing failed Не вдалося почати редагування - + Provider cannot be opened for editing Джерело не може бути відкрите для редагування - + Stop editing Зупинити редагування - + Do you want to save the changes to layer %1? Ви хочете зберегти зміни в шарі %1? - + + copy + + + + + Plugin layer + + + + + Memory layer + + + + + + Duplicate layer: + + + + + %1 (duplication resulted in invalid layer) + + + + + %1 (%2type unsupported) + + + + Couldn't load Python support library: %1 - + Couldn't resolve python support library's instance() symbol. - + Python support ENABLED :-) - + QGIS - Changes since last release - + Unknown network socket error: %1 - - + + To perform a full histogram stretch, you need to have a raster layer selected. - + This project file was saved by an older version of QGIS - + Always ignore these errors? - + %n SSL errors occured number of errors - - - - - - - - - + + + + + + + Error Помилка @@ -11733,13 +11886,13 @@ This copy of QGIS has been built with SpatiaLite support (%1). Використання QNetworkAccessManager замість QgsHttpTransaction (включаючи кешування і динамічну авторизацію для сайта і проксі-серверів) - + %1 doesn't have any layers %1 не має шарів - - + + Could not commit changes to layer %1 Errors: %2 @@ -11749,7 +11902,7 @@ Errors: %2 Помилки: %2 - + Problems during roll back Проблеми під час відкату @@ -11758,7 +11911,7 @@ Errors: %2 Неправильний масштаб - + GPS Information Інформація GPS @@ -11771,30 +11924,30 @@ Errors: %2 Python-консоль - + There is a new version of QGIS available Доступна нова версія QGIS - + You are running a development version of QGIS Ви працюєте в розроблюваній версії QGIS - + You are running the current version of QGIS Ви працюєте в поточній версії QGIS - + Would you like more information? Хочете більше інформації? - - - - + + + + QGIS Version Information Інформація про версію QGIS @@ -11803,17 +11956,17 @@ Errors: %2 QGIS - Зміни в SVN з останнього випуску - + Unable to get current version information from server Не вдається отримати інформацію про поточну версію з сервера - + Connection refused - server may be down У підключенні відмовлено - можливо, сервер недоступний - + QGIS server was not found Сервер QGIS не знайдено @@ -11826,14 +11979,14 @@ Errors: %2 Невідома помилка мережного з'єднання - + Unable to communicate with QGIS Version server %1 Не вдається зв'язатися з сервером версій QGIS %1 - + No Raster Layer Selected @@ -11848,70 +12001,68 @@ Errors: %2 - + Cannot get MSSQL select dialog from provider. - - - + + Layer is not valid Невірний шар - + The layer %1 is not a valid layer and can not be added to the map Шар %1 не дійсний і не може бути доданий на карту - - + The layer is not a valid layer and can not be added to the map Шар не дійсний і не може бути доданий на карту - + Save? Зберегти? - + Do you want to save the current project? Ви хочете зберегти поточний проект? - + Current CRS: %1 (OTFR enabled) - + Current CRS: %1 (OTFR disabled) - + Map coordinates for the current view extents Межі поточного огляду в координатах карти - + Map coordinates at mouse cursor position Координати карти в позиції курсору миші - + Extents: Межі: - + Maptips require an active layer Для показу інтерактивної довідки необхідний активний шар - + %n feature(s) selected on layer %1. number of selected features @@ -11921,22 +12072,22 @@ Errors: %2 - + Open a GDAL Supported Raster Data Source Відкрити GDAL-сумістне джерело растрових даних - + %1 is not a valid or recognized raster data source %1 не є дійсним чи розпізнаним джерелом растрових даних - + %1 is not a supported raster data source %1 не є підтримуваним джерелом растрових даних - + Unsupported Data Source Непідтримуване джерело даних @@ -11949,42 +12100,32 @@ Errors: %2 Не вдається створити закладку. Користувальницька база даних відсутня чи пошкоджена - + Project file is older Застарілий файл проекту - + <p>This project file was saved by an older version of QGIS. When saving this project file, QGIS will update it to the latest version, possibly rendering it useless for older versions of QGIS.<p>Even though QGIS developers try to maintain backwards compatibility, some of the information from the old project file might be lost. To improve the quality of QGIS, we appreciate if you file a bug report at %3. Be sure to include the old project file, and state the version of QGIS you used to discover the error.<p>To remove this warning when opening an older project file, uncheck the box '%5' in the %4 menu.<p>Version of the project file: %1<br>Current version of QGIS: %2 <p>Цей файл проекту був збережений в старій версії QGIS. При збереженні цього файлу проекту, QGIS обновить його до останньої версії, можливо, зробить його нечитаємим для більш старих версій QGIS.<p>Хоча розробники QGIS намагаються зберегти зворотну сумісність, деяка інформація зі старого файлу проекту може бути втрачена. Щоб поліпшити якість QGIS, ми вдячні, якщо ви відправите звіт про помилку (bug) на %3. Не забудьте включити старий файл проекту і заявити версію QGIS, яку Ви використовували, щоб знайти помилку.<p>Щоб усунути це попередження при відкриванні файлу проекту старої версії, зніміть прапорець '%5' в %4 меню.<p>Версія файла проекта: %1<br>Поточна версія QGIS: %2 - + Security warning: - - macros have been disabled. - - - - - Enable - - - - + Window - + Shows the map coordinates at the current cursor position. The display is continuously updated as the mouse is moved. It also allows editing to set the canvas center to a given position. The format is lat,lon or east,north - + Current map coordinate (lat,lon or east,north) @@ -12016,7 +12157,7 @@ Errors: %2 - + < Blank > @@ -12072,95 +12213,100 @@ Errors: %2 - + + QScintilla2 Version + + + + This copy of QGIS writes debugging output. - + Select zip layers to add... - + Vector Вектор - + PostgreSQL - + Cannot get PostgreSQL select dialog from provider. - + %1 is an invalid layer - not loaded - + SpatiaLite - + Cannot get SpatiaLite select dialog from provider. - + MSSQL - + WMS WMS - + Cannot get WMS select dialog from provider. - + WCS - + Cannot get WCS select dialog from provider. - + WFS - + Cannot get WFS select dialog from provider. - - - + + + QGis files - + <tt>Settings:Options:General</tt> Menu path to setting options <tt>Установки:Параметри:Загальні</tt> - + Warn me when opening a project file saved with an older version of QGIS Попереджати при відкритті файла проекта старої версій QGIS @@ -12177,9 +12323,9 @@ Errors: %2 Виконати дію - + Attributes changed - + Атрибути змінено @@ -12290,7 +12436,12 @@ p, li { white-space: pre-wrap; } Розробники - + + Essen (Germany), Developer meeting 2012 + + + + about:blank @@ -12300,7 +12451,7 @@ p, li { white-space: pre-wrap; } Джерела - + Contributors Помічники Ассистенти @@ -12310,12 +12461,12 @@ p, li { white-space: pre-wrap; } Спонсори - + Donors Донори - + Translators Перекладачі @@ -12325,12 +12476,12 @@ p, li { white-space: pre-wrap; } Warning - Попередження + Увага Invalid field name. This field name is reserved and cannot be used. - + Недійсне ім'я поля. Це ім'я є зарезервованим і не може використовуватися. @@ -12404,6 +12555,42 @@ p, li { white-space: pre-wrap; } + + QgsAddTabOrGroup + + + Add tab or group for %1 + Додати вкладку чи групу для %1 + + + + QgsAddTabOrGroupBase + + + Dialog + + + + + Create category + Створити категорію + + + + as + як + + + + a tab + вкладку + + + + a group in container + групу в контейнері + + QgsAnnotationWidget @@ -12426,7 +12613,7 @@ p, li { white-space: pre-wrap; } Fixed map position - + Прив'язати анотацію до карти @@ -12447,19 +12634,19 @@ p, li { white-space: pre-wrap; } QgsApplication - - - + + + Exception Виняток - + unknown exception Невідоме виключення - + Application state: QGIS_PREFIX_PATH env var: %1 Prefix: %2 @@ -12471,13 +12658,95 @@ Default Theme Path: %7 SVG Search Paths: %8 User DB Path: %9 - + - + match indentation of application state + + + + + QgsAtlasCompositionWidget + + + + Map %1 + Карта %1 + + + + Expression based filename + Ім'я файла на основі виразу + + + + QgsAtlasCompositionWidgetBase + + + Atlas generation + + + + + Atlas options + + + + + Hide the coverage layer when generating the output + + + + + Hidden coverage layer + + + + + Margin around coverage + + + + + Output filename expression + + + + + % + + + + + ... + ... + + + + Coverage layer + + + + + Fixed scale + + + + + Single file export when possible + + + + + Composer map to use + + + + + Generate an atlas @@ -12797,17 +13066,17 @@ User DB Path: %9 (текст) - + Error - Помилка + Помилка - + Error: %1 - + Помилка: %1 - + Attributes - %1 Атрибути - %1 @@ -12815,22 +13084,22 @@ User DB Path: %9 QgsAttributeEditor - + Select a file Виберіть файл - + Select a date Виберіть дату - + (no selection) - + (не вибрано) - + ... ... @@ -12893,13 +13162,13 @@ User DB Path: %9 Ascending - + За зростанням Descending - + За спаданням @@ -12950,7 +13219,7 @@ User DB Path: %9 Attributes changed - + Атрибути змінено @@ -12958,7 +13227,7 @@ User DB Path: %9 Attribute changed - Атрибут змінено + Атрибут змінено @@ -12991,13 +13260,11 @@ User DB Path: %9 - + Attribute table - %1 :: %n / %2 feature(s) selected feature count - - @@ -13334,9 +13601,9 @@ User DB Path: %9 Атрибут змінено - + feature id - ID об'єкта + ID об'єкта @@ -13399,157 +13666,157 @@ Error was:%2 Діалог редагування атрибутів - + Line edit Лінійне редагування - + Classification Класифікація - + Range Діапазон - + Unique values Унікальні значення - + File name Ім'я файла - + Value map Карта значень - + Enumeration Перелік - + Immutable Незмінний - + Hidden Прихований - + Checkbox Перемикач - + Text edit Текстове поле - + Calendar Календар - + Value relation - + UUID generator - + Simple edit box. This is the default editation widget. Просте поле введення. Це віджет редагування за умовчанням. - + Displays combo box containing values of attribute used for classification. Відображає випадаючий список, що містить значення атрибута, які використовуються для класифікації. - + Allows one to set numeric values from a specified range. The edit widget can be either a slider or a spin box. Дозволяє встановити числові значення з зазначеного діапазону. Віджет редагування може бути повзунком чи полем вводу. - + Minimum Мінімум - + Maximum Максимум - + Step Крок - + A calendar widget to enter a date. Віджет "Календар" для введення дати. - + Layer Шар - + Key column Ключове поле - + Allow multiple selections - + Value column - + Select layer, key column and value column - + Allow null value - + Order by value - + Filter column - + Filter value - + Read-only field that generates a UUID if empty. @@ -13560,84 +13827,84 @@ Error was:%2 Повзунок - + Editable Підтримує редагування - + Local minimum/maximum = 0/0 Локальний мінімум/максимум = 0/0 - + The user can select one of the values already used in the attribute. If editable, a line edit is shown with autocompletion support, otherwise a combo box is used. Користувач може вибрати одне зі значень, вже використовуємих в атрибуті. Якщо підтримує редагування, лінійне редагування показується з підтримкою автодоповнення, інакше використовується випадаючий список. - + Simplifies file selection by adding a file chooser dialog. Спрощує вибір файлів, додаючи діалог вибору файлів. - + Combo box with predefined items. Value is stored in the attribute, description is shown in the combo box. Випадаючий список з наперед визначеними елементами. Значення зберігається в атрибуті, опис виводиться в списку. - + Load Data from layer Завантажити дані з шару - + Value Значення - + Description Опис - + Remove Selected Видалити вибране - + Load Data from CSV file Завантажити дані з файлу CSV - + Combo box with values that can be used within the column's type. Must be supported by the provider. Випадаючий список значень допустимих для поля даного типу . Елемент повинен підтримуватися джерелом даних. - + An immutable attribute is read-only - the user is not able to modify the contents. Не змінні атрибути доступні тільки для читання - користувач не зможе змінити їх. - + A hidden attribute will be invisible - the user is not able to see it's contents. Приховані атрибути не будуть відображатися - користувач не зможе побачити їх. - + Representation for checked state Представлення для вибраного стану - + Representation for unchecked state Представлення для невибраного стану - + A text edit field that accepts multiple lines will be used. Текстове поле, що дозволяє введення багаторядкового тексту. @@ -13733,8 +14000,6 @@ Database:%2 number of rows - - @@ -13796,22 +14061,22 @@ Database:%2 WMS - WMS + Cannot get WMS select dialog from provider. - + Не вдалося відкрити діалог вибору WMS. CRS - + Система координат Cannot set layer CRS - + Не вдалося задати систему координат @@ -13893,102 +14158,173 @@ Database:%2 Ctrl+Shift+W + + QgsBrowserDirectoryPropertiesBase + + + Dialog + + + + + Path + Шлях + + QgsBrowserDockWidget - + Browser - - Refresh - Оновити + Оновити - - Add Selection + + Add Selected Layers - - - Add Selected Layers + + Add as a favourite - - Collapse All + + Remove favourite - - Add as a favourite + + Add Layer - - Remove favourite + + + Properties - - Add Layer + + Filter Pattern Syntax - - Properties + + Wildcard(s) - + + Regular Expression + + + + Add a directory - + Add directory to favourites - + Error Помилка - + Layer Properties + + + Directory Properties + + + + + QgsBrowserDockWidgetBase + + + Browser + + + + + + Refresh + Оновити + + + + Add Selected Layers + + + + + Add + Додати + + + + Filter Files + + + + + + ... + ... + + + + Collapse All + + + + + Options + Параметри + + + + Filter files + + QgsBrowserLayerPropertiesBase Dialog - Діалог + Display Name - + Ім'я в легенді Layer Source - + Шар Provider - + Джерело Metadata - Метадані + Метадані @@ -13996,12 +14332,12 @@ Database:%2 Home - + Домашній каталог Favourites - + Вибране @@ -14083,47 +14419,61 @@ Database:%2 - QgsCategorizedSymbolRendererV2Widget + QgsCategorizedSymbolRendererV2Model + + + Symbol + Символ + - - + Value Значення - - + Label Підпис + + + QgsCategorizedSymbolRendererV2Widget + + Value + Значення + + + Label + Підпис + - + Symbol levels... - - + + Error Помилка - + There are no available color ramps. You can add them in Style Manager. Немає доступних кольорових шкал. Ви можете додати їх в Менеджері стилів. - + The selected color ramp is not available. Вибрана колірна шкала не доступна. - + Confirm Delete Підтвердіть видалення - + The classification field was changed from '%1' to '%2'. Should the existing classes be deleted before classification? Поле класифікації було змінено з '%1' на '%2'. @@ -14141,8 +14491,6 @@ Should the existing classes be deleted before classification? - - Symbol Символ @@ -14152,42 +14500,60 @@ Should the existing classes be deleted before classification? Колірна шкала - + Classify Класифікувати - + Add Додати - + Delete Видалити - + Delete all Видалити все - + Join Об'єднати - + Advanced Розширений + + QgsCharacterSelectorBase + + + Character Selector + Вибір символа + + + + Font: + Шрифт: + + + + Current font family and style + Поточне сімейство шрифтів та стиль + + QgsColorRampComboBox New color ramp... - + Нова колірна шкала... @@ -14195,12 +14561,12 @@ Should the existing classes be deleted before classification? Show compass - + Показати компас &About - &Про програму + &Про програму @@ -14208,7 +14574,7 @@ Should the existing classes be deleted before classification? Pixmap not found - Зображення не знайдено + Зображення не знайдено @@ -14216,48 +14582,120 @@ Should the existing classes be deleted before classification? Internal Compass - + Вбудований компас Azimut - + Азимут QgsComposer - + QGIS QGIS - + File Файл - + View Вид - + Panels Панелі - + Toolbars Панелі інструментів - + Layout Макет - + + Atlas generation + + + + + + + Empty filename pattern + + + + + + + The filename pattern is empty. A default one will be used. + + + + + Directory where to save PDF files + + + + + + + Unable to write into the directory + + + + + + + The given output directory is not writeable. Cancelling. + + + + + + + + Rendering maps... + + + + + + + + Abort + + + + + + + + Atlas processing error + + + + + Directory where to save image files + + + + + Image format: + + + + <p>The SVG export function in QGIS has several problems due to bugs and deficiencies in the @@ -14266,18 +14704,18 @@ Should the existing classes be deleted before classification? Карта 1 - + Command history - - + + Choose a file name to save the map as Виберіть ім'я файла для збереження карти як - + PDF Format Формат PDF @@ -14290,7 +14728,7 @@ Should the existing classes be deleted before classification? Створення зображення розміром %1x%2 пікселів не вдалося. Повторити без 'Друк як Растр'? - + Big image Велике зображення @@ -14299,7 +14737,7 @@ Should the existing classes be deleted before classification? Для створення зображень %1 x %2 потрібно близько %3 МБ пам'яті - + To create image %1x%2 requires about %3 MB of memory. Proceed? Для створення зображення %1x%2 потрібно близько %3 MB пам'яті. Продовжити? @@ -14308,17 +14746,17 @@ Should the existing classes be deleted before classification? Формат %1 (*.%2 *.%3) - + Composition Композиція - + Item Properties - + Choose a file name to save the map image as Виберіть ім'я файла для збереження зображення карти як @@ -14331,13 +14769,13 @@ Should the existing classes be deleted before classification? Створення зображення розміром %1x%2 пікселів не вдалося. Експорт перерваний. - + SVG warning Попередження SVG - - + + Don't show this message again Не показувати це повідомлення знову @@ -14346,27 +14784,32 @@ Should the existing classes be deleted before classification? <p>Функція SVG експорта в QGIS має кілька проблем пов'язаних з помилками і недоліками у - + Qt4 svg code. In particular, there are problems with layers not being clipped to the map bounding box.</p> Qt4 svg код. Зокрема, існують проблеми з шарами, які не відсікаються рамкою карти.</p> - + If you require a vector-based output file from Qgis it is suggested that you try printing to PostScript if the SVG output is not satisfactory.</p> Якщо вам необхідно отримати векторний вихідний файл з QGIS, то передбачається, що ви намагаєтеся роздрукувати в PostScript, якщо вивід в SVG не є задовільним.</P> - + SVG Format Формат SVG - + + Directory where to save SVG files + + + + Save template - + Composer templates @@ -14375,27 +14818,27 @@ Should the existing classes be deleted before classification? Зберегти шаблон - + Save error Помилка збереження - + Error, could not save file Помилка, не вдалося зберегти файл - + Load template Завантажити шаблон - + Read error Помилка читання - + Error, could not read file Помилка, не вдалося прочитати файл @@ -14404,17 +14847,17 @@ Should the existing classes be deleted before classification? Невірний вміст файла шаблона - + Composer Компонувальник карт - + Project contains WMS layers Проект містить WMS-шар - + Some WMS servers (e.g. UMN mapserver) have a limit for the WIDTH and HEIGHT parameter. Printing layers from such servers may exceed this limit. If this is the case, the WMS layer will not be printed Деякі WMS-сервери (наприклад, UMN mapserver) мають обмеження на значення параметрів ширини і висоти (WIDTH і HEIGHT). Під час друку шарів з цих серверів, ці ліміти можуть бути перевищені. У цьому випадку, WMS-шар не буде надрукований @@ -14909,42 +15352,42 @@ Should the existing classes be deleted before classification? QgsComposerHtmlWidget - + Use existing frames - + Extend to next page - + Repeat on every page - + Repeat until finished - + General options Загальні параметри - + Change html url - + Select HTML document - + Change resize mode @@ -14954,22 +15397,22 @@ Should the existing classes be deleted before classification? Form - + HTML - + ... - ... + URL - URL + @@ -14982,7 +15425,7 @@ Should the existing classes be deleted before classification? Change item position - + Зміна положення елемента @@ -15073,43 +15516,49 @@ Should the existing classes be deleted before classification? QgsComposerLabelWidget - + General options Загальні параметри - + Label text changed - - + + Label font changed - + Label margin changed - - - - - - + + + Insert expression + + + + + + + + + Label alignment changed - + Label id changed - + Label rotation changed @@ -15195,6 +15644,11 @@ Should the existing classes be deleted before classification? mm мм + + + Insert an expression + + QgsComposerLegend @@ -15222,7 +15676,7 @@ Should the existing classes be deleted before classification? Add layer to legend - + Додати шар до легенди @@ -15232,103 +15686,104 @@ Should the existing classes be deleted before classification? Параметри елемента - + General Options - + Item wrapping changed - + Legend title changed - + Legend symbol width - + Legend symbol height - + Legend group space - + Legend layer space - + Legend symbol space - + Legend icon label space - + Title font changed - + Legend group font changed - + Legend layer font changed - + Legend item font changed - + Legend box space - + Legend map changed - + Legend item edited - - + + + Legend updated - + Legend group added - + Map %1 - + None @@ -15431,6 +15886,11 @@ Should the existing classes be deleted before classification? Auto Update + + + Show feature count for each class of vector layer. + + v v @@ -15448,17 +15908,17 @@ Should the existing classes be deleted before classification? Правка - + All Все - + Add group Додати групу - + Update Оновити @@ -15527,13 +15987,13 @@ Should the existing classes be deleted before classification? QgsComposerMap - - + + Map %1 Карти %1 - + Map will be printed here Карта буде зображена тут @@ -15541,129 +16001,129 @@ Should the existing classes be deleted before classification? QgsComposerMapWidget - + General options Загальні параметри - - - + + + Cache Кеш - - - + + + Render Викреслити - - - + + + Rectangle Прямокутник - - + + Solid Суцільна - - - + + + Cross Перехрестя - + Decimal - + DegreeMinute - + DegreeMinuteSecond - - + + No frame - - - + + + Zebra - - - + + + None - + Annotation format changed - + Changed grid frame style - + Changed grid frame width - - - + + + Inside frame Всередині рамки - - + + Outside frame За рамкою - - - + + + Disabled - - - + + + Horizontal Горизонтально - - + + Vertical Вертикально - + Map %1 @@ -15676,96 +16136,96 @@ Should the existing classes be deleted before classification? У напрямку рамки - + Change item width - + Change item height - + Map scale changed - + Map rotation changed - - + + Map extent changed - + Canvas items toggled - + Grid checkbox toggled - - + + Grid interval changed - - + + Grid offset changed - - + + Grid pen changed - + Grid type changed - + Grid cross width changed - + Annotation font changed - + Annotation distance changed - + Annotation position changed - + Annotation toggled - + Changed annotation direction - + Changed annotation precision @@ -15778,97 +16238,97 @@ Should the existing classes be deleted before classification? Параметри карти - + Map Карта - + Width Ширина - + Height Висота - + Scale Масштаб - + Rotation Обертання - + degrees - + Draw map canvas items - + Overview frame - + Overview style - + Change... - + Extents Екстенти - + X min Мін. X - + Y min Y мін - + Grid Сітка - + Show grid? Показувати сітку? - + Grid &type Тип &сітки - + Interval X Інтервал X - + Offset X Зміщення по X - + Line width Ширина лінії @@ -15881,117 +16341,117 @@ Should the existing classes be deleted before classification? Напрямок анотації - + Line color Колір лінії - + Interval Y Інтервал Y - + Offset Y Зміщення по Y - + Cross width Ширина перехрестя - + X max Макс. X - + Y max Макс. Y - + Set to map canvas extent Встановити по екстенту полотна карти - + Lock layers for map item Заблокувати шари карти - + Frame style - + Frame width Товщина рамки - + Draw annotation Відображати аннотацію - + Annotation position left side - + Annotation position right side - + Annotation position top side - + Annotation position bottom side - + Annotation direction left side - + Annotation direction right side - + Annotation direction top side - + Annotation direction bottom side - + Annotation format - + Font... Шрифт... - + Distance to map frame Відстань до рамки карти - + Coordinate precision Точність координат @@ -16004,7 +16464,7 @@ Should the existing classes be deleted before classification? Попередній перегляд - + Update preview Оновити попередній перегляд @@ -16155,12 +16615,12 @@ Should the existing classes be deleted before classification? km - + км m - + м @@ -16802,97 +17262,97 @@ Should the existing classes be deleted before classification? QgsComposition - + Label added - + Map added - + Arrow added - + Scale bar added - + Shape added - + Picture added - + Legend added - + Table added - + Aligned items left - + Aligned items hcenter - + Aligned items right - + Aligned items top - + Aligned items vcenter - + Aligned items bottom - + Item z-order changed - + Remove item group - + Frame deleted - + Item deleted - + Multiframe removed @@ -17537,40 +17997,40 @@ p, li { white-space: pre-wrap; } QgsCptCityBrowserModel - + Name - Ім'я + Ім'я - + Info - Інформація + Інформація QgsCptCityColorRampItem - + colors - + кольорів - + continuous - + неперервний - + continuous (multi) - + неперервний (мульті) - + discrete - + дискретний - + variants @@ -17610,12 +18070,12 @@ and current file is [%3] - + %1 directory details - + %1 gradient details @@ -17690,7 +18150,7 @@ and current file is [%3] TextLabel - + @@ -18150,22 +18610,22 @@ and current file is [%3] Bottom Left - Внизу ліворуч + Внизу ліворуч Top Left - Вгорі ліворуч + Вгорі ліворуч Top Right - Вгорі праворуч + Вгорі праворуч Bottom Right - Внизу праворуч + Внизу праворуч @@ -18248,27 +18708,27 @@ p, li { white-space: pre-wrap; } Error - Помилка + Помилка No active layer - Не має активного шару + Не вибрано активний шар Please select a raster layer - + Виберіть растровий шар Invalid raster layer - + Недійсний растровий шар Layer CRS must be equal to project CRS - + Система координат шару має співпадати з системою координат проекту @@ -18403,27 +18863,27 @@ p, li { white-space: pre-wrap; } Bottom Left - Внизу ліворуч + Внизу ліворуч Top Left - Вгорі ліворуч + Вгорі ліворуч Top Right - Вгорі праворуч + Вгорі праворуч Bottom Right - Внизу праворуч + Внизу праворуч North arrow pixmap not found - Не знайдено зображення 'стрілки півночі' + Не знайдено зображення вказівника "північ-південь" @@ -18719,7 +19179,7 @@ p, li { white-space: pre-wrap; } Add a delimited text file as a map layer. The file must have a header row containing the field names. The file must either contain X and Y fields with coordinates in decimal units or a WKT field. - + Додати текстовий файл як шар на карту. Файл повинен містити рядок-заголовок з іменами полів. Для записів обов'язковими є поля X та Y у десятковому форматі або в форматі WKT. @@ -18901,7 +19361,7 @@ p, li { white-space: pre-wrap; } Note: the following lines were not loaded because QGIS was unable to determine values for the x and y coordinates: - + Увага: наступні рядки не були завантажені бо QGIS не може визначити значення координат x та y: Note: the following lines were not loaded because Qgis was unable to determine values for the x and y coordinates: @@ -18923,22 +19383,22 @@ p, li { white-space: pre-wrap; } Будь ласка, введіть ім'я шару перед його додаванням до карти - + Choose a delimited text file to open Виберіть текстовий файл із роздільниками - + Text files - + Well Known Text files - + All files Всі файли @@ -19130,81 +19590,64 @@ p, li { white-space: pre-wrap; } Form - Оформити + Heading Label - Заголовочний напис + Detail label - Детальний напис + Category label - + QgsDiagramDialog - - - Pie chart - Кругова діаграма + Кругова діаграма - - - Bar chart - Гістограма + Гістограма - - - Proportional SVG symbols - Пропорційні знаки SVG + Пропорційні знаки SVG - - - linearly scaling - Лінійне масштабування + Лінійне масштабування QgsDiagramDialogBase - Dialog - Діалог + Діалог - Display diagrams - Показати діаграми + Показати діаграми - Diagram type - Тип діаграми + Тип діаграми - Classification attribute - Класифікувати за атрибутом + Класифікувати за атрибутом - Classification type - Тип класифікації + Тип класифікації @@ -19730,45 +20173,11 @@ p, li { white-space: pre-wrap; } <h2> Буферизація об'єктів шару: </h2> - - QgsEmbedLayerDialog - - - Select project file - - - - - QGis files - - - - - Recursive embeding not possible - - - - - It is not possible to embed layers / groups from the current project - - - QgsEmbedLayerDialogBase - - Select layers and groups to embed - - - - - Project file - - - - ... - ... + ... @@ -19866,6 +20275,50 @@ p, li { white-space: pre-wrap; } Показувати можливі підписи + + QgsErrorDialog + + + Error + Помилка + + + + QgsErrorDialogBase + + + Dialog + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Summary</p></body></html> + + + + + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'DejaVu Sans'; font-size:10pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;">Detailed report.</p></body></html> + + + + + Always show details + Завжди показувати подробиці + + + + Details >> + Подробиці >> + + QgsExpressionBuilderDialogBase @@ -19930,62 +20383,62 @@ p, li { white-space: pre-wrap; } - + Search - + Fields and Values - + Parser Error - + Eval Error - + Expression is invalid <a href=more>(more info)</a> - + More info on expression error - + Load top 10 unique values - + Load all unique values - + <h3>Oops! QGIS can't find help for this function.</h3>The help file for %1 was not found.<br> - + (Showing English version as there was no help available in your language (%1). If you would like to create it, contact the QGIS translation team).<br> - + It was neither available in your language (%1) nor English. - + <br>If you would like to create it, contact the QGIS development team. @@ -20098,7 +20551,7 @@ p, li { white-space: pre-wrap; } Run actions - Виконати дію + Виконати дії @@ -20319,6 +20772,271 @@ p, li { white-space: pre-wrap; } Вираз калькулятора поля + + QgsFieldsProperties + + + Label + Підпис + + + + Id + ID + + + + Name + Ім'я + + + + Type + Тип + + + + Length + Довжина + + + + Precision + Точність + + + + Comment + Коментар + + + + Edit widget + + + + + Alias + Псевдонім + + + + + Name conflict + + + + + + The attribute could not be inserted. The name already exists in the table. + + + + + Added attribute + + + + + + Deleted attribute + Видалено атрибут + + + + Line edit + Лінійне редагування + + + + Unique values + Унікальні значення + + + + Unique values editable + + + + + Classification + Класифікація + + + + Value map + Карта значень + + + + Edit range + + + + + Slider range + + + + + Dial range + + + + + File name + Ім'я файла + + + + Enumeration + Перелік + + + + Immutable + Незмінний + + + + Hidden + Прихований + + + + Checkbox + Перемикач + + + + Text edit + Текстове поле + + + + Calendar + Календар + + + + Value relation + + + + + UUID generator + + + + + Select edit form + + + + + UI file + + + + + QgsFieldsPropertiesBase + + + Field calculator + Калькулятор полів + + + + + Click to toggle table editing + Клацніть для переключення редагування таблиці + + + + Toggle editing mode + Режим редагування + + + + New column + Новий стовпець + + + + Ctrl+N + Ctrl+N + + + + Delete column + Видалити стовпець + + + + Ctrl+X + Ctrl+X + + + + ... + ... + + + + Init function + + + + + Edit UI + + + + + + + + + + + + - + - + + + + > + + + + + ^ + ^ + + + + v + v + + + + Autogenerate + + + + + Drag and drop designer + + + + + Provide ui-file + + + + + Attribute editor layout: + + + QgsFormAnnotationDialog @@ -20378,12 +21096,12 @@ p, li { white-space: pre-wrap; } internal GPS - + вбудований GPS local gpsd - + локальний gpsd @@ -21647,55 +22365,60 @@ Please reselect a valid file. QgsGdalProvider - + Dataset Description Опис набора даних - + Band %1 Канал %1 - + Dimensions: Розміри: - + X: %1 Y: %2 Bands: %3 X: %1 Y: %2 Канали: %3 - + Origin: Базис: - + Pixel Size: Розмір пікселя: - + Gauss - + Cubic - + Mode Режим - + None + + + Cannot get GDAL raster band: %1 + + out of extent поза екстентом @@ -21709,7 +22432,7 @@ Please reselect a valid file. Середнє відношення магн/фаза - + Average @@ -21952,7 +22675,7 @@ Please reselect a valid file. p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Droid Sans'; font-size:11pt; font-weight:400; font-style:normal;"> <p style="-qt-paragraph-type:empty; margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'Sans Serif'; font-size:10pt;"></p></body></html> - + @@ -22538,7 +23261,7 @@ p, li { white-space: pre-wrap; } - + All files Всі файли @@ -22563,12 +23286,12 @@ p, li { white-space: pre-wrap; } - + Open 3D model file - + Model files @@ -22587,7 +23310,7 @@ p, li { white-space: pre-wrap; } - + Type Тип @@ -22602,118 +23325,113 @@ p, li { white-space: pre-wrap; } - - Worldwind - - - - + URL/File - - + + ... ... - + Up - + Down - + Add Додати - + Remove Видалити - + Cache Кеш - + Path - + Model - + Point Layer - + 3D Model - + Stereo - + Stereo Mode - + Screen distance (m) - + Screen width (m) - + Split stereo horizontal separation (px) - + Split stereo vertical separation (px) - + Split stereo vertical eye mapping - + Screen height (m) - + Eye separation (m) - + Reset to defaults - + Split stereo horizontal eye mapping @@ -22783,13 +23501,13 @@ p, li { white-space: pre-wrap; } QgsGraduatedSymbolRendererV2Widget - + Range Діапазон - + Label Підпис @@ -22832,7 +23550,7 @@ p, li { white-space: pre-wrap; } - + Symbol Символ @@ -23545,7 +24263,7 @@ p, li { white-space: pre-wrap; } Undo last vertex - + Відмінити створення вершини New point @@ -24060,13 +24778,13 @@ at line %2 column %3 - - - - - - - + + + + + + + Warning Попередження @@ -24082,13 +24800,13 @@ at line %2 column %3 - + Cannot read module file (%1) Не вдалося прочитати файл модуля (%1) - + %1 at line %2 column %3 @@ -24112,74 +24830,74 @@ at line %2 column %3 Будь ласка, впевніться, що документація GRASS встановлена. - + Not available, description not found (%1) Плагін не доступний, опис не знайдено (%1) - + Not available, cannot open description (%1) Плагін не доступний, не вдалося відкрити опис (%1) - + Not available, incorrect description (%1) Плагін не доступний, неправильний опис (%1) - - + + Run Виконати - - + + Cannot get input region Не вдалося отримати вхідний регіон - + Input %1 outside current region! Вихідний файл %1 знаходиться за межами поточного регіону! - + Use Input Region Використовувати вихідний регіон - + Output %1 exists! Overwrite? Файл виводу %1 вже існує. Перезаписати? - + Cannot find module %1 Не вдалося знайти плагін %1 - + Cannot start module: %1 Не вдалося запустити плагін: %1 - + Stop Зупинити - + <B>Successfully finished</B> <B>Успішне завершення</B> - + <B>Finished with error</B> <B>Закінчено з помилкою</B> - + <B>Module crashed or killed</B> <B>Плагін потерпів крах або убитий</B> @@ -24230,35 +24948,35 @@ at line %2 column %3 QgsGrassModuleField - + Attribute field Поле атрибута - + Warning Попередження - + 'layer' attribute in field tag with key= %1 is missing. - Атрибут 'шар' в тегі поля з ключем = %1 пропущений. + Відсутній атрибут "шар" в тезі поля з ключем = %1. QgsGrassModuleFile - + File Файл - + %1:&nbsp;missing value %1:&nbsp; відсутнє значення - + %1:&nbsp;directory does not exist %1:&nbsp; каталог не існує @@ -24266,44 +24984,44 @@ at line %2 column %3 QgsGrassModuleGdalInput - - - + + + Warning Попередження - + OGR/PostGIS/GDAL Input Дані OGR/PostGIS/GDAL - + Cannot find layeroption %1 Не вдалося знайти параметр "шар" (layer)%1 - + Cannot find whereoption %1 Не вдалося знайти параметр "де" (where) %1 - + Password Пароль - + Select a layer Виберіть шар - + PostGIS driver in OGR does not support schemas!<br>Only the table name will be used.<br>It can result in wrong input if more tables of the same name<br>are present in the database. OGR-драйвер PostGIS не підтримує схеми! <br> Буде використовуватися тільки ім'я таблиці. <br> Це може вплинути на правильність введення, <br> якщо в базі даних є більше однієї таблиці <br> з однаковими іменами. - + %1:&nbsp;no input %1:&nbsp;параметр не заданий @@ -24311,50 +25029,50 @@ at line %2 column %3 QgsGrassModuleInput - + Input Вхідні дані - - - - + + + + Warning Попередження - + Cannot find typeoption %1 Не вдається знайти параметр типу %1 - + Cannot find values for typeoption %1 Не вдається знайти значення для параметра тип %1 - + Cannot find layeroption %1 Не вдалося знайти параметр шару %1 - + GRASS element %1 not supported Елемент GRASS %1 не підтримується - + Use region of this map Використовувати регіон цієї карти - + Select a layer Виберіть шар - + %1:&nbsp;no input %1:&nbsp; параметр не задано @@ -24362,23 +25080,23 @@ at line %2 column %3 QgsGrassModuleOption - - + + Warning - Попередження + Увага - + Cannot parse version_min %1 - + Не вдалося обробити значення version_min %1 - + Cannot parse version_max %1 - + Не вдалося обробити значення version_max %1 - + %1:&nbsp;missing value %1:&nbsp; відсутнє значення @@ -24386,7 +25104,7 @@ at line %2 column %3 QgsGrassModuleSelection - + Selected categories Вибрані категорії @@ -24394,31 +25112,31 @@ at line %2 column %3 QgsGrassModuleStandardOptions - + Item with key %1 not found - + << Hide advanced options - + Show advanced options >> - - - - - - - - + + + + + + + + Warning Попередження @@ -24438,12 +25156,12 @@ at line %2 column %3 <br>команда: %1 %2<br>%3<br>%4 - + Cannot read module description (%1): - + %1 at line %2 column %3 @@ -24452,28 +25170,28 @@ at line %2 column %3 в рядку %2, стоппці %3 - + Cannot find key %1 - + Item with id %1 not found - - + + Cannot get current region Не вдалося отримати поточний регіон - + Cannot check region of map %1 Не вдалося перевірити регіон карти %1 - + Cannot set region of map %1 @@ -25156,6 +25874,16 @@ p, li { white-space: pre-wrap; } null (no data) null (немає даних) + + + cellhd file %1 does not exist + файл cellhd %1 не існує + + + + Groups not yet supported + Групи растрів не підтримуються в даний момент + QgsGrassRegion @@ -25438,13 +26166,13 @@ or change the following values Warning - Попередження + Увага Cannot rename the lock file %1 - + Не вдалося перейменувати файл блокування %1 @@ -25533,7 +26261,7 @@ at line %2 column %3 Filter - Фільтр + Фільтр @@ -25606,8 +26334,6 @@ at line %2 column %3 unhandled layers - - @@ -25757,12 +26483,12 @@ at line %2 column %3 Delete - Видалити + Видалити html - + @@ -25859,82 +26585,92 @@ This may be a problem in your network connection or at the WMS server. QgsIdentifyResults - + Identify Results Результати ідентифікації - + Feature Об'єкт - + Value Значення - - + + (Derived) (Виведені) - + (Actions) (Дія) - - - + + + Edit feature form Редагувати форму об'єкта - - - + + + View feature form Показати форму об'єкта - + + Print + + + + Zoom to feature Збільшити до об'єкта - + Copy attribute value Копіювати значення атрибута - + Copy feature attributes Копіювати атрибути об'єкта - + + Layer properties... + + + + Expand all Розгорнути все - + Collapse all Згорнути все - + Attribute changes - + Could not open url - + Could not open URL '%1' @@ -25947,22 +26683,22 @@ This may be a problem in your network connection or at the WMS server. Виконати дію - + Clear results Очистити результати - + Clear highlights Очистити підсвічування - + Highlight all Підсвітити все - + Highlight layer Підсвітити шар @@ -25974,6 +26710,34 @@ This may be a problem in your network connection or at the WMS server. Identify Results Результати ідентифікації + + + Expand tree. + + + + + + + + ... + ... + + + + Collapse tree. + + + + + New results will be expanded by default. + + + + + Print selected HTML response. + + QgsImageWarper @@ -25987,13 +26751,13 @@ This may be a problem in your network connection or at the WMS server. QgsInterpolationDialog - + Triangular interpolation (TIN) Тріангуляційна інтерполяція (TIN) - + Inverse Distance Weighting (IDW) Зворотне зважування відстаней (IDW) @@ -26019,23 +26783,23 @@ This may be a problem in your network connection or at the WMS server. - + Break lines Лінії розбивки - + Structure lines Лінії структури - + Points Точки - + Save interpolated raster as... Зберегти растр як ... @@ -26158,6 +26922,11 @@ This may be a problem in your network connection or at the WMS server. Output file Вихідний файл + + + Add result to project + Додати результат в проект + QgsInterpolationPlugin @@ -26531,20 +27300,20 @@ This may be a problem in your network connection or at the WMS server. QgsLabelPropertyDialog - - + + Label font - + Шрифт підпису - + Font color - + Колір тексту - + Buffer color - Колір буфера + Колір буфера @@ -26567,72 +27336,82 @@ This may be a problem in your network connection or at the WMS server. - + Size Розмір - + Display - + Show label - + Max - + Min - + Scale-based - + + Ignores priority and permits collisions/overlaps + + + + + Always show (exceptions above) + + + + Buffer Буфер - + Position Позиціонування - + Label distance Відступ підписів - + X Coordinate X-координата - + Y Coordinate Y-координата - + Horizontal alignment - + Vertical alignment - + Rotation Обертання @@ -26648,52 +27427,52 @@ This may be a problem in your network connection or at the WMS server. одиниці карти - + (not found!) - + Sample @ %1 pts (using map units) - + Sample @ %1 pts (using map units, BUFFER IN MILLIMETERS) - + Sample Зразок - + Sample (BUFFER NOT SHOWN, in map units) - + Expression based label - + Mixed Case - + All Uppercase - + All Lowercase - + Title Case @@ -26719,62 +27498,136 @@ This may be a problem in your network connection or at the WMS server. Поле, що містить підпис - + + Minimum - + + Maximum - + Formatted numbers - + Decimal places - + Show plus sign - + + Pixel size-based visibility + + + + + Labels will not show if larger than this on screen + + + + + + px + + + + + Labels will not show if smaller than this on screen + + + + + + + + + < + < + + + + Label in Map Units + + + + + + Label + + + + + Line direction symbols + + + + + Symbol(s) + + + + + > + + + + + left/right + + + + + above + + + + + below + + + + + Reverse direction + + + + Advanced - + Options Параметри - + Label every part of multi-part features - + Merge connected lines to avoid duplicate labels - - Add direction symbol - - - - + Features don't act as obstacles for labels - + + Placement Розміщення @@ -26819,28 +27672,28 @@ This may be a problem in your network connection or at the WMS server. По периметру - - - + + + Label distance Відступ підписів - - + + mm мм - - - + + + Rotation Обертання - - + + degrees градусів @@ -26869,17 +27722,17 @@ This may be a problem in your network connection or at the WMS server. лінія - + Text style Стиль текста - + Font Шрифт - + TextLabel @@ -26887,33 +27740,35 @@ This may be a problem in your network connection or at the WMS server. - - - + + + + + ... ... - - - + + + Color Колір - + Buffer Буфер - - - + + + Size Розмір - + mm мм @@ -26937,28 +27792,28 @@ This may be a problem in your network connection or at the WMS server. в пунктах - - + + In map units в одиницях карти - + Priority Приоритет - + Low НИзький - + High Високий - + Scale-based visibility Видимість при масштабах @@ -26987,7 +27842,7 @@ This may be a problem in your network connection or at the WMS server. Підписи на кілька рядків - + Suppress labeling of features smaller than Не підписувати об'єкти менше ніж @@ -27000,48 +27855,48 @@ This may be a problem in your network connection or at the WMS server. Установки алгоритма - - + + In mm - + Line orientation dependent position - + Data defined settings Визначені даними установки - + Font properties Властивості шрифта - + Bold Напівжирний - + Italic Курсив - + Underline Підкреслення - + Font family Шрифт - + Position Позиціонування @@ -27071,363 +27926,388 @@ This may be a problem in your network connection or at the WMS server. - + Multiple lines - + Wrap on character - - + + Line height - + Line height spacing for multi-line text - + line - + Alignment - + Paragraph style alignment of multi-line text - - + + Left - + Center Центр - - + + Right - + Available typeface styles - + Underlined Text - + U - + Strikeout text - + S - + points - - - + + + map units одиниці карти - + Style Стиль - - - + + + Transparency Прозорість - - + + % - - + + Word spacing - - + + Letter spacing - - + + Space in pixels or map units, relative to size unit choice - + Type case - + Capitalization style of text - + Pen Join style - + Color area inside of pen stroke - + Automated placement settings - - Show all labels for this layer (i.e. including colliding labels) - - - - + Around point - + Offset from point - + Parallel - + Curved - + Horizontal - + Offset from centroid - + Around centroid - + Horizontal (slow) - + Free (slow) - + Using perimeter - + Centroid of - + visible polygon - + whole polygon - + Above line - + On line - + Below line - + X - + Y - + Above Right Вверху справа - + Above Left Вверху зліва - + Over По центру - + Above Вверху - + Below Left Внизу зліва - + Below Внизу - + Below Right Внизу справа - + + Show all labels for this layer (including colliding labels) + + + + + Show upside-down labels + + + + + never + ніколи + + + + when rotation defined + + + + + always + завжди + + + Buffer transparency - + X Coordinate X-координата - + Y Coordinate Y-координата - + Horizontal alignment - + Vertical alignment - + Uncheck to write labeling engine derived rotation on pin and NULL on unpin - + Preserve existing rotation values during label pin/unpin operations - + Display properties - + + Always show + + + + Minimum scale - + Show label - + Maximum scale - + Strikeout Закреслення - + Capitalization - + Multi-line align - + Add label columns to attribute table - + About data defined values @@ -27437,17 +28317,17 @@ This may be a problem in your network connection or at the WMS server. - + Buffer properties Властивості буфера - + Buffer size Розмір буфера - + Buffer color Колір буфера @@ -27457,75 +28337,75 @@ This may be a problem in your network connection or at the WMS server. Outline: %1 - + Контур: %1 QgsLegend - - + + sub-group - - + + group група - + Legend context - + &Make to Toplevel Item - + Zoom to Group - + &Set Group CRS - + &Group Selected - + Copy Style - + Paste Style - + &Add New Group - + &Expand All - + &Collapse All - + &Update Drawing Order @@ -27534,12 +28414,12 @@ This may be a problem in your network connection or at the WMS server. Зробити елементом &першого рівня - + &Remove &Видалити - + Re&name Перей&менувати @@ -27575,7 +28455,7 @@ This may be a problem in your network connection or at the WMS server. &Показати в огляді - + &Remove &Видалити @@ -27592,75 +28472,78 @@ This may be a problem in your network connection or at the WMS server. Зберегти виділене як... - + &Query... &Запит... - + &Zoom to Layer Extent - + &Zoom to Best Scale (100%) - + &Stretch Using Current Extent - + &Show in Overview - + + &Duplicate + + + + &Set Layer CRS - + Set &Project CRS from Layer - + &Open Attribute Table - - + + Save As... Зберегти як... - + Save Selection As... - + Show Feature Count - + &Properties &Властивості - - + Updating feature count for layer %1 - - + Abort @@ -27676,45 +28559,35 @@ This may be a problem in your network connection or at the WMS server. QgsLinearlyScalingDialog - - Millimeter - Міліметр + Міліметр - - - Map units - Одиниці карти + Одиниці карти QgsLinearlyScalingDialogBase - Form - Форма + Форма - Scale linearly between 0 and the following attribute value / diagram size: - Лінійно масштабувати діаграми між нульовим розміром і наступним значенням атрибута: + Лінійно масштабувати діаграми між нульовим розміром і наступним значенням атрибута: - Find maximum value - Знайти максимальне + Знайти максимальне - Size - Розмір + Розмір - Size unit - Одиниці виміру + Одиниці виміру @@ -27889,7 +28762,7 @@ This may be a problem in your network connection or at the WMS server. Select connections to export - + Виберіть підключення для експорту Save to file @@ -27943,12 +28816,12 @@ This may be a problem in your network connection or at the WMS server. X / East: - + X / Схід: Y / North: - + Y / Північ: @@ -27959,99 +28832,99 @@ This may be a problem in your network connection or at the WMS server. QgsMapLayer - - + + Specify CRS for layer %1 - - - + + + %1 at line %2 column %3 %1 в рядку %2, стовпці %3 - + style not found in database стиль не найдений в базі даних - + Error: qgis element could not be found in %1 Помилка: елемент qgis не знайдений в %1 - - + + Loading style file %1 failed because: %2 Не вдалося завантажити файл стилю %1 оскільки: %2 - - - + + + Could not save symbology because: %1 Не вдалося зберегти символіку оскільки: %1 - - + + The directory containing your dataset needs to be writable! Необхідні права на запис у каталог, що містить ваші дані! - - + + Created default style file as %1 Створений файл стилю за замовчуванням в %1 - + ERROR: Failed to created default style file as %1. Check file permissions and retry. ПОМИЛКА: Не вдалося створити файл стилю за замовчуванням у %1. Перевірте права доступу до файлу та спробуйте знову. - + User database could not be opened. Не вдалося відкрити базу даних користувача. - + The style table could not be created. Створює растр із розрізненихданих. - + The style %1 was saved to database Стиль %1 був збережений в базі даних - + The style %1 was updated in the database. Стиль %1 був оновлений в базі даних. - + The style %1 could not be updated in the database. Не вдалося оновити в базі даних стиль %1. - + The style %1 could not be inserted into database. Не вдалося вставити в базу даних стиль %1. - + ERROR: Failed to created SLD style file as %1. Check file permissions and retry. - + Unable to open file %1 @@ -28059,16 +28932,16 @@ This may be a problem in your network connection or at the WMS server. QgsMapRenderer - - + + Transform error caught: %1 - + Помилка трансформації: %1 - - + + CRS - + Система координат @@ -28403,12 +29276,12 @@ This may be a problem in your network connection or at the WMS server. Validation started. - + Початок перевірки. Validation finished. - + Закінчення перевірки. @@ -28416,7 +29289,7 @@ This may be a problem in your network connection or at the WMS server. Label properties changed - + Зміна параметів підпису @@ -28464,116 +29337,114 @@ This may be a problem in your network connection or at the WMS server. No active vector layer - Немає активного векторного шара + Не вибрано активний векторний шар To run an action, you must choose a vector layer by clicking on its name in the legend - + Для виконання дії необхідно вибрати векторний шарб клацнувши мишею на імені шару в легенді No actions available - + Доступні дії відсутні The active vector layer has no defined actions - + Вибраний шар не має призначених дій No features at this position found. - Немає об'єктів в позиції курсора. + Немає об'єктів в позиції курсора. QgsMapToolIdentify - + No active layer Не має активного шару - + To identify features, you must choose an active layer by clicking on its name in the legend Для визначення об'єктів, необхідно вибрати активний шар клацанням миші на імені шару в легенді - + Identifying on %1... Визначення в шарі%1 ... - + Identifying done. Визначення виконано. - + No features at this position found. Немає об'єктів в позиції курсора. - - + + (clicked coordinate) (Координати місця клацання) - + Length Довжина - + firstX attributes get sorted; translation for lastX should be lexically larger than this one перш. X - + firstY перш. Y - + lastX attributes get sorted; translation for firstX should be lexically smaller than this one ост. X - + lastY ост. Y - + Area Площа - + feature id ID об'єкта - + new feature новий об'єкт - WMS layer - WMS-шар + WMS-шар - Feature info - Дані об'єкта + Дані об'єкта - + Raster Растр @@ -28601,7 +29472,7 @@ This may be a problem in your network connection or at the WMS server. Label moved - + Зсув підпису @@ -28635,22 +29506,22 @@ This may be a problem in your network connection or at the WMS server. Offset curve - + Паралельна крива Offset: - + Зміщення: Geometry error - + Помилка геометрії Creating offset geometry failed - + Не вдалося створити паралельну криву @@ -28658,12 +29529,12 @@ This may be a problem in your network connection or at the WMS server. Label pinned - + Підпис закріплено Label unpinned - + Підпис відкріплено @@ -28709,7 +29580,7 @@ This may be a problem in your network connection or at the WMS server. Label rotated - + Обертання підпису @@ -28752,12 +29623,12 @@ This may be a problem in your network connection or at the WMS server. Label hidden - + Підпис сховано Label shown - + Підпис видимий @@ -29322,8 +30193,23 @@ http://my.host.com/cgi-bin/mapserv.exe QgsMessageBar + Remaining messages + + + + + Close all + Закрити все + + + Close - Закрити + Закрити + + + + more + @@ -29632,7 +30518,7 @@ http://my.host.com/cgi-bin/mapserv.exe New Connection... - + Нове підключення... @@ -29640,12 +30526,12 @@ http://my.host.com/cgi-bin/mapserv.exe %1 as %2 in %3 - + %1 як %2 в %3 as geometryless table - + як таблиця без геометрії @@ -29784,7 +30670,7 @@ http://my.host.com/cgi-bin/mapserv.exe Select... - Вибрати... + Вибрати... @@ -29923,17 +30809,17 @@ http://my.host.com/cgi-bin/mapserv.exe - + Red Червоний - + Green Зелений - + Blue Синій @@ -30503,7 +31389,7 @@ p, li { white-space: pre-wrap; } Save As - Зберегти як + Зберегти як @@ -30746,20 +31632,20 @@ p, li { white-space: pre-wrap; } WMS Password for %1 - + Пароль WMS для %1 QgsOWSConnectionItem - + Edit... - Змінити... + Змінити... - + Delete - Видалити + Видалити @@ -30775,103 +31661,91 @@ p, li { white-space: pre-wrap; } - + Always cache - + Prefer cache - + Prefer network - + Always network - - Server format - - - - - is supported by GDAL %1 driver. - - - - - is not supported by GDAL - - - - + Are you sure you want to remove the %1 connection and all associated settings? - + Confirm Delete Підтвердіть видалення - + Load connections Завантажити підключення - + XML files (*.xml *XML) Файли XML (*.xml *.XML) - + Coordinate Reference System (%n available) crs count - - - + + Coordinate Reference System + Система координат + + + Could not understand the response: %1 - + WMS proxies - + Several WMS servers have been added to the server list. Note that if you access the internet via a web proxy, you will need to set the proxy settings in the QGIS options dialog. - + parse error at row %1, column %2: %3 - + network error: %1 - + The %1 connection already exists. Do you want to overwrite it? - + Confirm Overwrite @@ -30890,7 +31764,7 @@ p, li { white-space: pre-wrap; } - + Layers Шари @@ -30956,7 +31830,7 @@ p, li { white-space: pre-wrap; } - + Title Заголовок @@ -30966,54 +31840,62 @@ p, li { white-space: pre-wrap; } Опис - + Time - - Coordinate Reference System - Система координат + Система координат + + + + Coordinate Reference System: + + + + + Selected Coordinate Reference System + - + Change ... Змінити ... - - + + Format Формат - + Options Параметри - + Layer name Ім’я шара - + Tile size - + Feature limit for GetFeatureInfo - + Cache Кеш - + Cache preference Always cache: load from cache, even if it expired @@ -31027,82 +31909,82 @@ Always network: always load from network and do not check if the cache has a val - + Layer Order - + Move selected layer UP - + Up - + Move selected layer DOWN - + Down - + Layer Шар - + Style Стиль - + Tilesets - + Styles - + Size Розмір - + CRS - + Server Search - + Search - + Description Опис - + URL URL - + Add selected row to WMS list @@ -31197,12 +32079,12 @@ Always network: always load from network and do not check if the cache has a val Convert to offline project - + Перетворити в оффлайновий проект Create offline copies of selected layers and save as offline project - + Створити оффлайнові копії вибраних шарів та зберегти проект як оффлайновий @@ -31210,17 +32092,17 @@ Always network: always load from network and do not check if the cache has a val &Offline Editing - + &Оффлайнове редагування Synchronize - + Синхронізувати Synchronize offline project with remote layers - + Синхронізувати оффлайновий проект з віддаленими джерелами @@ -31289,7 +32171,7 @@ Always network: always load from network and do not check if the cache has a val Layer %1 of %2.. - + Шар %1 з %2.. @@ -31297,12 +32179,12 @@ Always network: always load from network and do not check if the cache has a val Dialog - Діалог + TextLabel - + @@ -31310,18 +32192,18 @@ Always network: always load from network and do not check if the cache has a val Couldn't open file %1.prj - + Не вдалося відкрити файл %1.prj OGR - + Couldn't open file %1.qpj - + Не вдалося відкрити файл %1.qpj @@ -32987,12 +33869,12 @@ Always network: always load from network and do not check if the cache has a val Add Oracle GeoRaster Layer... - + Додати шар Oracle GeoRaster... Add a Oracle Spatial GeoRaster... - + Додати шар Oracle Spatial GeoRaster... @@ -33087,12 +33969,12 @@ Always network: always load from network and do not check if the cache has a val Delete layer - + Видалити шар Layer deleted successfully. - + Шар видалено успішно. @@ -33100,7 +33982,7 @@ Always network: always load from network and do not check if the cache has a val New Connection... - + Нове підключення... @@ -33108,12 +33990,12 @@ Always network: always load from network and do not check if the cache has a val %1 as %2 in %3 - + %1 як %2 в %3 as geometryless table - + як таблиця без геометрії @@ -33121,22 +34003,22 @@ Always network: always load from network and do not check if the cache has a val Form - + Band - Канал + Канал Value - + Значення Color - Колір + Колір @@ -33418,6 +34300,21 @@ Extended error information: Password Пароль + + + Restrict the displayed tables to those that are in the layer registries. + + + + + Restricts the displayed tables to those that are found in the layer registries (geometry_columns, geography_columns, topology.layer). This can speed up the initial display of spatial tables. + + + + + Only look in the layer registries + + Use estimated table statistics for the layer metadata. @@ -33485,19 +34382,16 @@ Extended error information: - Restrict the displayed tables to those that are in the geometry_columns table - Вивести лише таблиці, що містяться в таблиці geometry_columns + Вивести лише таблиці, що містяться в таблиці geometry_columns - Restricts the displayed tables to those that are in the geometry_columns table. This can speed up the initial display of spatial tables. - Вивести лише таблиці, що містяться в таблиці geometry_columns. Це може прискорити початковий пошук просторових таблиць. + Вивести лише таблиці, що містяться в таблиці geometry_columns. Це може прискорити початковий пошук просторових таблиць. - Only look in the geometry_columns table - Шукати тільки в таблиці geometry_columns + Шукати тільки в таблиці geometry_columns @@ -33646,6 +34540,7 @@ Extended error information: + Postgres/PostGIS Provider @@ -33655,7 +34550,12 @@ Extended error information: - + + No accessible tables or views found. Check the message log for possible errors. + + + + Connect Підключитися @@ -33767,7 +34667,7 @@ geometry. Select... - Вибрати... + Вибрати... @@ -33783,52 +34683,65 @@ geometry. Таблиця - Type - Тип + Тип - Geometry column - Поле геометрії + Поле геометрії - + SRID SRID - - Primary key column - - - - + Select at id - + Sql SQL - + Detecting... - + Select... Вибрати... - + Disable 'Fast Access to Features at ID' capability to force keeping the attribute table in memory (e.g. in case of expensive views). - + + Column + Поле + + + + Data Type + + + + + Spatial Type + + + + + Primary Key + + + + Enter... @@ -34056,6 +34969,10 @@ Here is the error message: only locally available доступний тільки локально + + Experimental plugin. Use at own risk + + - %d plugins available @@ -34241,75 +35158,80 @@ You need to restart Quantum GIS in order to reload it. - - Status - Стан + State + Статус + Status + Стан + + + + Name Ім'я - + Version Версія - + Description Опис - + Author Автор - + Repository Репозиторій - + Upgrade all - - + + Install, reinstall or upgrade the selected plugin Встановити, перевстановити чи оновити вибраний плагін - + Install/upgrade plugin Встановити/оновити плагін - - + + Uninstall the selected plugin Видалити вибраний плагін - + Uninstall plugin Видалити плагін - + Repositories Репозиторії - + List of plugin repositories Список репозиторіїв плагінів - + URL URL @@ -34322,107 +35244,107 @@ You need to restart Quantum GIS in order to reload it. Додати сторонні репозиторії - - + + Add a new plugin repository Додати нові репозиторії - + Add... Додати... - - + + Edit the selected repository Змінити вибрані репозиторії - + Edit... Змінити... - - + + Remove the selected repository Видалити вибрані репозиторії - + Delete Видалити - - + + Add the contributed repository to the list Додати репозиторій сторонніх плагінів в список - + Add the contributed repository Додати репозиторій сторонніх плагінів - - + + Remove depreciated repositories from the list Видалити зі списку застарівші репозиторії - + Delete depreciated repositories Видалити застарівші репозиторії - + Options Параметри - + Configuration of the plugin installer Параметри установки плагінів - + Check for updates on startup Перевіряти оновлення при запуску - + every time QGIS starts при кожному запуску QGIS - + once a day щоденно - + every 3 days кожні 3 дня - + every week щотижнево - + every 2 weeks Кожні 2 тижні - + every month щомісяця - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -34436,27 +35358,27 @@ p, li { white-space: pre-wrap; } </p></body></html> - + Allowed plugins Дозволені плагіни - + Only show plugins from the official repository Показувати плагіни тільки з офіцільного репозиторія - + Show all plugins except those marked as experimental Показувати всі плагіни, крім помічених як експериментальні - + Show all plugins, even those marked as experimental Показувати всі плагіни, включаючи помічених як експериментальні - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -34706,7 +35628,7 @@ p, li { white-space: pre-wrap; } - + Plugins Плагіни @@ -34717,27 +35639,27 @@ p, li { white-space: pre-wrap; } - + Installed in %1 menu/toolbar - + No Plugins Модулі відсутні - + No QGIS plugins found in %1 В %1 не знайдено модулів QGIS - + Error Помилка - + Failed to open plugin installer! Не вдалося відкрити установник плагінів! @@ -34745,32 +35667,32 @@ p, li { white-space: pre-wrap; } QgsPluginManagerBase - + QGIS Plugin Manager Менеджер модулів QGIS - + To enable / disable a plugin, click its checkbox or description Для акивації / деактивації модуля клацніть його опис або прапорець - + &Filter &Фільтр - + Plugin Directory: Каталог модулів: - + Directory Каталог - + Plugin Installer Завантажити модулі @@ -34900,24 +35822,24 @@ p, li { white-space: pre-wrap; } - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + PostGIS @@ -34950,73 +35872,73 @@ error:%3 - + Database connection was successful, but the accessible tables could not be determined. Підключення до бази даних було успішним, але доступні таблиці не можуть бути визначені. - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 - + Database connection was successful, but the accessible tables could not be determined. The error message from the database was: %1 - + Database connection was successful, but no accessible tables were found. Please verify that you have SELECT privilege on a table carrying PostGIS geometry. - + Unable to get list of spatially enabled tables from the database - + Retrieval of postgis version failed - + Could not parse postgis version string '%1' - + Connection error: %1 returned %2 [%3] - + Erroneous query: %1 returned %2 [%3] - + Query failed: %1 Error: no result buffer - + Not logged query failed: %1 Error: no result buffer - + Query: %1 returned %2 [%3] - + %1 cursor states lost. SQL: %2 Result: %3 (%4) @@ -35025,78 +35947,98 @@ SQL:%2 Результат:%3 (%4) - + resetting bad connection. - + retry after reset succeeded. - + retry after reset failed again. - + connection still bad after reset. - + bad connection, not retrying. - + Point Точка - + Line Лінія - + Polygon Полігон - + No Geometry - - + + None + + + + + Geometry + Геометрія + + + + Geography + + + + + TopoGeometry + + + + + Query could not be canceled [%1] - + PQgetCancel failed - + Multipoint Мультіточка - + Multiline Мультілінія - + Multipolygon Мультіполігон - + Unknown Geometry @@ -35149,85 +36091,89 @@ SQL:%2 - - - - - - + + + + + - - - - + + + + - - - - - - + + + + + + + + - - - + + PostGIS - + Couldn't get the feature geometry in binary form - + Read attempt on an invalid postgresql data source - + nextFeature() without select() - - + + Fetching from cursor %1 failed Database error: %2 - + feature %1 not found - + found %1 features instead of just one. - + FAILURE: Field %1 not found. - - + + unexpected formatted field type '%1' for field %2 - - + Field %1 ignored, because of unsupported type %2 - + + Field %1 ignored, because of unsupported type type %2 + + + + Unable to access the %1 relation. The error message from the database was: %2. @@ -35238,7 +36184,7 @@ SQL: %3 SQL: %3 - + Unable to determine table access privileges for the %1 relation. The error message from the database was: %2. @@ -35249,92 +36195,92 @@ SQL: %3 SQL: %3 - + The custom query is not a select query. - + The table has no column suitable for use as a key. Quantum GIS requires a primary key, a PostgreSQL oid column or a ctid for tables. - + Primary key field '%1' for view not unique. - + Type '%1' of primary key field '%2' for view invalid. - + Key field '%1' for view not found. - + No key field for view given. - + Unexpected relation type '%1'. - + No key field for query given. - + PostGIS error while adding features: %1 - + PostGIS error while deleting features: %1 - + PostGIS error while adding attributes: %1 - + PostGIS error while deleting attributes: %1 - + PostGIS error while changing attributes: %1 - + PostGIS error while changing geometry values: %1 - + result of extents query invalid: %1 - + Geometry type and srid for empty column %1 of %2 undefined. - + Feature type or srid for %1 of %2 could not be determined or was not requested. - + Editing and adding disabled for 2D+ layer (%1; %2) @@ -35379,13 +36325,13 @@ Please install PostGIS with GEOS support (http://geos.refractions.net) Неоднозначне поле! - + Duplicate field %1 found Знайдено дублікат поля %1 - + PostgreSQL is still in recovery after a database crash (or you are connected to a (read-only) slave). Write accesses will be denied. @@ -35396,7 +36342,7 @@ Write accesses will be denied. Не вдалося виконати запит - + Unable to execute the query. The error message from the database was: %1. @@ -35589,7 +36535,7 @@ SQL:%2 Ignore - + Ігнорувати @@ -35600,7 +36546,8 @@ SQL:%2 Unable to open one or more project layers. Choose ignore to continue loading without the missing layers. Choose cancel to return to your pre-project load state. Choose OK to try to find the missing layers. - + Не вдалося відкрити один чи декілька шарів проекту. +Виберіть "Ігнрорувати" для продовження завантаження проекту без відсутніх шарів. Виберіть "Відмінити" для відміни завантаження. Виберіть "OK" для пошуку відсутніх шарів. Unable to open one or more project layers @@ -35609,108 +36556,164 @@ Try to find missing layers? Спробувати знайти відсутні шари? + + QgsProjectLayerGroupDialog + + + Select project file + Виберіть файл проекту + + + + QGis files + Файли QGis + + + + Recursive embedding not possible + + + + + It is not possible to embed layers / groups from the current project. + + + + + QgsProjectLayerGroupDialogBase + + + Select layers and groups to embed + Виберіть шари та групи для вбудування + + + + Project file + Файл проекту + + + + ... + ... + + QgsProjectProperties - + Layer Шар - + Type Тип - + Identifiable Можна ідентифікувати - + Vector Вектор - + WMS WMS - + Raster Растр - - + + Coordinate System Restriction - + No coordinate systems selected. Disabling restriction. - + Selection color Колір виділення - + CRS %1 was already selected - + Coordinate System Restrictions - + The current selection of coordinate systems will be lost. Proceed? - + + Select print composer + + + + + Composer Title + + + + + Select restricted layers and groups + + + + Enter scale - + Scale denominator - + Load scales - - + + XML files (*.xml *.XML) Файли XML (*.xml *.XML) - + Save scales - + Transparency %1% - + Select a valid symbol - + Invalid symbol : @@ -35723,52 +36726,52 @@ Proceed? Властивості проекта - + General Загальні - + General settings Загальні установки - + Project title Заголовок проекта - + Descriptive project name Описовий заголовок проекту - + Default project title Заголовок проекту за замовчуванням - + Selection color Колір виділення - + Background color Колір фону - + absolute абсолютні - + relative відносні - + Save paths Шляхи збереження @@ -35777,196 +36780,246 @@ Proceed? Одиниці шара (використовуються при виключеному перетворенні координат) - + Meters Метри - + Feet Фути - + Degree - + Degree display - + Decimal degrees Десяткові градуси - + Degrees, Minutes - + Degrees, Minutes, Seconds Градуси, минути, секунди - + Precision Точність - + Automatically sets the number of decimal places in the mouse position display Автоматично встановлювати кількість десяткових знаків позиції миші (рядок стану) - + The number of decimal places that are used when displaying the mouse position is automatically set to be enough so that moving the mouse by one pixel gives a change in the position display Кількість використовуваних десяткових знаків у значенні позиції курсору вибирається автоматично таким чином, що переміщення миші на один піксель викличе зміну в полі відображення позиції - + Automatic Автоматично - - + + Sets the number of decimal places to use for the mouse position display Встановити число десяткових знаків в полі виводу позицї курсора миші - + Manual Вручну - - + + The number of decimal places for the manual option Кількість десяткових знаків для параметра "Вручну" - + decimal places Десяткові знаки - + Project scales - - - - - - - - + + + + + + + + ... ... - + Default Styles - + Default Symbols - + Marker Маркер - + Line Лінія - + Fill - + Color Ramp Колірна шкала - + Style Manager Управління стилями - + Options Параметри - + Assign random colors to symbols - + Opacity Непрозорість - + OWS Server - + + Fees + + + + + Access constraints + + + + + Keyword list + + + + + Exclude composers + + + + + Exclude layers + + + + Advertised WMS url - + Maximum width - + Maximum height - + WFS Capabilitities - + Published - + + Update + Оновити + + + + Insert + + + + + Delete + Видалити + + + + Unselect all + Відмінити вибір + + + + Select all + Вибрати все + + + Macros - + Python macros - + Online resource - + Add WKT geometry to feature info response @@ -35975,102 +37028,102 @@ Proceed? WMS - + Service Capabilitities - + Title Заголовок - + Person - + Phone - + Abstract Опис - + E-Mail - + Organization - + WMS Capabilitities - + Advertised Extent - + Min. X - + Min. Y - + Max. X - + Max. Y - + Use Current Canvas Extent - + Coordinate Systems Restrictions - + Used when CRS transformation is turned off - + Canvas units - + Add Додати - + Remove Видалити - + Used @@ -36091,33 +37144,33 @@ Proceed? Параметри прилипання... - + Coordinate Reference System (CRS) Система координат - + Enable 'on the fly' CRS transformation Включити перетворення координат "на льоту" - + Identifiable layers Ідентифікуємі шари - - + + Layer Шар - + Type Тип - + Identifiable Можна ідентифікувати @@ -36552,17 +37605,17 @@ p, li { white-space: pre-wrap; } Enter result file - Виберіть файл результатів + Виберіть файл результатів Expression valid - + Вираз правильний Expression invalid - + Вираз неправильний @@ -36756,57 +37809,67 @@ p, li { white-space: pre-wrap; } QgsRasterDataProvider - + Identify Інструмент ідентифікації - + Build Pyramids - + Create Datasources - + Remove Datasources - + + no data + + + + + Feature info + Дані об'єкта + + + Band Канал - + Average - + Nearest Neighbour Найближчий сусід - + Gauss - + Cubic - + Mode Режим - + None @@ -37102,16 +38165,16 @@ Click on help button to get valid creation options for this format QgsRasterLayer - - - - - + + + + + Not Set Не задано - + QgsRasterLayer created Створений QgsRasterLayer @@ -37124,7 +38187,7 @@ Click on help button to get valid creation options for this format Цей растровий файл не має каналів і не є дійсним растровим шаром - + Retrieving stats for %1 Отримання статистики для %1 @@ -37145,12 +38208,12 @@ Click on help button to get valid creation options for this format поза екстентом - + null (no data) null (немає даних) - + Driver: Драйвер: @@ -37171,148 +38234,140 @@ Click on help button to get valid creation options for this format X: %1 Y: %2 Канали: %3 - + Could not reproject view extent: %1 - - - - - - - + + + + Raster Растр - + Could not reproject layer extent: %1 - + Cannot read data - + No Data Value Значення «немає даних» - + NoDataValue not set Значення "немає даних" не задане - + Data Type: Тип даних: - + GDT_Byte - Eight bit unsigned integer GDT_Byte - 8-бітне беззнакове ціле - + GDT_UInt16 - Sixteen bit unsigned integer GDT_UInt16 — 16-бітне беззнакове ціле - + GDT_Int16 - Sixteen bit signed integer GDT_Int16 — 16-бітне ціле зі знаком - + GDT_UInt32 - Thirty two bit unsigned integer GDT_UInt32 — 32-бітне беззнакове ціле - + GDT_Int32 - Thirty two bit signed integer GDT_Int32 - 32-бітове ціле зі знаком - + GDT_Float32 - Thirty two bit floating point GDT_Float32 - 32-бітове з плаваючою точкою - + GDT_Float64 - Sixty four bit floating point GDT_Float64 - 64-бітне з плаваючою точкою - + GDT_CInt16 - Complex Int16 GDT_CInt16 — Комплексне Int16 - + GDT_CInt32 - Complex Int32 GDT_CInt32 — Комплексне Int32 - + GDT_CFloat32 - Complex Float32 GDT_CFloat32 — Комплексне Float32 - + GDT_CFloat64 - Complex Float64 GDT_CFloat64 — Комплексне Float64 - + Could not determine raster data type. Не вдалося встановити тип растрових даних. - + Pyramid overviews: Огляд пірамід: - + Layer Spatial Reference System: Система координат шара: - + Layer Extent (layer original source projection): - + Project Spatial Reference System: Система координат проекта: - - Failed to load provider %1 (Reason: %2) + + Cannot instantiate the '%1' data provider - - Cannot resolve the classFactory function + + Provider is not valid (provider: %1, URI: %2 - - Cannot instantiate the data provider - - - - + <maplayer> not found. - + GDAL data type %1 is not supported @@ -37325,63 +38380,63 @@ Click on help button to get valid creation options for this format Розмір пікселя: - - + + Band Канал - + Band No Канал № - + No Stats Немає статистики - + No stats collected yet Статистика ще не зібрана - + Min Val Мін. значення - + Max Val Макс. значення - + Range Діапазон - + Mean Середнє - + Sum of squares Сумма квадратів - + Standard Deviation Стандартне відхилення - + Sum of all cells Сума всіх чарунок - + Cell Count Кількість чарунок @@ -37489,70 +38544,70 @@ Click on help button to get valid creation options for this format Властивості шара — %1 - - + + Nearest neighbour Найближчий сусід - - + + Bilinear Білінійний - - + + Cubic - - + + Average - + None - - + + Red Червоний - - + + Green Зелений - - + + Blue Синій - - - - - + + + + + Percent Transparent Відсоток прозорості - - + + Gray Сірий - - + + Indexed Value Індексоване значення @@ -37566,11 +38621,6 @@ Click on help button to get valid creation options for this format Bands - - - Time - - Note: Minimum Maximum values are estimates, user defined, or calculated from the current extent Увага: значення мін./макс. можуть бути розрахунковими, заданими або обчисленими в межах поточних меж @@ -37603,17 +38653,17 @@ Click on help button to get valid creation options for this format За замовчуванням R:%1 G:%2 B:%3 - + Columns: %1 Стовпців: %1 - + Rows: %1 Рядків: %1 - + No-Data Value: %1 Значення «немає даних»: %1 @@ -37622,8 +38672,8 @@ Click on help button to get valid creation options for this format Значення "немає даних" не задане - - + + Textfile @@ -37644,81 +38694,81 @@ Click on help button to get valid creation options for this format - + Columns: Стовпців: - + From - + To - + not defined - - - - + + + + n/a н/д - + Rows: Рядків: - - + + No-Data Value: Значення «немає даних»: - - + + Write access denied Закритий доступ на запис - + Write access denied. Adjust the file permissions and try again. Закритий доступ на запис. Виправте права доступа до файлу і спробуйте ще раз. - - - - + + + + Building pyramids failed. Не вдалося побудувати піраміди. - + The file was not writable. Some formats do not support pyramid overviews. Consult the GDAL documentation if in doubt. Запис у файл неможлива. Деякі формати не підтримують оглядові піраміди. Зверніться до документації GDAL за додатковою інформацією. - - + + Building pyramid overviews is not supported on this type of raster. Побудова пірамід не підтримується для даного типу растра. - + Building internal pyramid overviews is not supported on raster layers with JPEG compression and your current libtiff library. Побудова вбудованих оглядових пірамід для растрових шарів з JPEG-стисненням не підтримується поточною версією бібліотеки libtiff. - + Save file Зберегти файл @@ -37727,12 +38777,12 @@ Click on help button to get valid creation options for this format Текстові файли (*.txt) - + QGIS Generated Transparent Pixel Value Export File Файл експорта значень прозорості пікселів, створений QGIS - + Write access denied. Adjust the file permissions and try again. @@ -37743,17 +38793,17 @@ Click on help button to get valid creation options for this format Канал %1 - + Open file Відкрити файл - + Import Error Помилка імпорта - + The following lines contained errors %1 @@ -37762,12 +38812,12 @@ Click on help button to get valid creation options for this format %1 - + Read access denied Закритий доступ на зчитування - + Read access denied. Adjust the file permissions and try again. @@ -37858,9 +38908,8 @@ Click on help button to get valid creation options for this format Трьохканальне кольорове - Invert color map - Інвертувати колірну карту + Інвертувати колірну карту RGB mode band selection and scaling @@ -37883,12 +38932,12 @@ Click on help button to get valid creation options for this format Зберегти поточну відповідність RGB як значення за замовчуванням, яке буде зберігатися між сеансами роботи QGIS. - - - - - - + + + + + + ... ... @@ -37977,8 +39026,10 @@ Click on help button to get valid creation options for this format Покращення контраста + + Current - Поточний + Поточний Save current contrast enhancement algorithm as default. This setting will be persistent between QGIS sessions. @@ -37997,17 +39048,17 @@ Click on help button to get valid creation options for this format Підпис - + Title Заголовок - + Abstract Опис - + Transparency Прозорість @@ -38016,27 +39067,27 @@ Click on help button to get valid creation options for this format Увага - + Global transparency Загальна прозорість - + None Нульова - + 00% 00% - + <p align="right">Full</p> <p align="right">Повна</p> - + No data value Значення "дані відсутні" @@ -38045,47 +39096,47 @@ Click on help button to get valid creation options for this format Скинути значення "немає даних" - + Custom transparency options Параметри прозорості - + Transparency band Канал прозорості - + Transparent pixel list Перелік прозорих пікселів - + Add values manually Додати значення вручну - + Add Values from display Додати значення з карти - + Remove selected row Видалити рядок - + Default values За замовчеванням - + Import from file Імпортувати з файлу - + Export to file Експортувати у файл @@ -38150,22 +39201,22 @@ Click on help button to get valid creation options for this format Класифікувати - + General Загальні - + Display name І'мя в легенді - + Layer source Джерело даних - + Scale dependent visibility Видимість при масштабах @@ -38178,54 +39229,54 @@ Click on help button to get valid creation options for this format Мінімум - + Coordinate reference system Система координат - - + + Specify the coordinate reference system of the layer's geometry. Вибрати систему координат для геометрії в цьому шарі. - + Specify... Вибрати... - + Thumbnail Зразок - + Legend Легенда - + Palette Палітра - + Metadata Метадані - + Pyramids Піраміди - + Notes Примітки - + Pyramid resolutions Роздільна здатність пірамід @@ -38234,99 +39285,84 @@ Click on help button to get valid creation options for this format Створювати вбудовані піраміди, якщо можливо - + Resampling method Метод інтерполяції - + Average Середнє значення - + Style mRendererTab Стиль - + Render type - + Resampling - + Zoomed in - + Zoomed out - - Maximum oversampling - - - - + Use original source no data value. - + No data value: - + Original data source no data value, if exists. - + <src no data value> - - + + Additional user defined no data value. - + Additional no data value - - Less than: - - - - - More than or equal to: - - - - + Nearest Neighbour Найближчий сусід - + Build pyramids Побудувати піраміди - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> <html><head><meta name="qrichtext" content="1" /><style type="text/css"> p, li { white-space: pre-wrap; } @@ -38335,42 +39371,47 @@ p, li { white-space: pre-wrap; } - + Overview format - + External - + Internal (if possible) - + External (Erdas Imagine) - + Histogram Гістограма - + Columns Стовпці - + + Oversampling + + + + Rows Рядки - + No Data Немає даних @@ -38407,27 +39448,57 @@ p, li { white-space: pre-wrap; } Оновити - + Restore Default Style Відновити значення за замовчуванням - + Save As Default Зберегти як значення за замовчуванням - + Load Style ... Завантажити стиль ... - + + MInimum scale denominator. + + + + + Maximum scale: + + + + + Minimum scale (maximum scale denominator). + + + + + Maximum scale (minimum scale denominator). + + + + + Maximum scale denominator + + + + + Minimum scale + + + + Pipe - + Save Style ... Зберегти стиль ... @@ -38435,64 +39506,64 @@ p, li { white-space: pre-wrap; } QgsRasterLayerSaveAsDialog - + From - + To - + Select output directory - + Select output file - - + + layer - - + + user defined - + Resolution (current: %1) - + map view - + Extent (current: %1) - + Layer (%1, %2) - + Project (%1, %2) - + Selected (%1, %2) @@ -38733,17 +39804,17 @@ p, li { white-space: pre-wrap; } - - Cumulative pixel count cut + + Cumulative count cut - + - - - + % % @@ -38753,42 +39824,42 @@ p, li { white-space: pre-wrap; } - + Mean +/- standard deviation × - + Extent - + Full - + Current Поточний - + Accuracy - + Actual (slower) Фактичні (повільніше) - + Estimate (faster) Розраховані (швидше) - + Load Завантажити @@ -38856,6 +39927,39 @@ p, li { white-space: pre-wrap; } Метод інтерполяції + + QgsRasterRenderer + + + Unknown + + + + + User defined + + + + + Estimated + + + + + Exact + Точна + + + + min / max + + + + + of + + + QgsRasterTerrainAnalysisDialog @@ -38986,77 +40090,77 @@ p, li { white-space: pre-wrap; } Додати результат в проект - + Illumination - + Azimuth (horizontal angle) - + Vertical angle - + Relief colors - + Create automatically - + Export distribution... - + Up - + Down - + + + - + - - - + Lower bound - + Upper bound - + Color Колір - + Export colors... - + Import colors... @@ -39167,7 +40271,7 @@ p, li { white-space: pre-wrap; } - + Filter Фільтр @@ -39213,18 +40317,18 @@ p, li { white-space: pre-wrap; } Знак - + Error Помилка - + Filter expression parsing error: Помилка розбору виразу фільтра: - + Evaluation error @@ -39233,7 +40337,7 @@ p, li { white-space: pre-wrap; } Фільтр пустий - + Filter returned %n feature(s) number of filtered features @@ -39415,30 +40519,55 @@ p, li { white-space: pre-wrap; } QgsRuleBasedRendererV2Model - + (no filter) (без фільтра) - + + <li><nobr>%1 features also in rule %2</nobr></li> + + + + Label Підпис - + Rule Правило - + Min. scale Мінімальний - + Max.scale + + + Count + + + + + Duplicate count + + + + + Number of features in this rule. + + + + + Number of features in this rule which are also present in other rule(s). + + QgsRuleBasedRendererV2Widget @@ -39463,7 +40592,7 @@ p, li { white-space: pre-wrap; } Максимальний - + Add Додати @@ -39472,25 +40601,30 @@ p, li { white-space: pre-wrap; } Уточнити - + Rendering order... - + Edit Правка - + Remove Видалити - + Refine current rules + + + Count features + + Rule grouping Групування правил @@ -39528,56 +40662,66 @@ p, li { white-space: pre-wrap; } Не допускається зміна групи правил. - + Add scales to rule - + Add categories to rule - + Add ranges to rule - + Refine a rule to categories Додати до правила категорії - + Refine a rule to ranges Додати до правила діапазони - - + + Scale refinement Уточнення масштаба - + Parent rule %1 must have a symbol for this operation. - + Please enter scale denominators at which will split the rule, separate them by commas (e.g. 1000,5000): Будь ласка, введіть знаменники масштабу, які будуть розбивати правило, розділяючи їх комами (наприклад: «1000, 5000»): - + Error Помилка - + "%1" is not valid scale denominator, ignoring it. «% 1» не є дійсним знаменником масштабу. Значення буде проігноровано. + + + Calculating feature count. + + + + + Abort + + QgsRunProcess @@ -39678,12 +40822,12 @@ p, li { white-space: pre-wrap; } Delete layer - + Видалити шар Layer deleted successfully. - + Шар видалено успішно. @@ -39729,58 +40873,49 @@ p, li { white-space: pre-wrap; } QgsSVGDiagramFactoryWidget - Select svg file - Виберіть svg файл + Виберіть svg файл - Select new preview directory - Виберіть новий каталог для мініатюр зображень + Виберіть новий каталог для мініатюр зображень - Creating icon for file %1 - Створення іконки для файлу %1 + Створення іконки для файлу %1 QgsSVGDiagramFactoryWidgetBase - Form - Форма + Форма - Search directories - Директорії для пошуку + Директорії для пошуку - Add... - Додати... + Додати... - Remove - Видалити + Видалити - SVG Preview - Попередній перегляд + Попередній перегляд - ... - ... + ... QgsSVGFillSymbolLayerWidget - + Select svg texture file Виберіть SVG-файл текстури @@ -40113,37 +41248,35 @@ p, li { white-space: pre-wrap; } number of geometry errors - - - + ring %1, vertex %2 кільце %1, вершина %2 - + polygon %1, ring %2, vertex %3 полігон %1, кільце %2, вершина %3 - + polyline %1, vertex %2 полілінія %1, вершина %2 - + vertex %1 вершина %1 - + point %1 точка %1 - + single point єдина точка @@ -40194,22 +41327,32 @@ The error was: QgsSingleBandGrayRendererWidget - + + Black to white + + + + + White to black + + + + No enhancement - + Stretch to MinMax - + Stretch and clip to MinMax - + Clip to MinMax @@ -40241,74 +41384,79 @@ The error was: Max + + + Color gradient + + QgsSingleBandPseudoColorRendererWidget - - - - - + + + + + Discrete Дискретна - - - - - - + + + + + + Linear Лінійна - - - + + + Exact Точна - - + + Equal interval Рівні інтервали - + Custom color map entry Користувальницьке значення колірної карти - + Load Color Map Завантаження колірної карти - + The color map for band %1 failed to load Не вдалося завантажити колірну карту для канала %1 - + Open file Відкрити файл - - + + Textfile (*.txt) Текстові файли (*.txt) - + Import Error Помилка імпорта - + The following lines contained errors @@ -40317,34 +41465,34 @@ The error was: - + Read access denied Закритий доступ на зчитування - + Read access denied. Adjust the file permissions and try again. Закритий доступ на зчитування. Виправте права доступа до файлу і спробуйте ще раз. - + Save file Зберегти файл - + QGIS Generated Color Map Export File Файл експорта колірної карти QGIS - + Write access denied Закритий доступ на запис - + Write access denied. Adjust the file permissions and try again. @@ -40359,92 +41507,127 @@ The error was: - + Band Канал - + Color interpolation Інтерполяція кольорів - Add entry - Додати значення + Додати значення - Delete entry - Видалити значення + Видалити значення - Sort - Сортувати + Сортувати - + Load color map from band Завантажити колірку карту з канала - - - + + + + + + ... ... - + + Add values manually + Додати значення вручну + + + + Remove selected row + Видалити рядок + + + Load color map from file Завантажити колірну карту з файла - + Export color map to file Зберегти колірну карту в файл - + Value - + Color Колір - + Label Підпис - + Generate new color map Створити нову колірну карту - + Classes - + + Colors + Кольори + + + + Min + + + + + Max + + + + Mode Режим - - Classify - Класифікувати + + Min / max origin: + - - Color ramp + + Min / Max origin + + + Invert colors order + + + + + Classify + Класифікувати + QgsSingleSymbolDialog @@ -40552,7 +41735,7 @@ The error was: Symbol levels... - + Рівні знака... @@ -40560,12 +41743,12 @@ The error was: Form - + The Symbol - + Символ @@ -40573,12 +41756,12 @@ The error was: Invalid name - + Неправильне ім'я The smart group name field is empty. Kindly provide a name - + Не вказано ім'я "розумної" групи. Будь ласка, задайте ім'я @@ -40617,29 +41800,29 @@ The error was: - - + + to vertex до вузлів - - + + to segment до сегментів - + to vertex and segment до вузлів та сегментів - + map units одиниці карти - + pixels пікселі @@ -40652,40 +41835,45 @@ The error was: Параметри притягування - + Enable topological editing Включити топологічне редагування - + Layer Шар - + Mode Режим - + Tolerance Радіус - + Units Одиниці - + Avoid Int. - + Avoid intersections of new polygons + + + Enable snapping on intersection + + QgsSpatiaLiteConnection @@ -40694,7 +41882,7 @@ The error was: unknown error cause - + причину помилки не виявлено @@ -40728,24 +41916,24 @@ The error was: - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + SQLite error: %2 SQL: %1 @@ -40760,19 +41948,19 @@ SQL: %1 - - - - - - - - - - - - - + + + + + + + + + + + + + SpatiaLite @@ -40780,12 +41968,12 @@ SQL: %1 - - - - - - + + + + + + unknown cause @@ -40795,7 +41983,7 @@ SQL: %1 - + FAILURE: Field %1 not found. @@ -41049,8 +42237,6 @@ SQL: %1 selected geometries - - @@ -41384,7 +42570,7 @@ p, li { white-space: pre-wrap; } Query not executed - + Запит не виконано @@ -41904,7 +43090,7 @@ Do you want to overwrite the [%2] relation? &Spit - &SPIT + &SPIT @@ -41912,12 +43098,12 @@ Do you want to overwrite the [%2] relation? QGIS Sponsors - + Спонсори QGIS TextLabel - + @@ -41945,7 +43131,30 @@ p, li { white-space: pre-wrap; } <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.gfosservices.com"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Studio Associato Gfosservices</span></a></p> <p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://nextgis.org"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">NEXTGIS</span></a></p> <p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;"></p></body></html> - + <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0//EN" "http://www.w3.org/TR/REC-html40/strict.dtd"> +<html><head><meta name="qrichtext" content="1" /><style type="text/css"> +p, li { white-space: pre-wrap; } +</style></head><body style=" font-family:'Ubuntu'; font-size:11pt; font-weight:400; font-style:normal;"> +<p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt;">GIS стає краще з кожним днем завдяки зусиллям активної команди розробників. Нам подобається, що кількість користувачів нащого продукту постійно зростає. Ви можете вільно копіювати Quantum GIS та ділитися нею з вашими друзями та колегами. Якщо QGIS допомогає вам скоротити витрати і ви маєте кошти для допомоги проекту, підтримайте розробку Quantum GIS. Ми використовуємо спонсорську допомогу для покриття транспортних та інших витрат під час зустрічей розробників та фінансування інших аспектів проекту. Детальніше про це можна дізнатися на сторінці </span><a href="http://qgis.org/en/sponsorship.html"><span style=" font-size:10pt; text-decoration: underline; color:#0000ff;">Спонсорування QGIS</span></a><span style=" font-size:10pt;">. В цьому списку наведено людей та організації, які підтримують нас. Велике спасибі всім вам!</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">2011</span></p> +<hr /> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'MS Shell Dlg 2'; font-size:10pt; font-weight:600;">Срібні спонсори</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.vorarlberg.at"><span style=" font-family:'Courier New,courier'; font-size:10pt; text-decoration: underline; color:#0000ff;">State of Vorarlberg</span></a><span style=" font-family:'Courier New,courier'; font-size:10pt;"> </span><span style=" font-family:'Courier New,courier'; font-size:10pt; color:#333333;">, Austria (11.2011)</span></p> +<p align="center" style=" margin-top:12px; margin-bottom:12px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.agi.so.ch"><span style=" font-family:'Courier New,courier'; font-size:10pt; text-decoration: underline; color:#0000ff;">Kanton Solothurn</span></a><span style=" font-family:'Courier New,courier'; font-size:10pt; color:#333333;">, Switzerland (4.2011)</span></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-family:'MS Shell Dlg 2'; font-size:8pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Бронзові спонсори</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://gis.uster.ch/"><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; text-decoration: underline; color:#0000ff;">City of Uster</span></a><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; color:#0000ff;"> </span><span style=" font-family:'Helvetica,Arial,sans-serif'; font-size:10pt; color:#000000;">, Switzerland</span><span style=" font-family:'Helvetica,Arial,sans-serif'; color:#000000;"> (11.2011)</span></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.municipia.pt"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Municípia, SA</span></a></p> +<p align="center" style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:14pt; font-weight:600;">2010</span></p> +<hr /> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-size:10pt; font-weight:600;">Бронзові спонсори</span></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:10pt; font-weight:600;"></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://www.gfosservices.com"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">Studio Associato Gfosservices</span></a></p> +<p align="center" style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><a href="http://nextgis.org"><span style=" font-family:'Sans'; font-size:10pt; text-decoration: underline; color:#0000ff;">NEXTGIS</span></a></p> +<p style="-qt-paragraph-type:empty; margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px; font-size:14pt; font-weight:600;"></p></body></html> @@ -42440,72 +43649,72 @@ Overwrite? - - + + Invalid Selection - + The parent group you have selected is not user editable. Kindly select a user defined group. - + Operation Not Allowed - + Creation of nested smart groups are not allowed Select the 'Smart Group' to create a new group. - + Invalid selection - + Cannot delete system defined categories. Kindly select a group or smart group you might want to delete. - + Error! - + New group could not be created. There was a problem with your symbol database. - + Database Error Помилка БД - + There was a problem with the Symbols database while regrouping. - + You have not selected a Smart Group. Kindly select a Smart Group to edit. - + Database Error! - + There was some error while editing the smart group. @@ -42584,17 +43793,30 @@ There was a problem with your symbol database. Видалити + + QgsSvgAnnotationDialog + + + Delete + Видалити + + + + html + + + QgsSvgMarkerSymbolLayerV2Widget - + Select SVG file - + Виберіть SVG файл - + SVG files - + Файли SVG @@ -42620,7 +43842,7 @@ There was a problem with your symbol database. Define the order in which the symbol layers are rendered. The numbers in the cells define in which rendering pass the layer will be drawn. - + Вкажіть порядок відображення шарів для цього умовного знаку. Номери в таблиці визначають послідовність відображення для кожного шару. @@ -42644,12 +43866,12 @@ There was a problem with your symbol database. Invalid Selection! - + Неправильний вибір! Kindly select a symbol to add layer. - + Будь ласка, виберіть символ, що буде додано до шару. @@ -42853,7 +44075,7 @@ There was a problem with your symbol database. Tile scale - Рівень деталізації + Рівень деталізації @@ -43034,12 +44256,12 @@ There was a problem with your symbol database. &Previous - + &Попередній &Next - + &Наступний @@ -43047,7 +44269,7 @@ There was a problem with your symbol database. QGIS Tips! - + Порада дня @@ -43056,12 +44278,12 @@ There was a problem with your symbol database. p, li { white-space: pre-wrap; } </style></head><body style=" font-family:'Lucida Grande'; font-size:13pt; font-weight:400; font-style:normal;"> <p style=" margin-top:0px; margin-bottom:0px; margin-left:0px; margin-right:0px; -qt-block-indent:0; text-indent:0px;"><span style=" font-family:'Ubuntu'; font-size:10pt;">A nice tip goes here...</span></p></body></html> - + I've had enough tips, don't show this on start up any more! - + Не показувати поради наступного разу @@ -43528,42 +44750,52 @@ Should the existing classes be deleted before classification? QgsVectorLayer - + + Updating feature count for layer %1 + + + + + Abort + + + + Unknown renderer Невідомий об'єкт викреслення - + No renderer object Відсутній об'єкт викреслення - + Classification field not found Поле класифікації не знайдено - + renderer failed to save не вдалося зберегти об'єкт викреслення - + no renderer Відсутній об'єкт викреслення - + ERROR: no provider ПОМИЛКА: джерело відсутнє - + ERROR: layer not editable ПОМИЛКА: шар не редагується - + SUCCESS: %n attribute(s) deleted. deleted attributes count @@ -43573,7 +44805,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n attribute(s) not deleted. not deleted attributes count @@ -43583,7 +44815,7 @@ Should the existing classes be deleted before classification? - + SUCCESS: %n attribute(s) added. added attributes count @@ -43593,7 +44825,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n new attribute(s) not added not added attributes count @@ -43603,17 +44835,17 @@ Should the existing classes be deleted before classification? - + SUCCESS: attribute %1 was added. УСПІХ: додано атрибут %1. - + ERROR: attribute %1 not added ПОМИЛКА: атрибут %1 не був доданий - + SUCCESS: %n attribute value(s) changed. changed attribute values count @@ -43623,7 +44855,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n attribute value change(s) not applied. not changed attribute values count @@ -43633,7 +44865,7 @@ Should the existing classes be deleted before classification? - + SUCCESS: %n feature(s) added. added features count @@ -43643,7 +44875,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n feature(s) not added. not added features count @@ -43653,17 +44885,15 @@ Should the existing classes be deleted before classification? - + ERROR: %n feature(s) not added - provider doesn't support adding features. not added features count - - - + SUCCESS: %n geometries were changed. changed geometries count @@ -43673,7 +44903,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n geometries not changed. not changed geometries count @@ -43683,7 +44913,7 @@ Should the existing classes be deleted before classification? - + SUCCESS: %n feature(s) deleted. deleted features count @@ -43693,7 +44923,7 @@ Should the existing classes be deleted before classification? - + ERROR: %n feature(s) not deleted. not deleted features count @@ -43703,121 +44933,121 @@ Should the existing classes be deleted before classification? - + Provider errors: - + Commit errors: %1 - + General: - + Layer comment: %1 - + Storage type of this layer: %1 - + Source for this layer: %1 - + Geometry type of the features in this layer: %1 - + The number of features in this layer: %1 - + Editing capabilities of this layer: %1 - + Extents: Межі: - + In layer spatial reference system units : - - + + xMin,yMin %1,%2 : xMax,yMax %3,%4 - + unknown extent - - + + In project spatial reference system units : - + Layer Spatial Reference System: - + Project (Output) Spatial Reference System: - + (Invalid transformation of layer extents) - + Attribute field info: - + Field - + Type Тип - + Length Довжина - + Precision Точність - + Comment Коментар @@ -43829,167 +45059,110 @@ Should the existing classes be deleted before classification? довжина - - + + Stop editing mode to enable this. - - Name conflict - - - - - The attribute could not be inserted. The name already exists in the table. - - - - - Added attribute - - - - Deleted attribute - Видалено атрибут + Видалено атрибут - + Transparency: %1% Прозорість: %1% - - + + Single Symbol - - + + Graduated Symbol - - + + Continuous Color - - + + Unique Value - + Insert expression - + This button opens the query builder and allows you to create a subset of features to display on the map canvas rather than displaying all features in the layer - + The query used to limit the features in the layer is shown here. To enter or modify the query, click on the Query Builder button - Line edit - Лінійне редагування + Лінійне редагування - Unique values - Унікальні значення + Унікальні значення - - Unique values editable - - - - Classification - Класифікація + Класифікація - Value map - Карта значень - - - - Edit range - - - - - Slider range - - - - - Dial range - + Карта значень - File name - Ім'я файла + Ім'я файла - Enumeration - Перелік + Перелік - Immutable - Незмінний + Незмінний - Hidden - Прихований + Прихований - Checkbox - Перемикач + Перемикач - Text edit - Текстове поле + Текстове поле - Calendar - Календар - - - - Value relation - - - - - UUID generator - + Календар - + Save Style - + Save Style... @@ -44002,18 +45175,18 @@ Should the existing classes be deleted before classification? Одиниці карти - - + + Spatial Index - + Creation of spatial index successful - + Creation of spatial index failed @@ -44030,53 +45203,40 @@ Should the existing classes be deleted before classification? Лінія - Type - Тип + Тип - Overlay - Накладення + Накладення - Id - ID + ID - Name - Ім'я + Ім'я - Length - Довжина + Довжина - Precision - Точність + Точність - Comment - Коментар + Коментар - - Edit widget - - - - Alias - Псевдонім + Псевдонім - - + + Default Style Стиль за замовчуванням @@ -44089,17 +45249,12 @@ Should the existing classes be deleted before classification? Файл стиля QGIS (*.qml) - + Saved Style Збережений стиль - - Select edit form - - - - + Symbology Символіка @@ -44108,46 +45263,41 @@ Should the existing classes be deleted before classification? Зберегти налаштування шару у файл QML - + Layer Properties - %1 Властивості шара — %1 - + Load layer properties from style file - - - + + + QGIS Layer Style File - - - + + + SLD File - + Load Style - + Save layer properties as style file - - UI file - - - - + Do you wish to use the new symbology implementation for this layer? @@ -44185,7 +45335,7 @@ Should the existing classes be deleted before classification? - + General Загальні @@ -44205,7 +45355,7 @@ Should the existing classes be deleted before classification? Поля - + Options Параметри @@ -44214,48 +45364,37 @@ Should the existing classes be deleted before classification? І'мя в легенді - - Edit UI - - - - ... - ... + ... - + Create Spatial Index Створення просторового індекса - + CRS - - + + Specify the coordinate reference system of the layer's geometry. Вкажіть СК для геометрії цього шару. - + Specify CRS Вибрати - + Update Extents - - Init function - - - - + Use scale dependent rendering Використовувати підписування в масштабах @@ -44268,102 +45407,102 @@ Should the existing classes be deleted before classification? Мінімум - + Subset - + Query Builder Конструктор запитів - + Provider-specific options - + Encoding Кодування - + Display - + Legend display text - + Map Tip display text - + Inserts an expression into the action - + Insert expression... - + The valid attribute names for this layer Допустимі імена атрибутів для цього шару - + Inserts the selected field into the action - + Insert field Вставити поле - + HTML - + Field - + Title Заголовок - + Abstract Опис - + Joins - + Join layer - + Join field Поле для об'єднання - + Target field Цільове поле @@ -44386,7 +45525,39 @@ Should the existing classes be deleted before classification? Прозорість - + + + Maximum scale (minimum scale denominator). + + + + + Minimum scale: + + + + + Minimum scale denominator. + + + + + Maximum scale: + + + + + Minimum scale (maximum scale denominator). + + + + + + Set current + + + + Metadata Метадані @@ -44401,22 +45572,12 @@ Should the existing classes be deleted before classification? - - Less than: - - - - - More than or equal to: - - - - + Actions - + Diagrams @@ -44493,75 +45654,62 @@ Should the existing classes be deleted before classification? Колір - New column - Новий стовпець + Новий стовпець - Ctrl+N - Ctrl+N + Ctrl+N - Delete column - Видалити стовпець + Видалити стовпець - Ctrl+X - Ctrl+X + Ctrl+X - Toggle editing mode - Режим редагування + Режим редагування - - Click to toggle table editing - Клацніть для переключення редагування таблиці + Клацніть для переключення редагування таблиці - Field calculator - Калькулятор полів + Калькулятор полів QgsVectorLayerSaveAsDialog - - - SpatiaLite - - Original CRS Оригінальна СК - + Layer CRS - + Project CRS - + Selected CRS - + Save layer as... Зберегти шар як... - + Select the coordinate reference system for the vector file. The data points will be transformed from the layer coordinate reference system. Виберіть систему координат для створюваного файлу. Вершини в новому шарі будуть перетворені у неї з поточної системи координат. @@ -44682,12 +45830,12 @@ Should the existing classes be deleted before classification? Edit... - Змінити... + Змінити... Delete - Видалити + Видалити @@ -44695,7 +45843,7 @@ Should the existing classes be deleted before classification? New Connection... - + Нове підключення... @@ -44703,12 +45851,12 @@ Should the existing classes be deleted before classification? Select a layer - Виберіть шар + Виберіть шар No CRS selected - + Не вибрано систему координат @@ -44716,17 +45864,17 @@ Should the existing classes be deleted before classification? Edit... - Змінити... + Змінити... Delete - Видалити + Видалити Modify WFS connection - Змінити параметри WFS підключення + Змінити параметри WFS підключення @@ -44744,7 +45892,8 @@ Should the existing classes be deleted before classification? Loading WFS data %1 - + Завантажуються дані WFS +%1 @@ -44757,17 +45906,17 @@ Should the existing classes be deleted before classification? QgsWFSProvider - + unknown невідомий - + received %1 bytes from %2 отримано %1 байт від %2 - + Error Помилка @@ -44777,12 +45926,12 @@ Should the existing classes be deleted before classification? New Connection... - + Нове підключення... Create a new WFS connection - Створити нове WFS пыдключення + Створити нове WFS підключення @@ -44952,30 +46101,24 @@ Features QgsWKNDiagramFactoryWidgetBase - Form - Форма + Форма - Attributes - Атрибути + Атрибути - Add - Додати + Додати - Remove - Видалити + Видалити - - 1 - 1 + 1 @@ -44983,7 +46126,7 @@ Features WMS Password for %1 - + Пароль WMS для %1 @@ -44991,12 +46134,12 @@ Features Edit... - Змінити... + Змінити... Delete - Видалити + Видалити @@ -45004,7 +46147,7 @@ Features New Connection... - + Нове підключення... @@ -45068,8 +46211,6 @@ Features crs count - - @@ -45083,8 +46224,6 @@ Features crs count - - @@ -45118,8 +46257,6 @@ Features selected layer count - - @@ -45471,148 +46608,147 @@ Response was: QgsWcsProvider - + Cannot describe coverage - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + - + + WCS - + Coverage not found - + Cannot calculate extent - + Cannot get test dataset. - + Received coverage has wrong extent %1 (expected %2) - + Rotating raster - + Block read OK - + Received coverage has wrong size %1 x %2 (expected %3 x %4) - + Getting map via WCS. - + Map request error (Status: %1; Reason phrase: %2; URL:%3) - - + Map request error (Title:%1; Error:%2; URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) - + + Map request error:<br>Title: %1<br>Error: %2<br>URL: <a href='%3'>%3</a>) + + + + Cannot find boundary in multipart content type - + Expected 2 parts, %1 received - + More than 2 parts (%1) received - + Map request error (Response: %1; URL:%2) - + Content-Transfer-Encoding %1 not supported - + No data received - + Cannot create memory file - + Map request failed [error:%1 url:%2] - + Not logging more than 100 request errors. - + %1 of %2 bytes of map downloaded. - + Dom Exception - + Could not get WCS Service Exception at %1: %2 at line %3 column %4 Response was: @@ -45621,210 +46757,208 @@ Response was: - + Request contains a format not offered by the server. - + Request is for a Coverage not offered by the service instance. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. - + Request does not include a parameter value, and the server instance did not declare a default value for that dimension. - + Request contains an invalid parameter value. - + No other exceptionCode specified by this service and server applies to this exception. - + Operation request contains an output CRS that can not be used within the output format. - + Operation request specifies to "store" the result, but not enough storage is available to do this. - + (No error code was reported) - + (Unknown error code) - + The WCS vendor also reported: - + composed error message '%1'. - - + + Property - - + + Value - + Name (identifier) - - + + Title Заголовок - - + + Abstract Опис - + Fixed Width - + Fixed Height - + Native CRS - + Native Bounding Box - + WGS 84 Bounding Box - - + + Available in CRS - - + + (and %n more) crs - - - - + + Available in format - - + + Coverages - + Cache Stats - + Server Properties - + Keywords - + Online Resource - + Contact Person - + Fees - + Access Constraints - + Image Formats - + GetCapabilitiesUrl - + Get Coverage Url - + &nbsp;<font color="red">(advertised but ignored)</font> - + And %1 more coverages @@ -45832,478 +46966,503 @@ Response was: QgsWmsProvider - - + + %n tile requests in background tile request count - - - - + + , %n cache hits tile cache hits - - - - + + , %n cache misses. tile cache missed - - - - + + , %n errors. errors - - - + Tile request error (Title:%1; Error:%2; URL: %3) - + Tile request error (Status:%1; Content-Type:%2; Length:%3; URL: %4) - + Tile request failed [error:%1 url:%2] - - + + Not logging more than 100 request errors. - + Map request error (Status: %1; Reason phrase: %2; URL:%3) - + Map request error (Title:%1; Error:%2; URL: %3) - + Map request error (Status: %1; Response: %2; URL:%3) - + Map request failed [error:%1 url:%2] - + Tried URL: %1 - + Capabilities request redirected. - + empty of capabilities: %1 - + Download of capabilities failed: %1 - + %1 of %2 bytes of capabilities downloaded. - + %1 of %2 bytes of map downloaded. - - - + + + Dom Exception - + Request contains a CRS not offered by the server for one or more of the Layers in the request. - + Request contains a SRS not offered by the server for one or more of the Layers in the request. - + GetMap request is for a Layer not offered by the server, or GetFeatureInfo request is for a Layer not shown on the map. - + Request is for a Layer in a Style not offered by the server. - + GetFeatureInfo request is applied to a Layer which is not declared queryable. - + GetFeatureInfo request contains invalid X or Y value. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is equal to current value of service metadata update sequence number. - + Value of (optional) UpdateSequence parameter in GetCapabilities request is greater than current value of service metadata update sequence number. - + Request does not include a sample dimension value, and the server did not declare a default value for that dimension. - + Request contains an invalid sample dimension value. - + Request is for an optional operation that is not supported by the server. - + (No error code was reported) - + (Unknown error code) - + The WMS vendor also reported: - + + Extent for layer %1 not found in capabilities + + + + Tile Layer Properties - + Tile Layer Count - + GetTileUrl - + Tile templates - + FeatureInfo templates - + WMTS - + WMS-C - + Available Styles - + Available Tilesets - + Cache stats - - - - + + + + Property - - - - + + + + Value Значення - + WMS Version - - - + + + Title Заголовок - - - + + + Abstract Опис - + (and %n more) crs - - - - + + Server Properties - - + + Selected Layers - - + + Other Layers - + Tileset Properties - + Cache Stats - + Number of layers and styles don't match - + Getting tiles. - + Keywords - + Online Resource - + Contact Person - + Fees - + Access Constraints - + Image Formats - + Identify Formats - + Layer Count - + GetCapabilitiesUrl - + GetMapUrl - - + + &nbsp;<font color="red">(advertised but ignored)</font> - + GetFeatureInfoUrl - + Selected - - - - + + + + Yes - - - - + + + + No - + Visibility - - - - - - - - - - - - - - - - - + + Cannot parse URI + + + + + Cannot calculate extent + + + + + Cannot set CRS + + + + + + + + + + + + + + + + + + + + WMS WMS - + + Number of tile layers must be one + + + + + Tile layer not found + + + + + Tile layer or tile matrix set not found + + + + Getting map via WMS. - + image is NULL - + unexpected image size - + Tile request error - + Status: %1 Reason phrase: %2 - - + + Returned image is flawed [%1] - + empty capabilities document - + Could not get WMS capabilities: %1 at line %2 column %3 This is probably due to an incorrect WMS Server URL. Response was: @@ -46312,7 +47471,7 @@ Response was: - + Could not get WMS capabilities in the expected format (DTD): no %1 or %2 found. This might be due to an incorrect WMS Server URL. Tag:%3 @@ -46321,7 +47480,7 @@ Response was: - + Could not get WMS Service Exception at %1: %2 at line %3 column %4 Response was: @@ -46330,129 +47489,119 @@ Response was: - + Request contains a format not offered by the server. - + composed error message '%1'. - + Visible - + Hidden Прихований - + Can Identify - + Can be Transparent - + Can Zoom In - + Cascade Count - + Fixed Width - + Fixed Height - + WGS 84 Bounding Box - - + + Available in CRS - + Available in style - + Map getfeatureinfo error %1: %2 - + ERROR: GetFeatureInfo failed - + Map getfeatureinfo error: %1 [%2] - - + + Name Ім'я - + CRS - + Bounding Box - + Hits - + Misses - + Errors - - Layer cannot be queried in plain text. - - - - - Layer cannot be queried. - - - - + identify request redirected. @@ -46491,22 +47640,22 @@ Response was: Dialog - Діалог + Raster layer: - + Растровий шар: Polygon layer containing the zones: - + Полігональний шар зон: Output column prefix: - + Префікс поля статистики: @@ -46516,17 +47665,17 @@ Response was: &Zonal statistics - + &Зональна статистика Calculating zonal statistics... - + Розрахунок зональної статистики... Abort... - Відмінити... + Відмінити... @@ -46608,17 +47757,17 @@ Response was: Export feature - + Експортувати об'єкт Select destination layer - + Виберіть шар призначення New temporary layer - + Новий тимчасовий шар @@ -46867,18 +48016,18 @@ Response was: Settings - Установки + Настройки Road graph plugin settings - + Параметри модуля RoadGraph Road graph - + Close @@ -46892,15 +48041,15 @@ Response was: Аналіз - &SEXTANTE Toolbox + &SEXTANTE toolbox - &SEXTANTE Modeler + &SEXTANTE modeler - &SEXTANTE History and log + &SEXTANTE history and log @@ -46915,10 +48064,6 @@ Response was: &SEXTANTE help - - &About SEXTANTE - - SaDbTableModel @@ -47477,6 +48622,34 @@ Description: %3 + + SettingsDialog + + + Font + Шрифт + + + + Size + Розмір + + + + API file + + + + + Browse + Огляд + + + + Use preloaded API file + + + SextanteToolbox @@ -47532,22 +48705,22 @@ additional algorithm providers Add SQL Anywhere Layer... - + Додати шарSQL Anywhere... Store vector layers within a SQL Anywhere database - + Робота з векторними даними в БД SQL Anywhere Invalid Layer - Недійсний шар + Недійсний шар %1 is an invalid layer and cannot be loaded. - Шар %1 не дійсний і не може бути завантаженим. + Шар %1 не дійсний і не може бути завантаженим. @@ -47757,7 +48930,7 @@ additional algorithm providers Form - + Marker @@ -47845,37 +49018,37 @@ additional algorithm providers - + Font family Шрифт - + Color Колір - + Change Змінити - + Size Розмір - + Rotation Обертання - + ° - + Offset X,Y @@ -47888,19 +49061,19 @@ additional algorithm providers Форма - + Color Колір - + Change Змінити - + Pen width - Товщина лінії + Товщина лінії @@ -47911,38 +49084,36 @@ additional algorithm providers - + Angle Кут - + Distance - + Line width - + Color Колір - - + Change Змінити - Outline - Контур + Контур - + Offset Зміщення @@ -48023,22 +49194,22 @@ additional algorithm providers Змінити - + Horizontal distance - + Vertical distance - + Horizontal displacement - + Vertical displacement @@ -48051,54 +49222,52 @@ additional algorithm providers - + Texture width Ширина текстури - + Rotation Обертання - + Color Колір - + Border color Колір обвідки - + Border width Товщина обвідки - Outline - Контур + Контур - - - + + Change Змінити - + SVG Groups - + SVG Symbols - + ... ... @@ -48111,38 +49280,38 @@ additional algorithm providers - + Color Колір - + Fill style Стиль заливки - + Border color Колір обвідки - + Border style Стиль обвідки - + Border width Товщина обвідки - + Offset X,Y Зміщення по X, Y - - + + Change Змінити @@ -48155,43 +49324,43 @@ additional algorithm providers - + Color Колір - + Pen width Товщина лінії - + Offset Зміщення - + Pen style Стиль лінії - + Join style Стиль об'єднання - + Cap style Кінці - - + + Change Змінити - + Use custom dash pattern Користувальницький пунктир @@ -48204,33 +49373,33 @@ additional algorithm providers - + Border color Колір обвідки - + Fill color Колір заливки - + Size Розмір - + Angle Кут - + Offset X,Y Зміщення по X,Y - - + + Change Змінити @@ -48248,48 +49417,48 @@ additional algorithm providers Розмір - + Angle Кут - + Offset X,Y Зміщення по X,Y - - + + Change Змінити - + Color Колір - + Border width Товщина обвідки - + Border color Колір обвідки - + SVG Groups - + SVG Image SVG-зображення - + ... ... @@ -49440,6 +50609,10 @@ Plugin will not be enabled. Difference Різниця + + Eliminate sliver polygons + + G&eometry Tools І&нструменти геометрії diff --git a/images/console/iconCodepadConsole.png b/images/console/iconCodepadConsole.png new file mode 100644 index 000000000000..fcb1e1ef1f0b Binary files /dev/null and b/images/console/iconCodepadConsole.png differ diff --git a/images/console/iconHideToolConsole.png b/images/console/iconHideToolConsole.png new file mode 100644 index 000000000000..84e24de9f0e1 Binary files /dev/null and b/images/console/iconHideToolConsole.png differ diff --git a/images/console/imgHelpConsole.png b/images/console/imgHelpConsole.png new file mode 100644 index 000000000000..7ac3dbc69e6c Binary files /dev/null and b/images/console/imgHelpConsole.png differ diff --git a/images/console/imgHelpMenu.png b/images/console/imgHelpMenu.png new file mode 100644 index 000000000000..6d5f4abf0c06 Binary files /dev/null and b/images/console/imgHelpMenu.png differ diff --git a/images/developers/essen-2012.jpg b/images/developers/essen-2012.jpg new file mode 100644 index 000000000000..97ba6830b142 Binary files /dev/null and b/images/developers/essen-2012.jpg differ diff --git a/images/flags/eu_ES.png b/images/flags/eu_ES.png new file mode 100644 index 000000000000..241c4139281b Binary files /dev/null and b/images/flags/eu_ES.png differ diff --git a/images/flags/sw.png b/images/flags/sw.png new file mode 100755 index 000000000000..c00ff7961424 Binary files /dev/null and b/images/flags/sw.png differ diff --git a/images/images.qrc b/images/images.qrc index 0b9a872f9d08..b0da10656968 100644 --- a/images/images.qrc +++ b/images/images.qrc @@ -1,7 +1,7 @@ - developers/lyon-2012.jpg icons/qgis-icon-16x16.png + developers/essen-2012.jpg icons/qgis-icon-60x60.png north_arrows/gpsarrow2.svg north_arrows/gpsarrow.svg @@ -20,6 +20,7 @@ themes/default/join_miter.png themes/default/join_round.png themes/default/join_style.svg + themes/default/mActionAdd.png themes/default/mActionAddAllToOverview.png themes/default/mActionAddArrow.png themes/default/mActionAddBasicShape.png @@ -45,6 +46,8 @@ themes/default/mActionAnnotation.png themes/default/mActionArrowDown.png themes/default/mActionArrowUp.png + themes/default/mActionArrowLeft.png + themes/default/mActionArrowRight.png themes/default/mActionCalculateField.png themes/default/mActionCaptureLine.png themes/default/mActionCapturePoint.png @@ -76,6 +79,7 @@ themes/default/mActionFileSaveAs.png themes/default/mActionFileSave.png themes/default/mActionFileSmall.png + themes/default/mActionFilter.png themes/default/mActionFolder.png themes/default/mActionFormAnnotation.png themes/default/mActionFromSelectedFeature.png @@ -126,6 +130,7 @@ themes/default/mActionPropertyItem.png themes/default/mActionQgisHomePage.png themes/default/mActionRaiseItems.png + themes/default/mActionRefresh.png themes/default/mActionRedo.png themes/default/mActionRemoveAllFromOverview.png themes/default/mActionRemoveLayer.png @@ -138,6 +143,7 @@ themes/default/mActionSaveAsPDF.png themes/default/mActionSaveAsSVG.png themes/default/mActionSaveEdits.png + themes/default/mActionSaveAllEdits.png themes/default/mActionSaveMapAsImage.png themes/default/mActionScaleBar.png themes/default/mActionSelectedToTop.png @@ -148,6 +154,8 @@ themes/default/mActionSelectPolygon.svg themes/default/mActionSelectRadius.png themes/default/mActionSelectRectangle.png + themes/default/mActionSignPlus.png + themes/default/mActionSignMinus.png themes/default/mActionShowAllLayers.png themes/default/mActionShowBookmarks.png themes/default/mActionShowHideLabels.svg @@ -156,6 +164,7 @@ themes/default/mActionSimplify.png themes/default/mActionSplitFeatures.png themes/default/mActionSplitFeatures.svg + themes/default/mActionSum.png themes/default/mActionTextAnnotation.png themes/default/mActionToggleEditing.png themes/default/mActionUndo.png @@ -172,9 +181,11 @@ themes/default/mIconClose.png themes/default/mIconCollapse.png themes/default/mIconConnect.png + themes/default/mIconClear.png themes/default/mIconDbSchema.png themes/default/mIconDelete.png themes/default/mIconEditable.png + themes/default/mIconEditableEdits.png themes/default/mIconExpand.png themes/default/mIconFavourites.png themes/default/mIconFirst.png @@ -341,6 +352,7 @@ themes/gis/mActionSaveAsPDF.png themes/gis/mActionSaveAsSVG.png themes/gis/mActionSaveEdits.png + themes/gis/mActionSaveAllEdits.png themes/gis/mActionSaveMapAsImage.png themes/gis/mActionScaleBar.png themes/gis/mActionSelectedToTop.png @@ -373,6 +385,7 @@ themes/gis/mActionZoomToSelected.png themes/gis/mIconClose.png themes/gis/mIconEditable.png + themes/gis/mIconEditableEdits.png themes/gis/mIconLineLayer.png themes/gis/mIconPointLayer.png themes/gis/mIconPolygonLayer.png @@ -478,9 +491,15 @@ console/iconQtCoreConsole.png console/iconQtGuiConsole.png console/iconRunConsole.png - console/iconAboutConsole.png + console/iconAboutConsole.png + console/iconCodepadConsole.png + console/imgHelpConsole.png + console/imgHelpMenu.png + console/iconHideToolConsole.png flags/sr_Cyrl.png flags/sr_Latn.png + flags/sw.png + flags/eu_ES.png qgis_tips/symbol_levels.png diff --git a/images/splash/splash.png b/images/splash/splash.png index 3b906be9880e..c55aa270af97 100644 Binary files a/images/splash/splash.png and b/images/splash/splash.png differ diff --git a/images/splash/splash.xcf.bz2 b/images/splash/splash.xcf.bz2 index 52f664910d06..a211da568bb9 100644 Binary files a/images/splash/splash.xcf.bz2 and b/images/splash/splash.xcf.bz2 differ diff --git a/images/themes/default/mActionAdd.png b/images/themes/default/mActionAdd.png new file mode 100644 index 000000000000..f8c09a63cbf3 Binary files /dev/null and b/images/themes/default/mActionAdd.png differ diff --git a/images/themes/default/mActionArrowLeft.png b/images/themes/default/mActionArrowLeft.png new file mode 100644 index 000000000000..4fe46614c703 Binary files /dev/null and b/images/themes/default/mActionArrowLeft.png differ diff --git a/images/themes/default/mActionArrowRight.png b/images/themes/default/mActionArrowRight.png new file mode 100644 index 000000000000..28a25b79711a Binary files /dev/null and b/images/themes/default/mActionArrowRight.png differ diff --git a/images/themes/default/mActionFilter.png b/images/themes/default/mActionFilter.png new file mode 100644 index 000000000000..ee62d49c7e7b Binary files /dev/null and b/images/themes/default/mActionFilter.png differ diff --git a/images/themes/default/mActionRefresh.png b/images/themes/default/mActionRefresh.png new file mode 100644 index 000000000000..d65c0b728b54 Binary files /dev/null and b/images/themes/default/mActionRefresh.png differ diff --git a/images/themes/default/mActionSaveAllEdits.png b/images/themes/default/mActionSaveAllEdits.png new file mode 100644 index 000000000000..cdb65671ee34 Binary files /dev/null and b/images/themes/default/mActionSaveAllEdits.png differ diff --git a/images/themes/default/mActionSignMinus.png b/images/themes/default/mActionSignMinus.png new file mode 100644 index 000000000000..bb16f03f6b6d Binary files /dev/null and b/images/themes/default/mActionSignMinus.png differ diff --git a/images/themes/default/mActionSignPlus.png b/images/themes/default/mActionSignPlus.png new file mode 100644 index 000000000000..e2823bac78a0 Binary files /dev/null and b/images/themes/default/mActionSignPlus.png differ diff --git a/images/themes/default/mActionSum.png b/images/themes/default/mActionSum.png new file mode 100644 index 000000000000..d4764bfc6883 Binary files /dev/null and b/images/themes/default/mActionSum.png differ diff --git a/images/themes/default/mIconClear.png b/images/themes/default/mIconClear.png new file mode 100644 index 000000000000..e6c8e8b9f341 Binary files /dev/null and b/images/themes/default/mIconClear.png differ diff --git a/images/themes/default/mIconEditableEdits.png b/images/themes/default/mIconEditableEdits.png new file mode 100644 index 000000000000..08de7115efc5 Binary files /dev/null and b/images/themes/default/mIconEditableEdits.png differ diff --git a/images/themes/gis/mActionSaveAllEdits.png b/images/themes/gis/mActionSaveAllEdits.png new file mode 100644 index 000000000000..cda3344d543c Binary files /dev/null and b/images/themes/gis/mActionSaveAllEdits.png differ diff --git a/images/themes/gis/mIconEditableEdits.png b/images/themes/gis/mIconEditableEdits.png new file mode 100644 index 000000000000..f694f33e6649 Binary files /dev/null and b/images/themes/gis/mIconEditableEdits.png differ diff --git a/mac/cmake/0qgis.cmake.in b/mac/cmake/0qgis.cmake.in index 1c4e3453a378..ae66f4839618 100644 --- a/mac/cmake/0qgis.cmake.in +++ b/mac/cmake/0qgis.cmake.in @@ -20,5 +20,9 @@ IF (@OSX_HAVE_LOADERPATH@) GET_INSTALL_NAME ("${QFWDIR}/${QL}.framework/${QL}" ${QL}.framework QQ) SET (QFW_CHG "${QQ}") UPDATEQGISPATHS ("${QFW_CHG}" ${QL}) + # change id of the framework + IF (NOT @QGIS_MACAPP_INSTALL_DEV@) + EXECUTE_PROCESS(COMMAND install_name_tool -id "${ATEXECUTABLE}/${QGIS_FW_SUBDIR}/${QL}.framework/${QL}" "${QFWDIR}/${QL}.framework/${QL}") + ENDIF () ENDFOREACH (QL) ENDIF (@OSX_HAVE_LOADERPATH@) diff --git a/ms-windows/osgeo4w/package-nightly.cmd b/ms-windows/osgeo4w/package-nightly.cmd index 08312956dfd3..f5c1f03f9c8d 100644 --- a/ms-windows/osgeo4w/package-nightly.cmd +++ b/ms-windows/osgeo4w/package-nightly.cmd @@ -13,7 +13,7 @@ REM * (at your option) any later version. * REM * * REM *************************************************************************** @echo off -set GRASS_VERSION=6.4.2 +set GRASS_VERSION=6.4.3RC1 set BUILDDIR=%CD%\build REM set BUILDDIR=%TEMP%\qgis_unstable diff --git a/ms-windows/osgeo4w/package.cmd b/ms-windows/osgeo4w/package.cmd index 4c21804a5682..a7e80e0bf583 100644 --- a/ms-windows/osgeo4w/package.cmd +++ b/ms-windows/osgeo4w/package.cmd @@ -13,7 +13,7 @@ REM * (at your option) any later version. * REM * * REM *************************************************************************** @echo off -set GRASS_VERSION=6.4.2 +set GRASS_VERSION=6.4.3RC1 set BUILDDIR=%CD%\build REM set BUILDDIR=%TEMP%\qgis_unstable diff --git a/ms-windows/osgeo4w/postinstall-common.bat b/ms-windows/osgeo4w/postinstall-common.bat index d62113e52dbf..3dd0e971861c 100755 --- a/ms-windows/osgeo4w/postinstall-common.bat +++ b/ms-windows/osgeo4w/postinstall-common.bat @@ -1,4 +1,4 @@ call "%OSGEO4W_ROOT%"\bin\o4w_env.bat path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ -%OSGEO4W_ROOT%\apps\@package@\crssync +"%OSGEO4W_ROOT%"\apps\@package@\crssync diff --git a/ms-windows/osgeo4w/postinstall-dev.bat b/ms-windows/osgeo4w/postinstall-dev.bat index d8d47e0d8369..17a251bdf355 100644 --- a/ms-windows/osgeo4w/postinstall-dev.bat +++ b/ms-windows/osgeo4w/postinstall-dev.bat @@ -18,4 +18,4 @@ set OSGEO4W_ROOT=%O4W_ROOT% call "%OSGEO4W_ROOT%"\bin\o4w_env.bat path %PATH%;%OSGEO4W_ROOT%\apps\@package@\bin set QGIS_PREFIX_PATH=%OSGEO4W_ROOT:\=/%/apps/@package@ -%OSGEO4W_ROOT%\apps\@package@\crssync +"%OSGEO4W_ROOT%"\apps\@package@\crssync diff --git a/ms-windows/osgeo4w/preremove-desktop.bat b/ms-windows/osgeo4w/preremove-desktop.bat index 246ed072ad0c..57c8b1741ef3 100644 --- a/ms-windows/osgeo4w/preremove-desktop.bat +++ b/ms-windows/osgeo4w/preremove-desktop.bat @@ -1,6 +1,6 @@ -del "%OSGEO4W_STARTMENU%\Quantum GIS (@version@).lnk" +del "%OSGEO4W_STARTMENU%\Quantum GIS Desktop (@version@).lnk" del "%OSGEO4W_STARTMENU%\Quantum GIS Browser (@version@).lnk" -del "%ALLUSERSPROFILE%\Desktop\Quantum GIS (@version@).lnk" +del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Desktop (@version@).lnk" del "%ALLUSERSPROFILE%\Desktop\Quantum GIS Browser (@version@).lnk" del "%OSGEO4W_ROOT%"\bin\@package@.bat del "%OSGEO4W_ROOT%"\bin\@package@-browser.bat diff --git a/postinstall/CMakeLists.txt b/postinstall/CMakeLists.txt new file mode 100644 index 000000000000..3b3972aa767f --- /dev/null +++ b/postinstall/CMakeLists.txt @@ -0,0 +1,6 @@ + +# for included scripts that set policies +INSTALL (CODE "cmake_policy(SET CMP0011 NEW)") + +CONFIGURE_FILE("PostInstall.cmake.in" "PostInstall.cmake" @ONLY) +INSTALL(SCRIPT "${CMAKE_BINARY_DIR}/postinstall/PostInstall.cmake") diff --git a/postinstall/PostInstall.cmake.in b/postinstall/PostInstall.cmake.in new file mode 100644 index 000000000000..7d8be5ef1e61 --- /dev/null +++ b/postinstall/PostInstall.cmake.in @@ -0,0 +1,9 @@ + +# kill boolean warnings +CMAKE_POLICY(SET CMP0012 NEW) + +IF(@WITH_PY_COMPILE@) + MESSAGE(STATUS "Byte-compiling core Python utilities and plugins...") + # exclude Python 3 modules in PyQt4.uic package + EXECUTE_PROCESS(COMMAND @PYTHON_EXECUTABLE@ -m compileall -q -x ".*uic.port_v3.*" "@CMAKE_INSTALL_PREFIX@/@QGIS_DATA_DIR@/python") +ENDIF(@WITH_PY_COMPILE@) diff --git a/python/CMakeLists.txt b/python/CMakeLists.txt index b8809519a87e..036fa9e132e3 100644 --- a/python/CMakeLists.txt +++ b/python/CMakeLists.txt @@ -15,36 +15,37 @@ IF (WITH_INTERNAL_SPATIALITE) ENDIF (WITH_INTERNAL_SPATIALITE) SET (QGIS_PYTHON_OUTPUT_DIRECTORY ${PYTHON_OUTPUT_DIRECTORY}/qgis) +FILE (MAKE_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY}) SET (CMAKE_RUNTIME_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY}) SET (CMAKE_LIBRARY_OUTPUT_DIRECTORY ${QGIS_PYTHON_OUTPUT_DIRECTORY}) INCLUDE_DIRECTORIES( - ${PYTHON_INCLUDE_PATH} - ${SIP_INCLUDE_DIR} - ${QT_QTCORE_INCLUDE_DIR} - ${QT_QTGUI_INCLUDE_DIR} - ${QT_QTNETWORK_INCLUDE_DIR} - ${QT_QTSVG_INCLUDE_DIR} - ${QT_QTXML_INCLUDE_DIR} - ${GDAL_INCLUDE_DIR} - ${GEOS_INCLUDE_DIR} - ${QWT_INCLUDE_DIR} - - ../src/core - ../src/core/pal - ../src/core/composer - ../src/core/diagram - ../src/core/gps - ../src/core/gps/qextserialport - ../src/core/raster - ../src/core/renderer - ../src/core/symbology - ../src/core/symbology-ng - - ../src/gui/raster - ../src/gui/attributetable - - ${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h + ${PYTHON_INCLUDE_PATH} + ${SIP_INCLUDE_DIR} + ${QT_QTCORE_INCLUDE_DIR} + ${QT_QTGUI_INCLUDE_DIR} + ${QT_QTNETWORK_INCLUDE_DIR} + ${QT_QTSVG_INCLUDE_DIR} + ${QT_QTXML_INCLUDE_DIR} + ${GDAL_INCLUDE_DIR} + ${GEOS_INCLUDE_DIR} + ${QWT_INCLUDE_DIR} + ${QEXTSERIALPORT_INCLUDE_DIR} + + ../src/core + ../src/core/pal + ../src/core/composer + ../src/core/diagram + ../src/core/gps + ../src/core/raster + ../src/core/renderer + ../src/core/symbology + ../src/core/symbology-ng + + ../src/gui/raster + ../src/gui/attributetable + + ${CMAKE_BINARY_DIR} # qgsconfig.h, qgsversion.h ) IF(NOT WITH_TOUCH) @@ -79,11 +80,11 @@ ADD_SIP_PYTHON_MODULE(qgis.core core/core.sip qgis_core) # additional gui includes INCLUDE_DIRECTORIES( - ../src/gui - ../src/gui/symbology-ng - ../src/plugins - ${CMAKE_BINARY_DIR}/src/gui - ${CMAKE_BINARY_DIR}/src/ui + ../src/gui + ../src/gui/symbology-ng + ../src/plugins + ${CMAKE_BINARY_DIR}/src/gui + ${CMAKE_BINARY_DIR}/src/ui ) # gui module @@ -94,22 +95,22 @@ ADD_SIP_PYTHON_MODULE(qgis.gui gui/gui.sip qgis_core qgis_gui) # additional analysis includes INCLUDE_DIRECTORIES( - ../src/analysis/vector - ../src/analysis/raster - ../src/analysis/network - ../src/analysis/interpolation - ${CMAKE_BINARY_DIR}/src/analysis/vector - ${CMAKE_BINARY_DIR}/src/analysis/network - ${CMAKE_BINARY_DIR}/src/analysis/raster - ${CMAKE_BINARY_DIR}/src/analysis/interpolation + ../src/analysis/vector + ../src/analysis/raster + ../src/analysis/network + ../src/analysis/interpolation + ${CMAKE_BINARY_DIR}/src/analysis/vector + ${CMAKE_BINARY_DIR}/src/analysis/network + ${CMAKE_BINARY_DIR}/src/analysis/raster + ${CMAKE_BINARY_DIR}/src/analysis/interpolation ) # analysis module FILE(GLOB sip_files_analysis - analysis/*.sip - analysis/raster/*.sip - analysis/vector/*.sip - analysis/interpolation/*.sip + analysis/*.sip + analysis/raster/*.sip + analysis/vector/*.sip + analysis/interpolation/*.sip ) SET(SIP_EXTRA_FILES_DEPEND ${sip_files_core} ${sip_files_analysis}) SET(SIP_EXTRA_OPTIONS ${PYQT4_SIP_FLAGS} -o -a ${CMAKE_BINARY_DIR}/python/qgis.analysis.api) @@ -139,33 +140,33 @@ IF(WITH_QSCIAPI) INSTALL(FILES ${QGIS_PYTHON_API_FILE} DESTINATION "${QGIS_DATA_DIR}/python/qsci_apis") ENDIF(WITH_QSCIAPI) -ADD_CUSTOM_TARGET(compile_python_files ALL) +# Plugin utilities files to copy to staging or install +SET(PY_FILES + __init__.py + utils.py +) -ADD_SUBDIRECTORY(console_help) +ADD_CUSTOM_TARGET(pyutils ALL) +INSTALL(FILES ${PY_FILES} DESTINATION "${QGIS_PYTHON_DIR}") -ADD_CUSTOM_COMMAND(TARGET compile_python_files - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E make_directory ${QGIS_PYTHON_OUTPUT_DIRECTORY} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} -) +# stage to output to make available when QGIS is run from build directory +FOREACH(pyfile ${PY_FILES} ${PYUI_FILES}) + ADD_CUSTOM_COMMAND(TARGET pyutils + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${pyfile} + ) +ENDFOREACH(pyfile) + +ADD_SUBDIRECTORY(console) -FILE(GLOB UI_FILES *.ui) -PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES}) -ADD_CUSTOM_TARGET(console ALL DEPENDS ${PYUI_FILES}) -INSTALL(FILES ${PYUI_FILES} DESTINATION ${QGIS_PYTHON_DIR}) - -FOREACH(file __init__.py utils.py console.py console_sci.py console_help.py console_settings.py) - ADD_CUSTOM_COMMAND(TARGET compile_python_files - POST_BUILD - COMMAND ${CMAKE_COMMAND} -E copy ${file} ${QGIS_PYTHON_OUTPUT_DIRECTORY} - WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DEPENDS ${file} +# Byte-compile staged PyQGIS utilities +IF(WITH_PY_COMPILE) + ADD_CUSTOM_TARGET(pycompile_pyutils ALL + COMMAND ${PYTHON_EXECUTABLE} -m compileall -q "${PYTHON_OUTPUT_DIRECTORY}/qgis" + WORKING_DIRECTORY "${CMAKE_BINARY_DIR}" + COMMENT "Byte-compiling staged PyQGIS utility modules..." + DEPENDS pyutils ) -ENDFOREACH(file) - -PYTHON_INSTALL(__init__.py ${QGIS_PYTHON_DIR}) -PYTHON_INSTALL(utils.py ${QGIS_PYTHON_DIR}) -PYTHON_INSTALL(console.py ${QGIS_PYTHON_DIR}) -PYTHON_INSTALL(console_sci.py ${QGIS_PYTHON_DIR}) -PYTHON_INSTALL(console_help.py ${QGIS_PYTHON_DIR}) -PYTHON_INSTALL(console_settings.py ${QGIS_PYTHON_DIR}) +ENDIF(WITH_PY_COMPILE) diff --git a/python/console/CMakeLists.txt b/python/console/CMakeLists.txt new file mode 100644 index 000000000000..352174922f96 --- /dev/null +++ b/python/console/CMakeLists.txt @@ -0,0 +1,30 @@ +ADD_SUBDIRECTORY(console_help) + +SET(PYTHON_OUTPUT_DIRECTORY ${QGIS_OUTPUT_DIRECTORY}/python) +SET(QGIS_PYTHON_DIR ${PYTHON_SITE_PACKAGES_DIR}/qgis) + +# PyQGIS console files to copy to staging or install +SET(PY_CONSOLE_FILES + console.py + console_sci.py + console_help.py + console_settings.py + console_output.py +) + +FILE(GLOB UI_FILES *.ui) +PYQT4_WRAP_UI(PYUI_FILES ${UI_FILES}) # returns absolute paths +ADD_CUSTOM_TARGET(pyconsole ALL DEPENDS ${PYUI_FILES}) + +# stage to output to make available when QGIS is run from build directory +FOREACH(pyfile ${PY_CONSOLE_FILES} ${PYUI_FILES}) + ADD_CUSTOM_COMMAND(TARGET pyconsole + POST_BUILD + COMMAND ${CMAKE_COMMAND} -E copy ${pyfile} "${QGIS_PYTHON_OUTPUT_DIRECTORY}" + WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} + DEPENDS ${pyfile} + ) +ENDFOREACH(pyfile) + +INSTALL(FILES ${PY_CONSOLE_FILES} ${PYUI_FILES} DESTINATION "${QGIS_PYTHON_DIR}") + diff --git a/python/console.py b/python/console/console.py similarity index 87% rename from python/console.py rename to python/console/console.py index 94f2eb1c7add..80247350121c 100755 --- a/python/console.py +++ b/python/console/console.py @@ -23,6 +23,7 @@ from PyQt4.QtGui import * from qgis.utils import iface from console_sci import PythonEdit +from console_output import EditorOutput from console_help import HelpDialog from console_settings import optionsDialog @@ -58,26 +59,12 @@ def console_displayhook(obj): global _console_output _console_output = obj -class QgisOutputCatcher: - def __init__(self): - self.data = '' - def write(self, stuff): - self.data += stuff - def get_and_clean_data(self): - tmp = self.data - self.data = '' - return tmp - def flush(self): - pass - -sys.stdout = QgisOutputCatcher() - class PythonConsole(QDockWidget): def __init__(self, parent=None): QDockWidget.__init__(self, parent) self.setObjectName("PythonConsole") self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console")) - #self.setAllowedAreas(Qt.BottomDockWidgetArea) + #self.setAllowedAreas(Qt.BottomDockWidgetArea) self.console = PythonConsoleWidget(self) self.setWidget( self.console ) @@ -92,18 +79,27 @@ def activate(self): self.raise_() QDockWidget.setFocus(self) + def closeEvent(self, event): + self.console.edit.writeHistoryFile() + QWidget.closeEvent(self, event) class PythonConsoleWidget(QWidget): def __init__(self, parent=None): QWidget.__init__(self, parent) self.setWindowTitle(QCoreApplication.translate("PythonConsole", "Python Console")) - self.widgetButton = QWidget() + #self.widgetEditors = QWidget() + self.options = optionsDialog(self) - + self.helpDlg = HelpDialog(self) + + self.splitter = QSplitter(self) + self.splitter.setOrientation(Qt.Vertical) + self.splitter.setHandleWidth(3) + self.splitter.setChildrenCollapsible(False) + self.toolBar = QToolBar() self.toolBar.setEnabled(True) - #self.toolBar.setFont(font) self.toolBar.setFocusPolicy(Qt.NoFocus) self.toolBar.setContextMenuPolicy(Qt.DefaultContextMenu) self.toolBar.setLayoutDirection(Qt.LeftToRight) @@ -111,16 +107,14 @@ def __init__(self, parent=None): self.toolBar.setOrientation(Qt.Vertical) self.toolBar.setMovable(True) self.toolBar.setFloatable(True) - #self.toolBar.setAllowedAreas(Qt.LeftToolBarArea) - #self.toolBar.setAllowedAreas(Qt.RightToolBarArea) - #self.toolBar.setObjectName(_fromUtf8("toolMappa")) - self.b = QVBoxLayout(self.widgetButton) - self.e = QHBoxLayout(self) + self.b = QGridLayout(self.widgetButton) + self.f = QGridLayout(self) - self.e.setMargin(0) - self.e.setSpacing(0) + self.f.setMargin(0) + self.f.setSpacing(0) self.b.setMargin(0) + self.b.setSpacing(0) ## Action for Clear button clearBt = QCoreApplication.translate("PythonConsole", "Clear console") @@ -267,13 +261,36 @@ def __init__(self, parent=None): sM.setPopupMode(QToolButton.InstantPopup) self.b.addWidget(self.toolBar) - self.edit = PythonEdit() - self.setFocusProxy( self.edit ) + self.edit = PythonEdit(self) + self.textEditOut = EditorOutput(self) + + self.setFocusProxy(self.edit) + + sizePolicy = QSizePolicy(QSizePolicy.Fixed, QSizePolicy.Preferred) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.widgetButton.sizePolicy().hasHeightForWidth()) + self.widgetButton.setSizePolicy(sizePolicy) + + self.splitter.addWidget(self.textEditOut) + self.splitter.addWidget(self.edit) - self.e.addWidget(self.widgetButton) - self.e.addWidget(self.edit) - - self.clearButton.triggered.connect(self.edit.clearConsole) + sizes = self.splitter.sizes() + self.splitter.setSizes(sizes) + + self.f.addWidget(self.widgetButton, 0, 0) + self.f.addWidget(self.splitter, 0, 1) + + sizePolicy = QSizePolicy(QSizePolicy.Expanding, QSizePolicy.Expanding) + sizePolicy.setHorizontalStretch(0) + sizePolicy.setVerticalStretch(0) + sizePolicy.setHeightForWidth(self.textEditOut.sizePolicy().hasHeightForWidth()) + self.textEditOut.setSizePolicy(sizePolicy) + + self.textEditOut.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded) + self.edit.setVerticalScrollBarPolicy(Qt.ScrollBarAsNeeded) + + self.clearButton.triggered.connect(self.textEditOut.clearConsole) self.optionsButton.triggered.connect(self.openSettings) self.loadIfaceButton.triggered.connect(self.iface) self.loadSextanteButton.triggered.connect(self.sextante) @@ -283,7 +300,7 @@ def __init__(self, parent=None): self.openFileButton.triggered.connect(self.openScriptFile) self.saveFileButton.triggered.connect(self.saveScriptFile) self.helpButton.triggered.connect(self.openHelp) - QObject.connect(self.options.buttonBox, SIGNAL("accepted()"), + QObject.connect(self.options.buttonBox, SIGNAL("accepted()"), self.prefChanged) def sextante(self): @@ -291,10 +308,10 @@ def sextante(self): def iface(self): self.edit.commandConsole('iface') - + def qtCore(self): self.edit.commandConsole('qtCore') - + def qtGui(self): self.edit.commandConsole('qtGui') @@ -326,7 +343,7 @@ def saveScriptFile(self): if not filename.endswith(".py"): fName += ".py" sF = open(fName,'w') - listText = self.edit.getTextFromEditor() + listText = self.textEditOut.getTextFromEditor() is_first_line = True for s in listText: if s[0:3] in (">>>", "..."): @@ -339,19 +356,15 @@ def saveScriptFile(self): sF.close() def openHelp(self): - dlg = HelpDialog() - dlg.exec_() - + self.helpDlg.show() + self.helpDlg.activateWindow() + def openSettings(self): - #options = optionsDialog() self.options.exec_() - + def prefChanged(self): self.edit.refreshLexerProperties() - - def closeEvent(self, event): - self.edit.writeHistoryFile() - QWidget.closeEvent(self, event) + self.textEditOut.refreshLexerProperties() if __name__ == '__main__': a = QApplication(sys.argv) diff --git a/python/console_help.py b/python/console/console_help.py similarity index 56% rename from python/console_help.py rename to python/console/console_help.py index b44d489339b0..93f677c5df6a 100644 --- a/python/console_help.py +++ b/python/console/console_help.py @@ -23,52 +23,32 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -from PyQt4 import QtCore, QtGui, QtWebKit from PyQt4.QtCore import * from PyQt4.QtGui import * +from ui_console_help import Ui_Help from qgis.core import QgsApplication import os -class HelpDialog(QtGui.QDialog): +class HelpDialog(QDialog, Ui_Help): + def __init__(self, parent): + QDialog.__init__(self, parent) + self.setupUi(self) - def __init__(self): - QtGui.QDialog.__init__(self) - self.setModal(True) - self.setupUi() - - def setupUi(self): - self.setMaximumSize(500, 300) - self.webView = QtWebKit.QWebView() self.setWindowTitle(QCoreApplication.translate("PythonConsole","Help Python Console")) - self.verticalLayout= QtGui.QVBoxLayout() - self.verticalLayout.setSpacing(2) - self.verticalLayout.setMargin(0) - self.verticalLayout.addWidget(self.webView) - self.closeButton = QtGui.QPushButton() - self.closeButton.setText("Close") - self.closeButton.setMaximumWidth(150) - self.horizontalLayout= QtGui.QHBoxLayout() - self.horizontalLayout.setSpacing(2) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.addStretch(1000) - self.horizontalLayout.addWidget(self.closeButton) - QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), self.closeWindow) - self.verticalLayout.addLayout(self.horizontalLayout) - self.setLayout(self.verticalLayout) + self.setMaximumSize(530, 300) + qgisDataDir = QgsApplication.pkgDataPath() - listFile = os.listdir(qgisDataDir + "/python/console_help/i18n") + listFile = os.listdir(qgisDataDir + "/python/console/console_help/i18n") localeFullName = QSettings().value( "locale/userLocale", QVariant( "" ) ).toString() + locale = "en_US" for i in listFile: lang = i[0:5] if localeFullName in (lang[0:2], lang): locale = lang - - filename = qgisDataDir + "/python/console_help/help.htm? \ + + filename = qgisDataDir + "/python/console/console_help/help.htm? \ lang=" + locale \ + "&pkgDir=" + qgisDataDir - - url = QtCore.QUrl(filename) - self.webView.load(url) - def closeWindow(self): - self.close() + url = QUrl(filename) + self.webView.load(url) diff --git a/python/console/console_help.ui b/python/console/console_help.ui new file mode 100644 index 000000000000..7562bd58b729 --- /dev/null +++ b/python/console/console_help.ui @@ -0,0 +1,82 @@ + + + Help + + + + 0 + 0 + 555 + 363 + + + + Dialog + + + false + + + + 2 + + + 2 + + + 2 + + + 4 + + + 6 + + + + + + about:blank + + + + + + + + Qt::Horizontal + + + QDialogButtonBox::Close + + + + + + + + QWebView + QWidget +
QtWebKit/QWebView
+ + + + + + buttonBox + rejected() + Help + reject() + + + 259 + 310 + + + 259 + 163 + + + + + diff --git a/python/console_help/CMakeLists.txt b/python/console/console_help/CMakeLists.txt similarity index 80% rename from python/console_help/CMakeLists.txt rename to python/console/console_help/CMakeLists.txt index bc2108be2915..1ef6389cffee 100644 --- a/python/console_help/CMakeLists.txt +++ b/python/console/console_help/CMakeLists.txt @@ -2,6 +2,6 @@ FILE(GLOB HTML_FILES *.htm) FILE(GLOB I18N_FILES i18n/*.properties) FILE(GLOB JS_FILES js/*.js) -INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console_help) -INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console_help/i18n) -INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console_help/js) +INSTALL(FILES ${HTML_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help) +INSTALL(FILES ${I18N_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help/i18n) +INSTALL(FILES ${JS_FILES} DESTINATION ${QGIS_DATA_DIR}/python/console/console_help/js) diff --git a/python/console_help/help.htm b/python/console/console_help/help.htm similarity index 73% rename from python/console_help/help.htm rename to python/console/console_help/help.htm index 993eada7eb65..a242176b18a7 100644 --- a/python/console_help/help.htm +++ b/python/console/console_help/help.htm @@ -1,5 +1,5 @@ - - + + Help Python Console @@ -8,18 +8,29 @@ @@ -29,22 +40,45 @@ -

Python Console for QGIS

+ Python Console for QGIS + + + + + + + + + + +
+

+ Python Console based on PyQScintilla2. +

+ To access Quantum GIS environment from this console + use qgis.utils.iface object (instance of QgisInterface class). + To import the class QgisInterface can also use the dedicated + button on the toolbar on the left. +

+
+

+ The console is splitted in two main panes, output and input areas. + Both are resizable by using the horizontal splitter. + Output area pane is a widget read-only which shows the commands output. + You can drag and drop or copy text into input area (no matter if selected text contains >>> or ...). + Use 'Share on codepad' from contextual menu for sharing snippets code. + The context menu looks like the image below.

+
+ Input area pane is the interactive python shell for input commands. +

+
-

- Python Console based on PyQScintilla2. -

- To access Quantum GIS environment from this console - use qgis.utils.iface object (instance of QgisInterface class). - To import the class QgisInterface can also use the dedicated - button on the toolbar on the left. -

@@ -86,7 +120,7 @@

Features

@@ -139,17 +173,6 @@

Toolbar

Run command (like Enter key pressed) -
- - - - - -

- Thanks to Larry Shaffer who provided the API files. -

- - - - - - - -
-

Navigation

- -
- -
-
-
-
- -
-

Configuring external applications

-
-

Introduction

-

SEXTANTE can be extended using additional applications, calling them -from within SEXTANTE. Currently, SAGA, GRASS, OTB(Orfeo Toolbox) and R are supported, along -with some other command-line applications that provide spatial data -analysis functionalities. -This chapter will show you how to configure SEXTANTE to include these -additional applications. Once you have correctly configured the system, -you will be able to execute external algorithms from any SEXTANTE -component like the toolbox or the graphical modeler, just like you do -with any other SEXTANTE geoalgorithm.

-
-

A note on file formats

-

When using an external software, opening a file in QGIS does not mean -that it can be opened and processed as well on that other software. In -most cases, it can read what you have opened in QGIS, but in some cases, -that might not be the case. When using databases or uncommon file -formats, whether for raster of vector layers, problems might arise. If -that happens, try to use well known file formats that you are sure that -are understood by both programs, and check to console output (in the -history and log dialog) for knowing more about what is going wrong.

-

Using GRASS raster layers is, for instance, one case in which you might -have trouble and not be able to complete your work if you call an -external algorithm using such a layer as input. For this reason, these -layers will not appear as available to SEXTANTE algorithms (We are -currently working on solving this, and expect to have it ready soon).

-

You should, however, find no problems at all with vector layers, since -SEXTANTE automatically converts from the original file format to one -accepted by the external application before passing the layer to it. -This adds an extra processing time, which might be significant if the -layer has a large size, so do not be surprised if it takes more to -process a layer from a DB connection that one of a similar size stored -in a shapefile.

-

Providers not using external applications can process any layer that you -can open in QGIS, since they open it for analysis trough QGIS.

-

Regarding output formats, raster layers can be saved as TIFF (.tif) -files, while vector layers are saved as shapefiles (.shp). These have -been chosen as the lingua franca between supported third party -applications and QGIS. If the output filename that you select is not one -of the above, it will be modified, adding the corresponding suffix, and -the default file format will be used.

-

In the case of GDAL, the number of supported output formats is larger. -When you open the file selection dialog, you will see that you have more -formats (and their corresponding extensions available). For more -information about which formats are supported, check the GDAL -documentation.

-
-
-

A note on vector layer selections

-

By default, when an external algorithm takes a vector layer, it will use -all its features, even if a selection exist in QGIS. You can make an -external algorithm aware of that selection by checking the Use selected -features in external applications item in the General settings group. -When you do so, each time you execute an external algorithm that uses a -vector layer, the selected features of that layer will be exported to a -new layer, and the algorithm will work with that new layer instead.

-

Notice that if you select this option, a layer with no selection will -behave like a layer with all its features selected, not like an empty -layer.

-
-
-
-

SAGA

-

SAGA algorithms can be run from SEXTANTE if you have SAGA installed in -your system and you configure SEXTANTE properly so it can find SAGA -executables. In particular, the SAGA command–line executable is needed -to run SAGA algorithms. SAGA binaries are not included with SEXTANTE, so -you have to download and install the software yourself. Please check the -SAGA website at for more information. SAGA 2.0.8 is needed.

-

Once SAGA is installed, and if you are running Windows, open the -SEXTANTE configuration dialog. In the SAGA block you will find a -setting named SAGA Folder. Enter the path to the folder where SAGA is -installed. Close the configuration dialog and now you are ready to run -SAGA algorithms from SEXTANTE.

-

In case you are using Linux, there is no need to configure that, and you -will not see those folders. Instead, you must make sure that SAGA is -properly installed and its folder is added to the PATH environment -variable. Just open a console and type saga_cmd to check that the -system can found where SAGA binaries are located.

-

Notice that, ever before doing that, SAGA algorithms are shown in the -toolbox and you can open them to fill the corresponding parameters -dialog. However, if you try to run the algorithm after entering the -parameter values, SEXTANTE will show an error message. This is because -the algorithm descriptions (needed to create the parameters dialog and -give SEXTANTE the information it needs about the algorithm) are not -included with SAGA, but with SEXTANTE instead. That is, they are part of -SEXTANTE, so you have them in your installation even if you have not -installed SEXTANTE. Running the algorithm, however, needs SAGA binaries -installed in your system.

-
-

About SAGA grid system limitations

-

Most of SAGA algorithms that require several input raster layers, -require them to have the same grid system. That is, to cover the same -geographic area and have the same cellsize, so their corresponding grids -match. When calling SAGA algorithms from SEXTANTE, you can use any -layer, regardless of its cellsize and extent. When multiple raster layers -are used as input for a SAGA algorithm, SEXTANTE resamples them to a -common grid system and then passes them to SAGA (unless the SAGA -algorithm can operate with layers from different grid systems).

-

The definition of that common grid system is controlled by the user, and -you will find several parameters in the SAGA group of the setting window -to do so. There are two ways of setting the target grid system:

-
    -

  • Setting it manually

    -

    . You define the extent setting the values of the following -parameters:

    -
      -
    • Resampling min X
      • -
    • Resampling max X
      • -
    • Resampling min Y
      • -
    • Resampling max Y
      • -
    • Resampling cellsize
      • -
    -

    Notice that SEXTANTE will resample input layers to that extent, even -if they do not overlap with it.

    -
    • -

  • Setting it automatically from input layers. To select this option, -just check the ’’Use min covering grid system for resampling’’ -option. All the other settings will be ignored and the minimum extent -that covers all the input layers will be used. The cellsize of the -target layer is the maximum of all cellsizes of the input layers.

    -
    • -
-

For algorithms that do not use multiple raster layers, or for those that -do not need a unique input grid system, no resampling is performed -before calling SAGA, and those parameters are not used.

-
-
-
-

R. Creating R scripts

-

R integration in SEXTANTE is different from that of SAGA in that there -is not a predefined set of algorithms you can run (except for a few -examples). Instead, you should write your scripts and call R commands, -much like you would do from R, and in a very similar manner to what we -saw in the chapter dedicated to SEXTANTE scripts. This chapter shows you -the syntax to use to call those R commands from SEXTANTE and how to use -SEXTANTE objects (layers, tables) in them.

-

The first thing you have to do, as we saw in the case of SAGA, is to -tell SEXTANTE where you R binaries are located. You can do so using the -R folder entry in the SEXTANTE configuration dialog. Once you have set -that parameter, you can start creating your own R scripts and executing -them.

-

Once again, this is different in Linux, and you just have to make sure -that the R folder is included in the PATH environment variable. If you -can start R just typing R in a console, then you are ready to go.

-

To add a new algorithm that calls an R function (or a more complex R -script that you have developed and you would like to have available from -SEXTANTE), you have to create a script file that tells SEXTANTE how to -perform that operation and the corresponding R commands to do so.

-

Script files have the extension rsx and creating them is pretty easy -if you just have a basic knowledge of R syntax and R scripting. They -should be stored in the R scripts folder. You can set this folder in the -R settings group (available from the SEXTANTE settings dialog), just -like you do with the folder for regular SEXTANTE scripts.

-

Let’s have a look at a very simple file script file, which calls the R -method spsample to create a random grid within the boundary of the -polygons in a given polygon layer. This method belong to the -maptools package. Since almost all the algorithms that you might -like to incorporate into SEXTANTE will use or generate spatial data, -knowledge of spatial packages like maptools and, specially, sp, -is mandatory.

-
##polyg=vector
-##numpoints=number 10
-##output=output vector
-##sp=group
-pts=spsample(polyg,numpoints,type="random")
-output=SpatialPointsDataFrame(pts, as.data.frame(pts))
-
-

The first lines, which start with a double Python comment sign (##), -tell SEXTANTE the inputs of the algorithm described in the file and the -outputs that it will generate. They work exactly with the same syntax as -the SEXTANTE scripts that we have already seen, so they will not be -described here again. Check the corresponding section for more -information.

-

When you declare an input parameter, SEXTANTE uses that information for -two things: creating the user interface to ask the user for the value of -that parameter and creating a corresponding R variable that can be later -used as input for R commands

-

In the above example, we are declaring an input of type -vector named polyg. When executing the algorithm, -SEXTANTE will open in R the layer selected by the user and store it in a -variable also named polyg. So the name of a parameter is also the -name of the variable that we can use in R for accessing the value of that -parameter (thus, you should avoid using reserved R words as parameter -names).

-

Spatial elements such as vector and raster layers are read using the -readOGR() and readGDAL() commands (you do not have to worry -about adding those commands to your description file, SEXTANTE will do -it) and stored as Spatial*DataFrame objects. Table fields are stored -as strings containing the name of the selected field.

-

Tables are opened using the read.csv() command. If a table entered -by the user is not in CSV format, it will be converted prior to -importing it in R.

-

Knowing that, we can now understand the first line of our example script -(the first line not starting with a Python comment).

-
pts=spsample(polyg,numpoints,type="random")
-
-
-

The variable polygon already contains a SpatialPolygonsDataFrame -object, so it can be used to call the spsample method, just like the -numpoints one, which indicates the number of points to add to the -created sample grid.

-

Since we have declared an output of type vector named out, we have -to create a variable named out and store a Spatial*DataFrame -object in it (in this case, a SpatialPointsDataFrame). You can use -any name for your intermediate variables. Just make sure that the -variable storing your final result has the same name that you used to -declare it, and contains a suitable value.

-

In this case, the result obtained from the spsample method has to be -converted explicitly into a SpatialPointsDataFrame object, since it -is itself an object of class ppp, which is not a suitable class to -be retuned to SEXTANTE.

-

If you algorithm does not generate any layer, but a text result in the -console instead, you have to tell SEXTANTE that you want the console to -be shown once the execution is finished. To do so, just start the -command lines that produce the results you want to print with the -“ ->” sign. The output of all other lines will not be shown. For -instance, here is the description file of an algorithms that performs a -normality test on a given field (column) of the attributes of a vector -layer:

-
##layer=vector
-##field=field layer
-##nortest=group
-library(nortest)
->lillie.test(layer[[field]])
-
-

The output ot the last line is printed, but the output of the first is -not (and neither are the outputs from other command lines added -automatically by SEXTANTE).

-

If your algorithm creates any kind of graphics (using the plot() -method), add the following line:

-
##showplots
-
-
-

This will cause SEXTANTE to redirect all R graphical outputs to a -temporary file, which will be later opened once R execution has finished

-

Both graphics and console results will be shown in the SEXTANTE results -manager.

-

For more information, please check the script files provided with -SEXTANTE. Most of them are rather simple and will greatly help you -understand how to create your own ones.

-

A note about libraries: rgdal and maptools libraries are loaded -by default so you do not have to add the corresponding library() -commands (you have to make sure, however, that those two packages are -installed in your R distribution). However, other additional libraries -that you might need have to be explicitly loaded. Just add the necessary -commands at the beginning of your script. You also have to make sure -that the corresponding packages are installed in the R distribution used -by SEXTANTE.

-
-
-

GRASS

-

Configuring GRASS is not much different from configuring SAGA. First, -the path to the GRASS folder has to be defined, but only if you are -running Windows. Additionally, a shell interpreter (usually msys.exe, -which can be found in most GRASS for Windows distributions) has to be -defined and its path set up as well.

-

By default, SEXTANTE tries to configure its GRASS connector to use the GRASS distribution that ships along with QGIS. This should work without problems in most systems, but if you experience problems, you might have to do it manually. Also, if you want to use a different GRASS version, you can change that setting and point to the folder where that other version is kept. GRASS 6.4 is needed for algorithms to work correctly.

-

If you are running Linux, you just -have to make sure that GRASS is correctly installed, and that it can be -run without problem from a console.

-

GRASS algorithms use a region for calculations. This region can be -defined manually using values similar to the ones found in the SAGA -configuration, or automatically, taking the minimum extent that covers -all the input layers used to execute the algorithm each time. If this is -the behaviour you prefer, just check the Use min covering region -option in the GRASS configuration parameters.

-

GRASS includes help files describing each algorithm. If you set the -GRASS help folder parameter, SEXTANTE will open them when you use the -Show help button from the parameters window of the algorithm.

-

The last parameter that has to be configured is related to the mapset. A -mapset is needed to run GRASS, and SEXTANTE creates a temporary one for -each execution. You have to tell SEXTANTE if the data you are working -with uses geographical (lat/lon) coordinates or projected ones.

-
-
-

GDAL

-

No additional configuration is needed to run GDAL algorithms, since it is already incorporated to QGIS and SEXTANTE can infere its configuration from it.

-
-
-

OTB

-

[to be written]

-
-
- - -
-
-
-
-
-

Table Of Contents

- - -

Previous topic

-

The SEXTANTE history manager

-

This Page

- - - -
-
-
-
-
-

Navigation

- -
-
- © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
- - diff --git a/python/plugins/sextante/help/CMakeLists.txt b/python/plugins/sextante/help/CMakeLists.txt deleted file mode 100644 index 50753a9705ce..000000000000 --- a/python/plugins/sextante/help/CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ -FILE(GLOB HTML_FILES *.html) -FILE(GLOB OTHER_FILES *.js) -FILE(GLOB IMAGE_FILES _images/*.*) -FILE(GLOB STATIC_FILES _static/*.*) - -INSTALL(FILES ${HTML_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help) -INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help) -INSTALL(FILES ${IMAGE_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help/_images) -INSTALL(FILES ${STATIC_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/help/_static) diff --git a/python/plugins/sextante/help/_images/batch_processing.png b/python/plugins/sextante/help/_images/batch_processing.png deleted file mode 100644 index 4894f6ef3b64..000000000000 Binary files a/python/plugins/sextante/help/_images/batch_processing.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/batch_processing_filepath.png b/python/plugins/sextante/help/_images/batch_processing_filepath.png deleted file mode 100644 index eb4724d307e1..000000000000 Binary files a/python/plugins/sextante/help/_images/batch_processing_filepath.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/batch_processing_right_click.png b/python/plugins/sextante/help/_images/batch_processing_right_click.png deleted file mode 100644 index 7a3578f02a7d..000000000000 Binary files a/python/plugins/sextante/help/_images/batch_processing_right_click.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/batch_processing_save.png b/python/plugins/sextante/help/_images/batch_processing_save.png deleted file mode 100644 index 4bb05a72fbff..000000000000 Binary files a/python/plugins/sextante/help/_images/batch_processing_save.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/cannot_delete_alg.png b/python/plugins/sextante/help/_images/cannot_delete_alg.png deleted file mode 100644 index d445c0a80e1b..000000000000 Binary files a/python/plugins/sextante/help/_images/cannot_delete_alg.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/deactivated.png b/python/plugins/sextante/help/_images/deactivated.png deleted file mode 100644 index 5b552fa26be1..000000000000 Binary files a/python/plugins/sextante/help/_images/deactivated.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/extent.png b/python/plugins/sextante/help/_images/extent.png deleted file mode 100644 index 3a0aecce4207..000000000000 Binary files a/python/plugins/sextante/help/_images/extent.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/extent_drag.png b/python/plugins/sextante/help/_images/extent_drag.png deleted file mode 100644 index 4ac89142f43b..000000000000 Binary files a/python/plugins/sextante/help/_images/extent_drag.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/extent_list.png b/python/plugins/sextante/help/_images/extent_list.png deleted file mode 100644 index e50b0202b1f6..000000000000 Binary files a/python/plugins/sextante/help/_images/extent_list.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/fixed_table.png b/python/plugins/sextante/help/_images/fixed_table.png deleted file mode 100644 index 2f2e51edca24..000000000000 Binary files a/python/plugins/sextante/help/_images/fixed_table.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/help_edition.png b/python/plugins/sextante/help/_images/help_edition.png deleted file mode 100644 index 4c69a36d1f8a..000000000000 Binary files a/python/plugins/sextante/help/_images/help_edition.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/history.png b/python/plugins/sextante/help/_images/history.png deleted file mode 100644 index 3513713eb964..000000000000 Binary files a/python/plugins/sextante/help/_images/history.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/modeler_canvas.png b/python/plugins/sextante/help/_images/modeler_canvas.png deleted file mode 100644 index 310263d7f111..000000000000 Binary files a/python/plugins/sextante/help/_images/modeler_canvas.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/modeler_right_click.png b/python/plugins/sextante/help/_images/modeler_right_click.png deleted file mode 100644 index 1e3baa944363..000000000000 Binary files a/python/plugins/sextante/help/_images/modeler_right_click.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/models.png b/python/plugins/sextante/help/_images/models.png deleted file mode 100644 index aa35dc8beb46..000000000000 Binary files a/python/plugins/sextante/help/_images/models.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/models_parameters.png b/python/plugins/sextante/help/_images/models_parameters.png deleted file mode 100644 index f0a205d7b074..000000000000 Binary files a/python/plugins/sextante/help/_images/models_parameters.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/models_parameters2.png b/python/plugins/sextante/help/_images/models_parameters2.png deleted file mode 100644 index 39e25053d84c..000000000000 Binary files a/python/plugins/sextante/help/_images/models_parameters2.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/models_parameters3.png b/python/plugins/sextante/help/_images/models_parameters3.png deleted file mode 100644 index e5077cbbb66a..000000000000 Binary files a/python/plugins/sextante/help/_images/models_parameters3.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/models_parameters4.png b/python/plugins/sextante/help/_images/models_parameters4.png deleted file mode 100644 index a0cfb76bd3c0..000000000000 Binary files a/python/plugins/sextante/help/_images/models_parameters4.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/models_parameters5.png b/python/plugins/sextante/help/_images/models_parameters5.png deleted file mode 100644 index edad0a769e57..000000000000 Binary files a/python/plugins/sextante/help/_images/models_parameters5.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/multiple_selection.png b/python/plugins/sextante/help/_images/multiple_selection.png deleted file mode 100644 index 95738d38322b..000000000000 Binary files a/python/plugins/sextante/help/_images/multiple_selection.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/number_selector.png b/python/plugins/sextante/help/_images/number_selector.png deleted file mode 100644 index 575f42b449f1..000000000000 Binary files a/python/plugins/sextante/help/_images/number_selector.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/parameters_dialog.png b/python/plugins/sextante/help/_images/parameters_dialog.png deleted file mode 100644 index 0947c67487b4..000000000000 Binary files a/python/plugins/sextante/help/_images/parameters_dialog.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/rendering_styles.png b/python/plugins/sextante/help/_images/rendering_styles.png deleted file mode 100644 index d9c01a4e7da5..000000000000 Binary files a/python/plugins/sextante/help/_images/rendering_styles.png and /dev/null differ diff --git a/python/plugins/sextante/help/_images/toolbox.png b/python/plugins/sextante/help/_images/toolbox.png deleted file mode 100644 index a23e1e302568..000000000000 Binary files a/python/plugins/sextante/help/_images/toolbox.png and /dev/null differ diff --git a/python/plugins/sextante/help/_sources/3rdParty.txt b/python/plugins/sextante/help/_sources/3rdParty.txt deleted file mode 100644 index 9e4a0fdcc9f0..000000000000 --- a/python/plugins/sextante/help/_sources/3rdParty.txt +++ /dev/null @@ -1,342 +0,0 @@ -Configuring external applications -================================= - -Introduction ------------- - -SEXTANTE can be extended using additional applications, calling them -from within SEXTANTE. Currently, SAGA, GRASS, OTB(Orfeo Toolbox) and R are supported, along -with some other command-line applications that provide spatial data -analysis functionalities. -This chapter will show you how to configure SEXTANTE to include these -additional applications. Once you have correctly configured the system, -you will be able to execute external algorithms from any SEXTANTE -component like the toolbox or the graphical modeler, just like you do -with any other SEXTANTE geoalgorithm. - -A note on file formats -~~~~~~~~~~~~~~~~~~~~~~ - -When using an external software, opening a file in QGIS does not mean -that it can be opened and processed as well on that other software. In -most cases, it can read what you have opened in QGIS, but in some cases, -that might not be the case. When using databases or uncommon file -formats, whether for raster of vector layers, problems might arise. If -that happens, try to use well known file formats that you are sure that -are understood by both programs, and check to console output (in the -history and log dialog) for knowing more about what is going wrong. - -Using GRASS raster layers is, for instance, one case in which you might -have trouble and not be able to complete your work if you call an -external algorithm using such a layer as input. For this reason, these -layers will not appear as available to SEXTANTE algorithms (We are -currently working on solving this, and expect to have it ready soon). - -You should, however, find no problems at all with vector layers, since -SEXTANTE automatically converts from the original file format to one -accepted by the external application before passing the layer to it. -This adds an extra processing time, which might be significant if the -layer has a large size, so do not be surprised if it takes more to -process a layer from a DB connection that one of a similar size stored -in a shapefile. - -Providers not using external applications can process any layer that you -can open in QGIS, since they open it for analysis trough QGIS. - -Regarding output formats, raster layers can be saved as TIFF (.tif) -files, while vector layers are saved as shapefiles (.shp). These have -been chosen as the *lingua franca* between supported third party -applications and QGIS. If the output filename that you select is not one -of the above, it will be modified, adding the corresponding suffix, and -the default file format will be used. - -In the case of GDAL, the number of supported output formats is larger. -When you open the file selection dialog, you will see that you have more -formats (and their corresponding extensions available). For more -information about which formats are supported, check the GDAL -documentation. - -A note on vector layer selections -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -By default, when an external algorithm takes a vector layer, it will use -all its features, even if a selection exist in QGIS. You can make an -external algorithm aware of that selection by checking the *Use selected -features in external applications* item in the *General* settings group. -When you do so, each time you execute an external algorithm that uses a -vector layer, the selected features of that layer will be exported to a -new layer, and the algorithm will work with that new layer instead. - -Notice that if you select this option, a layer with no selection will -behave like a layer with all its features selected, not like an empty -layer. - -SAGA ----- - -SAGA algorithms can be run from SEXTANTE if you have SAGA installed in -your system and you configure SEXTANTE properly so it can find SAGA -executables. In particular, the SAGA command–line executable is needed -to run SAGA algorithms. SAGA binaries are not included with SEXTANTE, so -you have to download and install the software yourself. Please check the -SAGA website at for more information. SAGA 2.0.8 is needed. - -Once SAGA is installed, and if you are running Windows, open the -SEXTANTE configuration dialog. In the *SAGA* block you will find a -setting named *SAGA Folder*. Enter the path to the folder where SAGA is -installed. Close the configuration dialog and now you are ready to run -SAGA algorithms from SEXTANTE. - -In case you are using Linux, there is no need to configure that, and you -will not see those folders. Instead, you must make sure that SAGA is -properly installed and its folder is added to the PATH environment -variable. Just open a console and type ``saga_cmd`` to check that the -system can found where SAGA binaries are located. - -Notice that, ever before doing that, SAGA algorithms are shown in the -toolbox and you can open them to fill the corresponding parameters -dialog. However, if you try to run the algorithm after entering the -parameter values, SEXTANTE will show an error message. This is because -the algorithm descriptions (needed to create the parameters dialog and -give SEXTANTE the information it needs about the algorithm) are not -included with SAGA, but with SEXTANTE instead. That is, they are part of -SEXTANTE, so you have them in your installation even if you have not -installed SEXTANTE. Running the algorithm, however, needs SAGA binaries -installed in your system. - -About SAGA grid system limitations -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Most of SAGA algorithms that require several input raster layers, -require them to have the same grid system. That is, to cover the same -geographic area and have the same cellsize, so their corresponding grids -match. When calling SAGA algorithms from SEXTANTE, you can use any -layer, regardless of its cellsize and extent. When multiple raster layers -are used as input for a SAGA algorithm, SEXTANTE resamples them to a -common grid system and then passes them to SAGA (unless the SAGA -algorithm can operate with layers from different grid systems). - -The definition of that common grid system is controlled by the user, and -you will find several parameters in the SAGA group of the setting window -to do so. There are two ways of setting the target grid system: - -- Setting it manually - - . You define the extent setting the values of the following - parameters: - - - Resampling min X - - - Resampling max X - - - Resampling min Y - - - Resampling max Y - - - Resampling cellsize - - Notice that SEXTANTE will resample input layers to that extent, even - if they do not overlap with it. - -- Setting it automatically from input layers. To select this option, - just check the ’’Use min covering grid system for resampling’’ - option. All the other settings will be ignored and the minimum extent - that covers all the input layers will be used. The cellsize of the - target layer is the maximum of all cellsizes of the input layers. - -For algorithms that do not use multiple raster layers, or for those that -do not need a unique input grid system, no resampling is performed -before calling SAGA, and those parameters are not used. - -R. Creating R scripts ---------------------- - -R integration in SEXTANTE is different from that of SAGA in that there -is not a predefined set of algorithms you can run (except for a few -examples). Instead, you should write your scripts and call R commands, -much like you would do from R, and in a very similar manner to what we -saw in the chapter dedicated to SEXTANTE scripts. This chapter shows you -the syntax to use to call those R commands from SEXTANTE and how to use -SEXTANTE objects (layers, tables) in them. - -The first thing you have to do, as we saw in the case of SAGA, is to -tell SEXTANTE where you R binaries are located. You can do so using the -*R folder* entry in the SEXTANTE configuration dialog. Once you have set -that parameter, you can start creating your own R scripts and executing -them. - -Once again, this is different in Linux, and you just have to make sure -that the R folder is included in the PATH environment variable. If you -can start R just typing ``R`` in a console, then you are ready to go. - -To add a new algorithm that calls an R function (or a more complex R -script that you have developed and you would like to have available from -SEXTANTE), you have to create a script file that tells SEXTANTE how to -perform that operation and the corresponding R commands to do so. - -Script files have the extension ``rsx`` and creating them is pretty easy -if you just have a basic knowledge of R syntax and R scripting. They -should be stored in the R scripts folder. You can set this folder in the -R settings group (available from the SEXTANTE settings dialog), just -like you do with the folder for regular SEXTANTE scripts. - -Let’s have a look at a very simple file script file, which calls the R -method ``spsample`` to create a random grid within the boundary of the -polygons in a given polygon layer. This method belong to the -``maptools`` package. Since almost all the algorithms that you might -like to incorporate into SEXTANTE will use or generate spatial data, -knowledge of spatial packages like ``maptools`` and, specially, ``sp``, -is mandatory. - -:: - - ##polyg=vector - ##numpoints=number 10 - ##output=output vector - ##sp=group - pts=spsample(polyg,numpoints,type="random") - output=SpatialPointsDataFrame(pts, as.data.frame(pts)) - -The first lines, which start with a double Python comment sign (##), -tell SEXTANTE the inputs of the algorithm described in the file and the -outputs that it will generate. They work exactly with the same syntax as -the SEXTANTE scripts that we have already seen, so they will not be -described here again. Check the corresponding section for more -information. - -When you declare an input parameter, SEXTANTE uses that information for -two things: creating the user interface to ask the user for the value of -that parameter and creating a corresponding R variable that can be later -used as input for R commands - -In the above example, we are declaring an input of type -``vector`` named ``polyg``. When executing the algorithm, -SEXTANTE will open in R the layer selected by the user and store it in a -variable also named ``polyg``. So the name of a parameter is also the -name of the variable that we can use in R for accessing the value of that -parameter (thus, you should avoid using reserved R words as parameter -names). - -Spatial elements such as vector and raster layers are read using the -``readOGR()`` and ``readGDAL()`` commands (you do not have to worry -about adding those commands to your description file, SEXTANTE will do -it) and stored as ``Spatial*DataFrame`` objects. Table fields are stored -as strings containing the name of the selected field. - -Tables are opened using the ``read.csv()`` command. If a table entered -by the user is not in CSV format, it will be converted prior to -importing it in R. - -Knowing that, we can now understand the first line of our example script -(the first line not starting with a Python comment). - -:: - - pts=spsample(polyg,numpoints,type="random") - -The variable ``polygon`` already contains a ``SpatialPolygonsDataFrame`` -object, so it can be used to call the ``spsample`` method, just like the -``numpoints`` one, which indicates the number of points to add to the -created sample grid. - -Since we have declared an output of type vector named ``out``, we have -to create a variable named ``out`` and store a ``Spatial*DataFrame`` -object in it (in this case, a ``SpatialPointsDataFrame``). You can use -any name for your intermediate variables. Just make sure that the -variable storing your final result has the same name that you used to -declare it, and contains a suitable value. - -In this case, the result obtained from the ``spsample`` method has to be -converted explicitly into a ``SpatialPointsDataFrame`` object, since it -is itself an object of class ``ppp``, which is not a suitable class to -be retuned to SEXTANTE. - -If you algorithm does not generate any layer, but a text result in the -console instead, you have to tell SEXTANTE that you want the console to -be shown once the execution is finished. To do so, just start the -command lines that produce the results you want to print with the -“:math:`>`” sign. The output of all other lines will not be shown. For -instance, here is the description file of an algorithms that performs a -normality test on a given field (column) of the attributes of a vector -layer: - -:: - - ##layer=vector - ##field=field layer - ##nortest=group - library(nortest) - >lillie.test(layer[[field]]) - -The output ot the last line is printed, but the output of the first is -not (and neither are the outputs from other command lines added -automatically by SEXTANTE). - -If your algorithm creates any kind of graphics (using the ``plot()`` -method), add the following line: - -:: - - ##showplots - -This will cause SEXTANTE to redirect all R graphical outputs to a -temporary file, which will be later opened once R execution has finished - -Both graphics and console results will be shown in the SEXTANTE results -manager. - -For more information, please check the script files provided with -SEXTANTE. Most of them are rather simple and will greatly help you -understand how to create your own ones. - -A note about libraries: ``rgdal`` and ``maptools`` libraries are loaded -by default so you do not have to add the corresponding *library()* -commands (you have to make sure, however, that those two packages are -installed in your R distribution). However, other additional libraries -that you might need have to be explicitly loaded. Just add the necessary -commands at the beginning of your script. You also have to make sure -that the corresponding packages are installed in the R distribution used -by SEXTANTE. - -GRASS ------ - -Configuring GRASS is not much different from configuring SAGA. First, -the path to the GRASS folder has to be defined, but only if you are -running Windows. Additionally, a shell interpreter (usually msys.exe, -which can be found in most GRASS for Windows distributions) has to be -defined and its path set up as well. - -By default, SEXTANTE tries to configure its GRASS connector to use the GRASS distribution that ships along with QGIS. This should work without problems in most systems, but if you experience problems, you might have to do it manually. Also, if you want to use a different GRASS version, you can change that setting and point to the folder where that other version is kept. GRASS 6.4 is needed for algorithms to work correctly. - -If you are running Linux, you just -have to make sure that GRASS is correctly installed, and that it can be -run without problem from a console. - -GRASS algorithms use a region for calculations. This region can be -defined manually using values similar to the ones found in the SAGA -configuration, or automatically, taking the minimum extent that covers -all the input layers used to execute the algorithm each time. If this is -the behaviour you prefer, just check the *Use min covering region* -option in the GRASS configuration parameters. - -GRASS includes help files describing each algorithm. If you set the -*GRASS help folder* parameter, SEXTANTE will open them when you use the -*Show help* button from the parameters window of the algorithm. - -The last parameter that has to be configured is related to the mapset. A -mapset is needed to run GRASS, and SEXTANTE creates a temporary one for -each execution. You have to tell SEXTANTE if the data you are working -with uses geographical (lat/lon) coordinates or projected ones. - - -GDAL ------ - -No additional configuration is needed to run GDAL algorithms, since it is already incorporated to QGIS and SEXTANTE can infere its configuration from it. - - -OTB ---- - -[to be written] diff --git a/python/plugins/sextante/help/_sources/batch.txt b/python/plugins/sextante/help/_sources/batch.txt deleted file mode 100644 index 0f54949e7df8..000000000000 --- a/python/plugins/sextante/help/_sources/batch.txt +++ /dev/null @@ -1,99 +0,0 @@ -The SEXTANTE batch processing interface -======================================= - -Introduction ------------- - -SEXTANTE algorithms (including models) can be executed as a batch -process. That is, they can be executed using not a single set of inputs, -but several of them, executing the algorithm as many times as needed. -This is useful when processing large amounts of data, since it is not -necessary to launch the algorithm many times from the toolbox. - -To execute an algorithm as a batch process, right-click on its name in -the toolbox and select the *Execute as batch process* option in the -pop-up menu that will appear - -.. image:: batch_processing_right_click.png - :align: center - -The parameters table --------------------- - -Executing a batch process is similar to performing a single execution of -an algorithm. Parameter values have to be defined, but in this case we -need not just a single value for each parameter, but a set of them -instead, one for each time the algorithm has to be executed. Values are -introduced using a table like the one shown next. - -.. image:: batch_processing.png - :align: center - -Each line of this table represents a single execution of the algorithm, -and each cell contains the value of one of the parameters. It is similar -to the parameters dialog that you see when executing an algorithm from -the toolbox, but with a different arrangement. - -By default, the table contains just two rows. You can add or remove rows -using the buttons on the lower part of the window. - -Once the size of the table has been set, it has to be filled with the -desired values - -Filling the parameters table ----------------------------- - -For most parameters, setting its value is trivial. Just type the value -or select it from the list of available options, depending on the -parameter type. - -The main differences are found for parameters representing layers or -tables, and for output filepaths. Regarding input layers and tables, -when an algorithm is executed as part of a batch process those input -data objects are taken directly from files, and not from the set of them -already opened in QGIS. For this reason, any algorithm can be executed -as a batch process even if no data objects at all are opened and the -algorithm cannot be run from the toolbox. - -Filenames for input data objects are introduced directly typing or, more -conveniently, clicking on the button on the right hand of the cell, -which shows a typical file chooser dialog. Multiple files can be -selected at once. If the input parameter represents a single data object -and several files are selected, each one of them will be put in a -separate row, adding new ones if needed. If it represents a multiple -input, all the selected files will be added to a single cell, separated -by semicolons. - -Output data objects are always saved to a file and, unlike when -executing an algorithm from the toolbox, saving to a temporary one is -not permitted. You can type the name directly or use the file chooser -dialog that appears when clicking on the accompanying button. - -Once you select the file, a new dialog is shown to allow for -autocompletion of other cells in the same column (same parameter). - -.. image:: batch_processing_save.png - :align: center - -If the default value (*Do not autocomplete*) is selected, SEXTANTE will -just put the selected filename in the selected cell from the parameters -table. If any of the other options is selected, all the cells below the -selected one will be automatically filled based on a defined criteria. -This way, it is much easier to fill the table, and the batch process can -be defined with less effort. - -Automatic filling can be done simply adding correlative numbers to the -selected filepath, or appending the value of another field at the same -row. This is particularly useful for naming output data object according -to input ones. - -.. image:: batch_processing_filepath.png - :align: center - -Executing the batch process ---------------------------- - -To execute the batch process once you have introduced all the necessary -values, just click on *OK*. SEXTANTE will show the progress of the -global batch process in the progress bar in the lower part of the -dialog. diff --git a/python/plugins/sextante/help/_sources/console.txt b/python/plugins/sextante/help/_sources/console.txt deleted file mode 100644 index cac5c66da2ea..000000000000 --- a/python/plugins/sextante/help/_sources/console.txt +++ /dev/null @@ -1,351 +0,0 @@ -Using SEXTANTE from the console. Creating scripts. -================================================== - -Introduction ------------- - -The console allows advanced users to increase their productivity and -perform complex operations that cannot be performed using any of the -other elements of the SEXTANTE GUI. Models involving several algorithms -can be defined using the command-line interface, and additional -operations such as loops and conditional sentences can be added to -create more flexible and powerful workflows. - -There is not a SEXTANTE console in QGIS, but all SEXTANTE commands are -available instead from QGIS built-in Python console. That means that you -can incorporate those command to your console work and connect SEXTANTE -algorithms to all the other features (including methods from the QGIS -API) available from there. - -The code that you can execute from the Python console, even if it does -call any SEXTANTE method, can be converted into a new SEXTANTE algorithm -that you can later call from the toolbox, the graphical modeler or any -other SEXTANTE component, just like you do with any other SEXTANTE -algorithm. In fact, some algorithms that you can find in the toolbox, -like all the ones in the *mmqgis* group, are simple scripts. - -In this chapter we will see how to use SEXTANTE from the QGIS Python -console, and also how to write your own algorithms using Python. - -Calling SEXTANTE from the Python console ----------------------------------------- - -The first thing you have to do is to import the ``Sextante`` class with -the following line: - -:: - - >>from sextante.core.Sextante import Sextante - -Now, there is basically just one (interesting) thing you can do with -SEXTANTE from the console: to execute an algorithm. That is done using -the ``runalg()`` method, which takes the name of the algorithm to -execute as its first parameter, and then a variable number of additional -parameter depending on the requirements of the algorithm. So the first -thing you need to know is the name of the algorithm to execute. That is -not the name you see in the toolbox, but rather a unique command–line -name. To find the right name for your algorithm, you can use the -``algslist()`` method. Type the following line in you console: - -You will see something like this. - -:: - - >>> Sextante.alglist() - Accumulated Cost (Anisotropic)---------------->saga:accumulatedcost(anisotropic) - Accumulated Cost (Isotropic)------------------>saga:accumulatedcost(isotropic) - Add Coordinates to points--------------------->saga:addcoordinatestopoints - Add Grid Values to Points--------------------->saga:addgridvaluestopoints - Add Grid Values to Shapes--------------------->saga:addgridvaluestoshapes - Add Polygon Attributes to Points-------------->saga:addpolygonattributestopoints - Aggregate------------------------------------->saga:aggregate - Aggregate Point Observations------------------>saga:aggregatepointobservations - Aggregation Index----------------------------->saga:aggregationindex - Analytical Hierarchy Process------------------>saga:analyticalhierarchyprocess - Analytical Hillshading------------------------>saga:analyticalhillshading - Average With Mask 1--------------------------->saga:averagewithmask1 - Average With Mask 2--------------------------->saga:averagewithmask2 - Average With Thereshold 1--------------------->saga:averagewiththereshold1 - Average With Thereshold 2--------------------->saga:averagewiththereshold2 - Average With Thereshold 3--------------------->saga:averagewiththereshold3 - B-Spline Approximation------------------------>saga:b-splineapproximation - . - . - . - -That's a list of all the available algorithms, alphabetically ordered, -along with their corresponding command-line names. - -You can use a string as a parameter for this method. Instead of -returning the full list of algorithm, it will only display those that -include that string. If, for instance, you are looking for an algorithm -to calculate slope from a DEM, type ``alglist("slope")`` to get the -following result: - -:: - - DTM Filter (slope-based)---------------------->saga:dtmfilter(slope-based) - Downslope Distance Gradient------------------->saga:downslopedistancegradient - Relative Heights and Slope Positions---------->saga:relativeheightsandslopepositions - Slope Length---------------------------------->saga:slopelength - Slope, Aspect, Curvature---------------------->saga:slopeaspectcurvature - Upslope Area---------------------------------->saga:upslopearea - Vegetation Index[slope based]----------------->saga:vegetationindex[slopebased] - -It is easier now to find the algorithm you are looking for and its -command-line name, in this case *saga:slopeaspectcurvature* - -Once you know the command-line name of the algorithm, the next thing to -do is to know the right syntax to execute it. That means knowing which -parameters are needed and the order in which they have to be passed when -calling the ``runalg()`` method. SEXTANTE has a method to describe an -algorithm in detail, which can be used to get a list of the parameters -that an algorithms require and the outputs that it will generate. To do -it, you can use the ``alghelp(name_of_the_algorithm)`` method. Use the -command-line name of the algorithm, not the full descriptive name. - -Calling the method with ``saga:slopeaspectcurvature`` as parameter, you -get the following description. - -:: - - >Sextante.alghelp("saga:slopeaspectcurvature") - ALGORITHM: Slope, Aspect, Curvature - ELEVATION - METHOD - SLOPE - ASPECT - CURV - HCURV - VCURV - -Now you have everything you need to run any algorithm. As we have -already mentioned, there is only one single command to execute -algorithms: ``runalg``. Its syntax is as follows: - -:: - - > runalg{name_of_the_algorithm, param1, param2, ..., paramN, - Output1, Output2, ..., OutputN) - -The list of parameters and outputs to add depends on the algorithm you -want to run, and is exactly the list that the ``describealg`` method -gives you, in the same order as shown. - -Depending on the type of parameter, values are introduced differently. -The next one is a quick review of how to introduce values for each type -of input parameter - -- Raster Layer, Vector Layer or Table. Simply use a string with the - name that identifies the data object to use (the name it has in the - QGIS Table of Contents) or a filename (if the corresponding layer is - not opened, it will be opened, but not added to the map canvas). If - you have an instance of a QGIS object representing the layer, you can - also pass it as parameter. If the input is optional and you do not - want to use any data object, use ``None``. - -- Selection. If an algorithm has a selection parameter, the value of - that parameter should be entered using an integer value. To know the - available options, you can use the ``algoptions`` command, as shown - in the following example: - - :: - - >>Sextante.algoptions("saga:slopeaspectcurvature") - METHOD(Method) - 0 - [0] Maximum Slope (Travis et al. 1975) - 1 - [1] Maximum Triangle Slope (Tarboton 1997) - 2 - [2] Least Squares Fitted Plane (Horn 1981, Costa-Cabral & Burgess 1996) - 3 - [3] Fit 2.Degree Polynom (Bauer, Rohdenburg, Bork 1985) - 4 - [4] Fit 2.Degree Polynom (Heerdegen & Beran 1982) - 5 - [5] Fit 2.Degree Polynom (Zevenbergen & Thorne 1987) - 6 - [6] Fit 3.Degree Polynom (Haralick 1983) - - In this case, the algorithm has one of such such parameters, with 7 - options. Notice that ordering is zero-based. - -- Multiple input. The value is a string with input descriptors - separated by semicolons. As in the case of single layers or tables, - each input descriptor can be the data object name, or its filepath. - -- Table Field from XXX. Use a string with the name of the field to use. - This parameter is case-sensitive. - -- Fixed Table. Type the list of all table values separated by commas - and enclosed between quotes. Values start on the upper row and go - from left to right. You can also use a 2D array of values - representing the table. - -- CRS: Enter the EPSG code number of the desired CRS - -- Extent: You must use a string with xmin,xmax,ymin and ymax values separated by commas - -Boolean, file, string and numerical parameters do not need any additional -explanations. - -Input parameters such as strings booleans or numerical values have default -values. To use them, use ``None`` in the corresponding parameter entry. - -For output data objects, type the filepath to be used to save it, just -as it is done from the toolbox. If you want to save the result to a -temporary file, use ``None``. The extension of the file determines the -file format. If you enter a file extension not included in the ones -supported by the algorithm, the default file format for that output -type will be used, and its corresponding extension appended to the given -filepath. - -Unlike when an algorithm is executed from the toolbox, outputs are not -added to the map canvas if you execute that same algorithm from the -Python console. If you want to add an output to it, you have to do it -yourself after running the algorithm. To do so, you can use QGIS API -commands, or, even easier, use one of the handy methods provided by -SEXTANTE for such task. - -The ``runalg`` method returns a dictionary with the output names (the -ones shown in the algorithm description) as keys and the filepaths of -those outputs as values. To add all the outputs generated by an -algorithm, pass that dictionary to the ``loadFromAlg()`` method. You can -also load an individual layer passing its filepath to the ``load()`` -method. - -Creating scripts and running them from the toolbox --------------------------------------------------- - -You can create your own algorithms by writing the corresponding Python -code and adding a few extra lines to supply additional information -needed by SEXTANTE. You can find a *Create new script* under the tools -group in the script algorithms block of the toolbox. Double click on it -to open the script edition dialog. That's where you should type your -code. Saving the script from there in the scripts folder (the default -one when you open the save file dialog), with ``.py`` extension, will -automatically create the corresponding algorithm. - -The name of the algorithm (the one you will see in the toolbox) is -created from the filename, removing its extension and replacing low -hyphens with blank spaces. - -Let's have the following code, which calculates the Topographic Wetness -Index(TWI) directly from a DEM - -:: - - ##dem=raster - ##twi=output - ret_slope = Sextante.runalg("saga:slopeaspectcurvature", dem, 0, None, - None, None, None, None) - ret_area = Sextante.runalg("saga:catchmentarea(mass-fluxmethod)", "dem", - 0, False, False, False, False, None, None, None, None, None) - Sextante.runalg("saga:topographicwetnessindex(twi), ret_slope['SLOPE'], - ret_area['AREA'], None, 1, 0, twi) - -As you can see, it involves 3 algorithms, all of them coming from SAGA. -The last one of them calculates de TWI, but it needs a slope layer and a -flow accumulation layer. We do not have these ones, but since we have -the DEM, we can calculate them calling the corresponding SAGA -algorithms. - -The part of the code where this processing takes place is not difficult -to understand if you have read the previous sections in this chapter. -The first lines, however, need some additional explanation. They provide -SEXTANTE the information it needs to turn your code into an algorithm -that can be run from any of its components, like the toolbox or the -graphical modeler. - -These lines start with a double Python comment symbol and have the -following structure: *[parameter_name]=[parameter_type] -[optional_values]*. Here is a list of all the parameter types that -SEXTANTE supports in its scripts, their syntax and some examples. - -- ``raster``. A raster layer - -- ``vector``. A vector layer - -- ``table``. A table - -- ``number``. A numerical value. A default value must be provided. For - instance, ``depth=number 2.4`` - -- ``string``. A text string. As in the case of numerical values, a - default value must be added. For instance, ``name=string Victor`` - -- ``boolean``. A boolean value. Add ``True`` or ``False`` after it to - set the default value. For example, ``verbose=boolean True`` - -- ``multiple raster``. A set of input raster layers. - -- ``multiple vector``. A set of input vector layers. - -- ``field``. A field in the attributes table of a vector layer. The - name of the layer has to be added after the ``field`` tag. For - instance, if you have declared a vector input with - ``mylayer=vector``, you could use ``myfield=field mylayer`` to add a - field from that layer as parameter. - -- ``folder``. A folder - -- ``file``. A filename - -The parameter name is the name that will be shown to the user when -executing the algorithm, and also the variable name to use in the script -code. The value entered by the user for that parameter will be assigned -to a variable with that name. - -When showing the name of the parameter to the user, SEXTANTE will edit it to improve its appearance, replacing low hyphens with blankspaces. So, for instance, if you want the user to see a parameter named ``A numerical value``, you can use the variable name ``A_numerical_value`` - -Layers and tables values are strings containing the filepath of the -corresponding object. To turn them into a QGIS object, you can use the -``getObject()`` method in the ``Sextante`` class. Multiple inputs also -have a string value, which contains the filepaths to all selected -object, separated by semicolons. - -Outputs are defined in a similar manner, using the following tags: - -- ``output raster`` - -- ``output vector`` - -- ``output table`` - -- ``output html`` - -- ``output file`` - -The value assigned to the output variables is always a string with a -filepath. It will correspond to a temporary filepath in case the user -has not entered any output filename. - -When you declare an output, SEXTANTE will try to add it to QGIS once the -algorithm is finished. That is the reason why, although the ``runalg()`` -method does not load the layers it produces, the final TWI layer will be -loaded, since it is saved to the file entered by the user, which is the -value of the corresponding output. - -Do not use the ``load()`` method in your script algorithms, but just -when working with the console line. If a layer is created as output of -an algorithm, it should be declared as such. Otherwise, you will not be -able to properly use the algorithm in the modeler, since its syntax (as -defined by the tags explained above) will not match what the algorithm -really creates. - -In addition to the tags for parameters and outputs, you can also define -the group under which the algorithm will be shown, using the ``group`` -tag. - -Several examples are provided with SEXTANTE. Please, check them to see -real examples of how to create algorithms using this feature of -SEXTANTE. You can right-click on any script algorithm and select *Edit -script* to edit its code or just to see it. - -Documenting your scripts --------------------------- - -As in the case of models, you can create additional documentation for your script, to explain what they do and how to use them. In the script editing dialog you will find a *Edit script help* button. Click on it and it will take you to the help editing dialog. Check the chapter about the graphical modeler to know more about this dialog and how to use it. - -Help files are saved in the same folder as the script itself, adding the *.help* extension to the filename. Notice that you can edit your script's help before saving it for the first time. If you later close the script editing dialog without saving the script (i.e. you discard it), the help content you wrote will be lost. If your script was already saved and is associated to a filename, saving is done automatically. - -Communicating with the user ----------------------------- - -You can send messages to the user to inform about the progress of the algorithm. To do so, just print whatever information you want to show in the textbox above the progress bar in the algorithm dialog, using the ``print`` command. For instance, just use ``print "Processing polygon layer"`` and the text will be redirected to that textbox. - -If the text you print is just a number between 0 and 100, it will be understood as the percentage of the process that has been already finished, and instead of redirecting the text to the textbox, the progress bar will be update to that percentage of completion. diff --git a/python/plugins/sextante/help/_sources/history.txt b/python/plugins/sextante/help/_sources/history.txt deleted file mode 100644 index 65cf94393841..000000000000 --- a/python/plugins/sextante/help/_sources/history.txt +++ /dev/null @@ -1,50 +0,0 @@ -The SEXTANTE history manager -============================ - -The SEXTANTE history -==================== - -Every time you execute a SEXTANTE algorithm, information about the -process is stored in the SEXTANTE history manager. Along with the -parameters used, the date and time of the execution are also saved. - -This way, it is easy to track the and control all the work that has been -developed using SEXTANTE, and easily reproduce it. - -The SEXTANTE history manager is a set of registry entries grouped -according to their date of execution, making it easier to find -information about an algorithm executed at any particular moment. - -.. image:: history.png - :align: center - -Process information is kept as a command-line expression, even if the -algorithm was launched from the toolbox. This makes it also useful for -those learning how to use the command-line interface, since they can call -an algorithm using the toolbox and then check the history manager to see -how that same algorithm could be called from the command line. - -Apart from browsing the entries in the registry, processes can be -re-executed, simply double-clicking on the corresponding entry. - -Along with algorithm executions, SEXTANTE communicates with the user -using the other groups of the registry, namely *Errors, Warnings* and -*Information*. In case something is not working properly, having a look -at the *Errors* might help you to see what is happening. If you get in -contact with a SEXTANTE developer to report a bug or error, the -information in that group will be very useful for him to find out what -is going wrong. - -When executing third party algorithms, this is usually done calling -their command-line interfaces, which communicate with the user using the -console. Although that console is not shown, a full dump of it is stored -in the *Information* group each time you run one of those algorithms. -If, for instance, you are having problems executing a SAGA algorithm, -look for an entry name *SAGA execution console output* to check all the -messages generated by SAGA and try to find out where the problem is. - -Some algorithms, even if they can produce a result with the given input -data, might add comments or additional information to *Warning* in case -they detect potential problems from that data, in order to warn you -about them. Make sure you check those messages in case you are having -unexpected results. diff --git a/python/plugins/sextante/help/_sources/index.txt b/python/plugins/sextante/help/_sources/index.txt deleted file mode 100644 index 3821d202e5ca..000000000000 --- a/python/plugins/sextante/help/_sources/index.txt +++ /dev/null @@ -1,27 +0,0 @@ -.. SEXTANTE for QGIS documentation master file, created by - sphinx-quickstart on Wed May 09 10:06:06 2012. - You can adapt this file completely to your liking, but it should at least - contain the root `toctree` directive. - -SEXTANTE for QGIS's documentation -============================================= - -Contents: - -.. toctree:: - :maxdepth: 2 - - intro - toolbox - modeler - batch - console - history - 3rdParty - -Indices and tables -================== - -* :ref:`genindex` -* :ref:`search` - diff --git a/python/plugins/sextante/help/_sources/intro.txt b/python/plugins/sextante/help/_sources/intro.txt deleted file mode 100644 index c108c8dc688f..000000000000 --- a/python/plugins/sextante/help/_sources/intro.txt +++ /dev/null @@ -1,62 +0,0 @@ -Introduction -============ - - -This chapter introduces SEXTANTE, the powerful geospatial analysis framework of QGIS. -SEXTANTE is a geoprocessing environment that can be used to call native -and third party algorithms from QGIS, making your spatial analysis tasks -more productive and easy to accomplish. - -In the following sections we will review how to use the graphical -elements of SEXTANTE and take the most out of each one of them - -Basic elements of the SEXTANTE GUI ----------------------------------- - -There are four basic elements in the SEXTANTE GUI, which are used to run -SEXTANTE algorithms for different purposes. Choosing one tool or another -will depend on the kind of analysis that is to be performed and the -particular characteristics of each user and project. All of them (except -for the batch processing interface, which is called from the toolbox, as -we will see) can be accessed from the *SEXTANTE* menu item (you will see -more than four entries. The remaining ones are not used to execute -algorithms and will be explained later in this chapter). - -- The SEXTANTE toolbox. The main element of the SEXTANTE GUI, it is - used to execute a single algorithm or run a batch process based on - that algorithm. - - .. figure:: toolbox.png - :align: center - :alt: image - - -- The SEXTANTE graphical modeler. Several algorithms can be combined - graphically using the modeler to define a workflow, creating a single - process that involves several sub-processes - - .. figure:: models.png - :align: center - :alt: image - - -- The SEXTANTE history manager. All actions performed using any of the - aforementioned elements are stored in a history file and can be later - easily reproduced using the history manager - - .. figure:: history.png - :align: center - :alt: image - - -- The SEXTANTE batch processing interface manager. This interface - allows you to execute batch processes and automate the execution of a - single algorithm on multiple datasets. - - .. figure:: batch_processing.png - :align: center - :alt: image - - -Along the following sections we will review each one of this elements in -detail. diff --git a/python/plugins/sextante/help/_sources/modeler.txt b/python/plugins/sextante/help/_sources/modeler.txt deleted file mode 100644 index 7f1f5034b08e..000000000000 --- a/python/plugins/sextante/help/_sources/modeler.txt +++ /dev/null @@ -1,283 +0,0 @@ -The SEXTANTE graphical modeler -============================== - -Introduction ------------- - -The *graphical modeler* allows to create complex models using a simple -and easy-to-use interface. When working with a GIS, most analysis -operations are not isolated, but part of a chain of operations instead. -Using the graphical modeler, that chain of processes can be wrapped into -a single process, so it is easier and more convenient to execute than a -single process later on a different set on inputs. No matter how many -steps and different algorithms it involves, a model is executed as a -single algorithm, thus saving time and effort, specially for larger -models. - -The modeler can be opened from the SEXTANTE menu, but also from the -toolbox. In the *Modeler* branch of the algorithms tree you will find a -group named *Tools*, which contains an entry called *Create new model* - -The modeler has a working canvas where the structure of the model and -the workflow it represents are shown. On the left part of the window, a -panel with two tabs can be used to add new elements to the model. - -.. figure:: modeler_canvas.png - :align: center - :alt: image - - -Creating a model involves two steps: - -- *Definition of necessary inputs*. These inputs will be added to the - parameters window, so the user can set their values when executing - the model. The model itself is a SEXTANTE algorithm, so the - parameters window is generated automatically as it happens with all - the algorithms included in SEXTANTE. - -- *Definition of the workflow*. Using the input data of the model, the - workflow is defined adding algorithms and selecting how they use - those inputs or the outputs generated by other algorithms already in - the model - -Definition of inputs --------------------- - -The first step to create a model is to define the inputs it needs. The -following elements are found in the *Inputs* tabs on the left side of -the modeler window: - -- Raster layer - -- Vector layer - -- String - -- Table field - -- Table - -- Numerical value - -- Boolean value - -Double-clicking on any of them, a dialog is shown to define its -caracteristics. Depending on the parameter itself, the dialog will -contain just one basic element (the description, which is what the user -will see when executing the model) or more of them. For instance, when -adding a numerical value, as it can be seen in the next figure, apart -from the description of the parameter you have to set a default value -and a range of valid values. - -.. figure:: models_parameters.png - :align: center - :alt: image - - -For each added input, a new element is added to the modeler canvas. - -.. figure:: models_parameters2.png - :align: center - :alt: image - - -Definition of the workflow --------------------------- - -Once the inputs have been defined, it is time to define the algorithms -to apply on them. Algorithms can be found in the *Algorithms* tab, -grouped much in the same way as they are in the toolbox. - -.. figure:: models_parameters3.png - :align: center - :alt: image - - -To add an algorithm, double-click on its name. An execution dialog will -appear, with a content similar to the one found in the execution panel -that SEXTANTE shows when executing the algorithm from the toolbox. the -one shown next correspond to the SAGA convergence index algorithm, the -same one we saw in the section dedicated to the SEXTANTe toolbox. - -.. figure:: models_parameters4.png - :align: center - :alt: image - - -As you can see, some differences exist. Instead of the file output box -that was used to set the filepath for output layers and tables, a simple -text box is. If the layer generated by the algorithm is just a temporary -result that will be used as the input of another algorithm and should -not be kept as a final result, just do not edit that textbox. Typing -anything on it means that the result is a final one, and the text that -you supply will be the description for the output, which will be the one -the user will see when executing the model. - -Selecting the value of each parameter is also a bit different, since -there are importante differences between the context of the modeler and -the toolbox one. Let's see how to introduce the values for each type of -parameter. - -- Layers (raster and vector) and tables. They are selected from a - list, but in this case the possible values are not the layers or - tables currently loaded in QGIS, but the list of model inputs of the - corresponding type, or other layers or tables generated by algorithms - already added to the model. - -- Numerical values. Literal values can be introduced directly on the - textbox. But this textbox is also a list that can be used to select - any of the numerical value inputs of the model. In this case, the - parameter will take the value introduced by the user when executing - the model. - -- String. Like in the case of numerical values, literal strings can be - typed, or an input string can be selected. - -- Table field. The fields of the parent table or layer cannot be known - at design-time, since they depend of the selection of the user each - time the model is executed. To set the value for this parameter, type - the name of a field directly in the textbox, or use the list to - select a table field input already added to the model. The validity - of the selected field will be checked by SEXTANTE at run-time - -Once all the parameter have been assigned valid values, click on *OK* -and the algorithm will be added to the canvas. It will be linked to all -the other elements in the canvas, whether algorithms or inputs, which -provide objects that are used as inputs for that algorithm. - -.. figure:: models_parameters5.png - :align: center - :alt: image - - -Elements can be dragged to a different position within the canvas, to -change the way the module structure is displayed and make it more clear -and intuitive. Links between elements are update automatically. - -You can run your algorithm anytime clicking on the *Run* button. However, in order to use it from the toolbox, it has to be saved and the modeler dialog closed, to allow the toolbox to refresh its contents. - -Saving and loading models -------------------------- - -Use the *Save* button to save the current model and the *Open* one to -open any model previously saved. Model are saved with the ``.model`` -extension. If the model has been previously saved from the modeler -window, you will not be prompted for a filename, since there is already -a file associated with that model, and it will be used. - -Before saving a model, you have to enter a name and a group for it, -using the text boxes in the upper part of the window. - -Models saved on the models folder (the default folder when you are -prompted for a filename to save the model) will appear in the toolbox in -the corresponding branch. When the toolbox is invoked, SEXTANTE searches -the models folder for files with ``.model`` extension and loads the -models they contain. Since a model is itself a SEXTANTE algorithm, it -can be added to the toolbox just like any other algorithm. - -The models folder can be set from the SEXTANTE configuration dialog, -under the *Modeler* group. - -Models loaded from the models folder appear not only in the toolbox, but -also in the algorithms tree in the *Algorithms* tab of the modeler -window. That means that you can incorporate a model as a part of a -bigger model, just as you add any other algorithm. - -In some cases, SEXTANTE might not be able to load a model because it -cannot find all the algorithms included in its workflow. If you have -used a given algorithm as part of your model, it should be available -(that is, it should appear on the toolbox) in order to load that model. -Deactivating an algorithm provider in the SEXTANTE configuration window -renders all the algorithms in that provider unusable by the modeler, -which might cause problems when loading models. Keep that in mind when -you have trouble loading or executing models. - -Editing a model ---------------- - -You can edit the model you are currently creating, redefining the workflow and the relationships between the algorithms and inputs that define the model itself. - -If you right-click on an algorithm in the canvas representing the model, you will see a context menu like the one shown next: - -.. figure:: modeler_right_click.png - :align: center - - -Selecting the *Remove* option will cause the selected algorithm to be removed. An algorithm can be removed only if there are no other algorithms dependind on it. That is, if no output from the algorithm is used in a different one as input. If you try to remove an algorithm that has others depending on it, SEXTANTE will show you a warning message like the one you can see below: - -.. figure:: cannot_delete_alg.png - :align: center - -Selecting the *Edit* option or simply double-clicking on the algorithm icon will show the parameters dialog of the algorithm, so you can change the inputs and parameter values. Not all input elements available in the model will appear in this case as available inputs. Layers or values generated at a more advanced step in the workflow defined by the model will not be available if they cause circular dependencies. - -Select the new values and then click on the *OK* button as usual. The connections between the model elements will change accordingly in the modeler canvas. - -Activating and deactivating algorithms --------------------------------------- - -Algorithms can be deactivated in the modeler, so they will not be executed once the model is run. This can be used to test just a given part of the model, or when you do not need all the outputs it generates. - -To deactivate an algorithm, right--click on its icon in the model canvas and select the *Deactivate* option. You will see that the algorithm is represented now with a red label under its name indicating that is not active. - -.. figure:: deactivated.png - :align: center - -All algorithms depending (directly or undirectly) on that algorithm will also appear as inactive, since they cannot be executed now. - -To activate an algorithm, just right--click on its icon and select the *Activate* option. - - -Editing model help files and meta-information ---------------------------------------------- - -You can document your models from SEXTANTE. Just click on the *Edit model help* button and a dialog like the one shown next will appear. - -.. figure:: help_edition.png - :align: center - :alt: image - -On the right-hand side you will see a simple HTML page, created using the description of the input parameters and outputs of the algorithm, along with some additional items like a general description of the model or its author. The first time you open the help editor all those descriptions are empty, but you can edit them using the elements on the left-hand side of the dialog. Select an element on the upper part and the write its description in the texbox below. - -Model help is saved in a file in the same folder as the model itself. You do not have to worry about saving it, since it is done automatically. - -About available algorithms --------------------------- - -You might notice that some algorithms that can be be executed from the -toolbox do not appear in the list of available ones when you are -designing a model. To be included in a model, and algorithm must have a -correct semantic, so as to be properly linked to other in the workflow. -If an algorithm does not have such well-defined semantic (for instance, -if the number of output layers cannot be know in advance), then it is -not possible to use it within a model, and thus does not appear in the -list of them that you can find in the modeler dialog. - -Additionally, you will see some algorithms in the modeler that are not -found in the toolbox. This algorithms are meant to be used exclusively -as part of a model, and they are of no interest in a different context. -The *Calculator* algorithm is an example of that. It is just a simple -arithmetic calculator that you can use to modify numerical values -(entered by the user or generated by some other algorithm). This tools -is really useful within a model, but outside of that context, it doesn't -make too much sense. - -SEXTANTE models as Python code ------------------------------- - -*[This feature is temporarily unavailable]* - -Along with the tab that contains the graphical design of the model, you -will find another one containing a Python script which performs the same -task as the model itself. Using that code, you can create a console -script (we will explain them later in this same manual) and modify it to -incorporate actions and methods not available in the graphical modeler, -such as loops or conditional sentences. - -This feature is also a very practical way of learning how to use -SEXTANTE from the console and how to create SEXTANTE algorithms using -Python code, so you can use it as a learning tool when you start -creating your own SEXTANTE scripts. - -You will find a button below the text field containing the Python code. -Click on it to directly create a new script from that code, without -having to copy and paste it in the SEXTANTE script editor. diff --git a/python/plugins/sextante/help/_sources/toolbox.txt b/python/plugins/sextante/help/_sources/toolbox.txt deleted file mode 100644 index 1a543ad4d9b1..000000000000 --- a/python/plugins/sextante/help/_sources/toolbox.txt +++ /dev/null @@ -1,275 +0,0 @@ -The SEXTANTE toolbox -==================== - -Introduction ------------- - -The *Toolbox* is the main element of the SEXTANTE GUI, and the one that -you are more likely to use in your daily work. It shows the list of all -available algorithms grouped in different blocks, and is the access -point to run them whether as a single process or as a batch process -involving several executions of a same algorithm on different sets of -inputs. - -.. image:: toolbox.png - :align: center - - - -The toolbox contains all the algorithms available, divided into groups. -Each group represents a so-called algorithm provider, which is a set of -algorithms coming from the same source, for instance, from a third-party -application with geoprocessing capabilities. Some of this groups -represent algorithms from one of such third-party applications -(like SAGA, GRASS or R), while other contain algorithms directly coded -along with SEXTANTE elements, not relying on any additional software. -Currently, these providers all reuse code from already-existing QGIS -plugins (more specifically, from the *fTools* vector library shiped along -with QGIS and the contributed mmqgis plugin that you can install using -the plugin manager), making them more useful, since they can be executed -from elements such as the modeler or the batch processing interface, -which we will soon describe. - -Additionally, two more providers can be found, namely Models and -*Scripts*. This providers include user-created algorithms, and allow you -to define your own workflows and processing tasks. We will devote a full -section to them a bit later. - -In the upper part of the toolbox you can find a text box. To reduce the -number of algorithms shown in the toolbox and make it easier to find the -one you need, you can enter any word or phrase on the text box. Notice -that, as you type, the number of algorithms in the toolbox is reduced to -just those which contain the text you have entered in their names. - -To execute an algorithm, just double-click on its name in the toolbox. - -The algorithm dialog --------------------- - -Once you double-click on the name of the algorithm that you want to -execute, a dialog similar to the next one is shown (in this case, the -dialog corresponds to the *SAGA-Convergence index* algorithm). - -.. figure:: parameters_dialog.png - :align: center - :alt: image - - -This dialog is used to set the input values that the algorithm needs to -be executed. It shows a table where input values and configuration -parameters are to be set. It, of course, has a different content -depending on the requirements of the algorithm to be executed, and is -created automatically based on those requirements. On the left side, the -name of the parameter is shown. On the right side the value of the -parameter can be set. - -Although the number and type of parameters depend on the characteristics -of the algorithm, the structure is similar for all of them. The -parameters found on the table can be of one of the following types. - -- A raster layer, to select from a list of all the ones available - (currently opened) in QGIS. The selector contains as well a button on its right-hand side, to let you select filenames that represent layers currently not loaded in QGIS. - -- A vector layer, to select from a list of all the ones available in - the QGIS. Layers not loaded in QGIS can be selected as well, as in the case of raster layers, but only if the algorithm does not require a table field selected from the attributes table of the layer. In that case, only opened layers can be selected, since they need to be open so as to retrieve the list of field names available. - - You will see a button by each vector layer selector. If the algorithm contains several of them, you will be able to toggle just one of them. If the button corresponding to a vector input is toggled, the algorithm will be executed iteratively on each one of its features. We will see more about this kind of execution at the end of this section. - -- A table, to select from a list of all the ones available in QGIS. - Non-spatial tables are loaded into QGIS like vector layers, and in - fact they are treated as such by the program. Currently, the list of - available tables that you will see when executing a SEXTANTE - algorithm that needs one of them is restricted to tables coming from - files in DBase (.dbf) or Comma-Separated Values (.csv) formats - -- An option, to choose from a selection list of possible options. - -- A numerical value, to be introduced in a text box. You will find a - button by its side. Clicking on it you will see a dialog that allows - you to enter a mathematical expression, so you can use it as a handy - calculator. Some useful variables related to data loaded into QGIS - can be added to your expression, so you can select a value derived - from any of this variables such as the cellsize of a layer or the - northern most coordinate of another one. - - .. figure:: number_selector.png - :align: center - :alt: image - - -- A range, with min and max values to be introduced in two text boxes. - -- A text string, to be introduced in a text box. - -- A field, to choose from the attributes table of a vector layer or a - single table selected in another parameter. - -- A Coordinate Reference System. You can type the EPSG code directly in the text box, or select it from the CRS selection dialog that appear when you click on the button on the right-hand size - -- A extent, to be entered by four number representing its xmin, max, ymin, ymax limits. Clicking on the button on the right-hand side of the value selector, a pop-up menu will appear, giving you two option: to select the value from a layer or the current canvas extent, or to define it by dragging directly onto the map canvas. - - .. figure:: extent.png - :align: center - - - If you select the first option, you will see a window like the next one. - - .. figure:: extent_list.png - :align: center - - - - If you select the second one, the parameters window will hide itself, so you can click and drag onto the canvas. Once you have defined the selected rectangle, the dialog will reappear, containing the values in the extent text box. - - - .. figure:: extent_drag.png - :align: center - :alt: image - -- A list of elements (whether raster layers, vector ones or tables), to - select from the list of the ones available in QGIS. To make the - selection, click on the small button on the left side of the - corresponding row to see a dialog like the following one. - - .. figure:: multiple_selection.png - :align: center - :alt: image - - -- A small table to be edited by the user. These are used to define - parameters like lookup tables or convolution kernels, among others. - - Click on the button on the right side to see the table and edit its - values. - - .. figure:: fixed_table.png - :align: center - :alt: image - - - Depending on the algorithm, the number of rows can be modified or - not, using the buttons on the right side of the window. - - You will find a help button in the lower part of the parameters - dialog. If a help file is available, it will be shown, giving you - more information about the algorithms and detailed descriptions of - what each parameter does. Unfortunately, most algorithms lack good - documentation, but if you feel like contributing to the project, this - would be a good place to start... - -A note on projections -~~~~~~~~~~~~~~~~~~~~~ - -SEXTANTE -and also most of the external applications whose algorithms -are available from SEXTANTE- does not perform any reprojection on input -layers and assumes that all of them are already in a common coordinate -system and ready to be analized. Whenever you use more than one layer as -input to an algorithm, whether vector or raster, it is up to you to make -sure that they are all in the same coordinate system. - -Note that, due to QGIS's on-the-fly reprojecting capabilities, although -two layers might seem to overlap and match, that might not be true if -their original coordinates are used without reprojecting them onto a -common coordinate system. That reprojection should be done manually and -then use the resulting files as input to SEXTANTE. Also note that the -reprojection process can be performed with SEXTANTE, which incorporates -tools to do so. - -Data objects generated by SEXTANTE algorithms ---------------------------------------------- - -Data objects generated by SEXTANTE can be of any of the following types: - -- A raster layer - -- A vector layer - -- A table - -- An HTML file (used for text and graphical outputs) - -They are all saved to disk (there are no in-memory results), and the -parameters table will contain a text box corresponding to each one of -these outputs, where you can type the output channel to use for saving -it. An output channel contains the information needed to save the -resulting object somewhere. In the most usual case, you will save it to -a file, but the architecture of SEXTANTE allows for any other way of -storing it. For instance, a vector layer can be stored in a database or -even uploaded to a remote server using a WFS-T service. Although -solutions like these are not yet implemented, SEXTANTE is prepared to -handle them, and we expect to add new kinds of output channels in a near -feature. - -To select an output channel, just click on the button on the right side -of the text box. That will open a save-file dialog, where you can select -the desired filepath. Supported file extensions are shown in the file -format selector of the dialog, depending on the kind of output and the -algorithm. - -The format of the output is defined by the filename extension. The -supported formats depend on the ones supported by the algorithm itself. -To select a format, just select the corresponding file extension (or add -it if you are directly typing the filepath instead). If the extension of -the filepath you entered does not match any of the supported ones, a -default extension (usually ``dbf`` for tables, ``tif`` for raster layers -and ``shp`` for vector ones) will be appended to the filepath and the -file format corresponding to that extension will be used to save the -layer or table. - -If you do not enter any filename, the result will be saved as a -temporary file and in the corresponding default file format, and will be -deleted once you exit QGIS (take care with that in case you save your -project and it contains temporary layers) - -You can set a default folder for output data objects. Go to the -configuration dialog (you can open it from the SEXTANTE menu), and in -the *General* group you will find a parameter named *Output folder*. -This output folder is used as the default path in case you type just a -filename with no path (i.e. ``myfile.shp``) when executing an algorithm. - -Apart from raster layers and tables, SEXTANTE also generates graphics -and texts as HTML files. These results are shown at the end of the -algorithm execution in a new dialog. This dialog will keep the results -produced by SEXTANTE during the current session, and can be shown at any -time by selecting the *SEXTANTE results viewer* menu - -Some external applications might have files (with no particular extension restrictions) as output, but they do not belong to any of the categories above. Those outut files will not be processed by QGIS (opened or included into the current QGIS project), since most of the times correspond to file formats or elements not supported by QGIS. This is, for instance, the case with LAS files used for LiDAR data. The files get created, but you won't see anything new in your QGIS working session. - -For all the other types of outputs, you will find a check box that you can use to tell SEXTANTE not whether to load the file once it is generated by the algorithm or not. By default, all files are opened. - -SEXTANTE does not support optional outputs, so all outputs are created, but you can uncheck the corresponding check box if you are not interested in a given output, which virtually makes it behave like an optional output (although the layer is created anyway, but if you leave the text box empty, it will be saved to a temporary file and deleted once you exit QGIS) - -Configuring SEXTANTE --------------------- - -As it has been mentioned, the configuration menu gives access to a new -dialog where you can configure how SEXTANTE works. Configuration -parameters are structured in separate blocks that you can select on the -left-hand side of the dialog. - -Along with the aforementioned *Output folder* entry, the *General* block -contains parameters for setting the default rendering style for SEXTANTE -layers (that is, layers generated by using algorithms from any of the -SEXTANTE components). Just create the style you want using QGIS, save it -to a file, and then enter the path to that file in the settings so -SEXTANTE can use it. Whenever a layer is loaded by SEXTANTE and added to -the QGIS canvas, it will be rendered with that style. - -Rendering stlyes can be configured individually for each algorithm and -each one of its outputs. Just right-click on the name of the algorithm -in the toolbox and select *Edit rendering styles*. You will see a dialog -like the one shown next. - -.. figure:: rendering_styles.png - :align: center - :alt: image - - -Select the style file (\*.qml) that you want for each output and press -OK. - -Apart from the *General* block in the settings dialog, you will also -find one for each algorithm provider. They contain an *Activate* item -that you can use to make algorithms appear or not in the toolbox. Also, -some algorithm providers have their own configuration items, that we -will explain later when covering particular algorithm providers. diff --git a/python/plugins/sextante/help/_static/ajax-loader.gif b/python/plugins/sextante/help/_static/ajax-loader.gif deleted file mode 100644 index 61faf8cab239..000000000000 Binary files a/python/plugins/sextante/help/_static/ajax-loader.gif and /dev/null differ diff --git a/python/plugins/sextante/help/_static/basic.css b/python/plugins/sextante/help/_static/basic.css deleted file mode 100644 index 43e8bafaf358..000000000000 --- a/python/plugins/sextante/help/_static/basic.css +++ /dev/null @@ -1,540 +0,0 @@ -/* - * basic.css - * ~~~~~~~~~ - * - * Sphinx stylesheet -- basic theme. - * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -/* -- main layout ----------------------------------------------------------- */ - -div.clearer { - clear: both; -} - -/* -- relbar ---------------------------------------------------------------- */ - -div.related { - width: 100%; - font-size: 90%; -} - -div.related h3 { - display: none; -} - -div.related ul { - margin: 0; - padding: 0 0 0 10px; - list-style: none; -} - -div.related li { - display: inline; -} - -div.related li.right { - float: right; - margin-right: 5px; -} - -/* -- sidebar --------------------------------------------------------------- */ - -div.sphinxsidebarwrapper { - padding: 10px 5px 0 10px; -} - -div.sphinxsidebar { - float: left; - width: 230px; - margin-left: -100%; - font-size: 90%; -} - -div.sphinxsidebar ul { - list-style: none; -} - -div.sphinxsidebar ul ul, -div.sphinxsidebar ul.want-points { - margin-left: 20px; - list-style: square; -} - -div.sphinxsidebar ul ul { - margin-top: 0; - margin-bottom: 0; -} - -div.sphinxsidebar form { - margin-top: 10px; -} - -div.sphinxsidebar input { - border: 1px solid #98dbcc; - font-family: sans-serif; - font-size: 1em; -} - -div.sphinxsidebar #searchbox input[type="text"] { - width: 170px; -} - -div.sphinxsidebar #searchbox input[type="submit"] { - width: 30px; -} - -img { - border: 0; -} - -/* -- search page ----------------------------------------------------------- */ - -ul.search { - margin: 10px 0 0 20px; - padding: 0; -} - -ul.search li { - padding: 5px 0 5px 20px; - background-image: url(file.png); - background-repeat: no-repeat; - background-position: 0 7px; -} - -ul.search li a { - font-weight: bold; -} - -ul.search li div.context { - color: #888; - margin: 2px 0 0 30px; - text-align: left; -} - -ul.keywordmatches li.goodmatch a { - font-weight: bold; -} - -/* -- index page ------------------------------------------------------------ */ - -table.contentstable { - width: 90%; -} - -table.contentstable p.biglink { - line-height: 150%; -} - -a.biglink { - font-size: 1.3em; -} - -span.linkdescr { - font-style: italic; - padding-top: 5px; - font-size: 90%; -} - -/* -- general index --------------------------------------------------------- */ - -table.indextable { - width: 100%; -} - -table.indextable td { - text-align: left; - vertical-align: top; -} - -table.indextable dl, table.indextable dd { - margin-top: 0; - margin-bottom: 0; -} - -table.indextable tr.pcap { - height: 10px; -} - -table.indextable tr.cap { - margin-top: 10px; - background-color: #f2f2f2; -} - -img.toggler { - margin-right: 3px; - margin-top: 3px; - cursor: pointer; -} - -div.modindex-jumpbox { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin: 1em 0 1em 0; - padding: 0.4em; -} - -div.genindex-jumpbox { - border-top: 1px solid #ddd; - border-bottom: 1px solid #ddd; - margin: 1em 0 1em 0; - padding: 0.4em; -} - -/* -- general body styles --------------------------------------------------- */ - -a.headerlink { - visibility: hidden; -} - -h1:hover > a.headerlink, -h2:hover > a.headerlink, -h3:hover > a.headerlink, -h4:hover > a.headerlink, -h5:hover > a.headerlink, -h6:hover > a.headerlink, -dt:hover > a.headerlink { - visibility: visible; -} - -div.body p.caption { - text-align: inherit; -} - -div.body td { - text-align: left; -} - -.field-list ul { - padding-left: 1em; -} - -.first { - margin-top: 0 !important; -} - -p.rubric { - margin-top: 30px; - font-weight: bold; -} - -img.align-left, .figure.align-left, object.align-left { - clear: left; - float: left; - margin-right: 1em; -} - -img.align-right, .figure.align-right, object.align-right { - clear: right; - float: right; - margin-left: 1em; -} - -img.align-center, .figure.align-center, object.align-center { - display: block; - margin-left: auto; - margin-right: auto; -} - -.align-left { - text-align: left; -} - -.align-center { - text-align: center; -} - -.align-right { - text-align: right; -} - -/* -- sidebars -------------------------------------------------------------- */ - -div.sidebar { - margin: 0 0 0.5em 1em; - border: 1px solid #ddb; - padding: 7px 7px 0 7px; - background-color: #ffe; - width: 40%; - float: right; -} - -p.sidebar-title { - font-weight: bold; -} - -/* -- topics ---------------------------------------------------------------- */ - -div.topic { - border: 1px solid #ccc; - padding: 7px 7px 0 7px; - margin: 10px 0 10px 0; -} - -p.topic-title { - font-size: 1.1em; - font-weight: bold; - margin-top: 10px; -} - -/* -- admonitions ----------------------------------------------------------- */ - -div.admonition { - margin-top: 10px; - margin-bottom: 10px; - padding: 7px; -} - -div.admonition dt { - font-weight: bold; -} - -div.admonition dl { - margin-bottom: 0; -} - -p.admonition-title { - margin: 0px 10px 5px 0px; - font-weight: bold; -} - -div.body p.centered { - text-align: center; - margin-top: 25px; -} - -/* -- tables ---------------------------------------------------------------- */ - -table.docutils { - border: 0; - border-collapse: collapse; -} - -table.docutils td, table.docutils th { - padding: 1px 8px 1px 5px; - border-top: 0; - border-left: 0; - border-right: 0; - border-bottom: 1px solid #aaa; -} - -table.field-list td, table.field-list th { - border: 0 !important; -} - -table.footnote td, table.footnote th { - border: 0 !important; -} - -th { - text-align: left; - padding-right: 5px; -} - -table.citation { - border-left: solid 1px gray; - margin-left: 1px; -} - -table.citation td { - border-bottom: none; -} - -/* -- other body styles ----------------------------------------------------- */ - -ol.arabic { - list-style: decimal; -} - -ol.loweralpha { - list-style: lower-alpha; -} - -ol.upperalpha { - list-style: upper-alpha; -} - -ol.lowerroman { - list-style: lower-roman; -} - -ol.upperroman { - list-style: upper-roman; -} - -dl { - margin-bottom: 15px; -} - -dd p { - margin-top: 0px; -} - -dd ul, dd table { - margin-bottom: 10px; -} - -dd { - margin-top: 3px; - margin-bottom: 10px; - margin-left: 30px; -} - -dt:target, .highlighted { - background-color: #fbe54e; -} - -dl.glossary dt { - font-weight: bold; - font-size: 1.1em; -} - -.field-list ul { - margin: 0; - padding-left: 1em; -} - -.field-list p { - margin: 0; -} - -.refcount { - color: #060; -} - -.optional { - font-size: 1.3em; -} - -.versionmodified { - font-style: italic; -} - -.system-message { - background-color: #fda; - padding: 5px; - border: 3px solid red; -} - -.footnote:target { - background-color: #ffa; -} - -.line-block { - display: block; - margin-top: 1em; - margin-bottom: 1em; -} - -.line-block .line-block { - margin-top: 0; - margin-bottom: 0; - margin-left: 1.5em; -} - -.guilabel, .menuselection { - font-family: sans-serif; -} - -.accelerator { - text-decoration: underline; -} - -.classifier { - font-style: oblique; -} - -abbr, acronym { - border-bottom: dotted 1px; - cursor: help; -} - -/* -- code displays --------------------------------------------------------- */ - -pre { - overflow: auto; - overflow-y: hidden; /* fixes display issues on Chrome browsers */ -} - -td.linenos pre { - padding: 5px 0px; - border: 0; - background-color: transparent; - color: #aaa; -} - -table.highlighttable { - margin-left: 0.5em; -} - -table.highlighttable td { - padding: 0 0.5em 0 0.5em; -} - -tt.descname { - background-color: transparent; - font-weight: bold; - font-size: 1.2em; -} - -tt.descclassname { - background-color: transparent; -} - -tt.xref, a tt { - background-color: transparent; - font-weight: bold; -} - -h1 tt, h2 tt, h3 tt, h4 tt, h5 tt, h6 tt { - background-color: transparent; -} - -.viewcode-link { - float: right; -} - -.viewcode-back { - float: right; - font-family: sans-serif; -} - -div.viewcode-block:target { - margin: -1px -10px; - padding: 0 10px; -} - -/* -- math display ---------------------------------------------------------- */ - -img.math { - vertical-align: middle; -} - -div.body div.math p { - text-align: center; -} - -span.eqno { - float: right; -} - -/* -- printout stylesheet --------------------------------------------------- */ - -@media print { - div.document, - div.documentwrapper, - div.bodywrapper { - margin: 0 !important; - width: 100%; - } - - div.sphinxsidebar, - div.related, - div.footer, - #top-link { - display: none; - } -} \ No newline at end of file diff --git a/python/plugins/sextante/help/_static/comment-bright.png b/python/plugins/sextante/help/_static/comment-bright.png deleted file mode 100644 index 551517b8c83b..000000000000 Binary files a/python/plugins/sextante/help/_static/comment-bright.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/comment-close.png b/python/plugins/sextante/help/_static/comment-close.png deleted file mode 100644 index 09b54be46da3..000000000000 Binary files a/python/plugins/sextante/help/_static/comment-close.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/comment.png b/python/plugins/sextante/help/_static/comment.png deleted file mode 100644 index 92feb52b8824..000000000000 Binary files a/python/plugins/sextante/help/_static/comment.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/default.css b/python/plugins/sextante/help/_static/default.css deleted file mode 100644 index 21f3f5098d74..000000000000 --- a/python/plugins/sextante/help/_static/default.css +++ /dev/null @@ -1,256 +0,0 @@ -/* - * default.css_t - * ~~~~~~~~~~~~~ - * - * Sphinx stylesheet -- default theme. - * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -@import url("basic.css"); - -/* -- page layout ----------------------------------------------------------- */ - -body { - font-family: sans-serif; - font-size: 100%; - background-color: #11303d; - color: #000; - margin: 0; - padding: 0; -} - -div.document { - background-color: #1c4e63; -} - -div.documentwrapper { - float: left; - width: 100%; -} - -div.bodywrapper { - margin: 0 0 0 230px; -} - -div.body { - background-color: #ffffff; - color: #000000; - padding: 0 20px 30px 20px; -} - -div.footer { - color: #ffffff; - width: 100%; - padding: 9px 0 9px 0; - text-align: center; - font-size: 75%; -} - -div.footer a { - color: #ffffff; - text-decoration: underline; -} - -div.related { - background-color: #133f52; - line-height: 30px; - color: #ffffff; -} - -div.related a { - color: #ffffff; -} - -div.sphinxsidebar { -} - -div.sphinxsidebar h3 { - font-family: 'Trebuchet MS', sans-serif; - color: #ffffff; - font-size: 1.4em; - font-weight: normal; - margin: 0; - padding: 0; -} - -div.sphinxsidebar h3 a { - color: #ffffff; -} - -div.sphinxsidebar h4 { - font-family: 'Trebuchet MS', sans-serif; - color: #ffffff; - font-size: 1.3em; - font-weight: normal; - margin: 5px 0 0 0; - padding: 0; -} - -div.sphinxsidebar p { - color: #ffffff; -} - -div.sphinxsidebar p.topless { - margin: 5px 10px 10px 10px; -} - -div.sphinxsidebar ul { - margin: 10px; - padding: 0; - color: #ffffff; -} - -div.sphinxsidebar a { - color: #98dbcc; -} - -div.sphinxsidebar input { - border: 1px solid #98dbcc; - font-family: sans-serif; - font-size: 1em; -} - - - -/* -- hyperlink styles ------------------------------------------------------ */ - -a { - color: #355f7c; - text-decoration: none; -} - -a:visited { - color: #355f7c; - text-decoration: none; -} - -a:hover { - text-decoration: underline; -} - - - -/* -- body styles ----------------------------------------------------------- */ - -div.body h1, -div.body h2, -div.body h3, -div.body h4, -div.body h5, -div.body h6 { - font-family: 'Trebuchet MS', sans-serif; - background-color: #f2f2f2; - font-weight: normal; - color: #20435c; - border-bottom: 1px solid #ccc; - margin: 20px -20px 10px -20px; - padding: 3px 0 3px 10px; -} - -div.body h1 { margin-top: 0; font-size: 200%; } -div.body h2 { font-size: 160%; } -div.body h3 { font-size: 140%; } -div.body h4 { font-size: 120%; } -div.body h5 { font-size: 110%; } -div.body h6 { font-size: 100%; } - -a.headerlink { - color: #c60f0f; - font-size: 0.8em; - padding: 0 4px 0 4px; - text-decoration: none; -} - -a.headerlink:hover { - background-color: #c60f0f; - color: white; -} - -div.body p, div.body dd, div.body li { - text-align: justify; - line-height: 130%; -} - -div.admonition p.admonition-title + p { - display: inline; -} - -div.admonition p { - margin-bottom: 5px; -} - -div.admonition pre { - margin-bottom: 5px; -} - -div.admonition ul, div.admonition ol { - margin-bottom: 5px; -} - -div.note { - background-color: #eee; - border: 1px solid #ccc; -} - -div.seealso { - background-color: #ffc; - border: 1px solid #ff6; -} - -div.topic { - background-color: #eee; -} - -div.warning { - background-color: #ffe4e4; - border: 1px solid #f66; -} - -p.admonition-title { - display: inline; -} - -p.admonition-title:after { - content: ":"; -} - -pre { - padding: 5px; - background-color: #eeffcc; - color: #333333; - line-height: 120%; - border: 1px solid #ac9; - border-left: none; - border-right: none; -} - -tt { - background-color: #ecf0f3; - padding: 0 1px 0 1px; - font-size: 0.95em; -} - -th { - background-color: #ede; -} - -.warning tt { - background: #efc2c2; -} - -.note tt { - background: #d6d6d6; -} - -.viewcode-back { - font-family: sans-serif; -} - -div.viewcode-block:target { - background-color: #f4debf; - border-top: 1px solid #ac9; - border-bottom: 1px solid #ac9; -} \ No newline at end of file diff --git a/python/plugins/sextante/help/_static/doctools.js b/python/plugins/sextante/help/_static/doctools.js deleted file mode 100644 index d4619fdfb10d..000000000000 --- a/python/plugins/sextante/help/_static/doctools.js +++ /dev/null @@ -1,247 +0,0 @@ -/* - * doctools.js - * ~~~~~~~~~~~ - * - * Sphinx JavaScript utilities for all documentation. - * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -/** - * select a different prefix for underscore - */ -$u = _.noConflict(); - -/** - * make the code below compatible with browsers without - * an installed firebug like debugger -if (!window.console || !console.firebug) { - var names = ["log", "debug", "info", "warn", "error", "assert", "dir", - "dirxml", "group", "groupEnd", "time", "timeEnd", "count", "trace", - "profile", "profileEnd"]; - window.console = {}; - for (var i = 0; i < names.length; ++i) - window.console[names[i]] = function() {}; -} - */ - -/** - * small helper function to urldecode strings - */ -jQuery.urldecode = function(x) { - return decodeURIComponent(x).replace(/\+/g, ' '); -} - -/** - * small helper function to urlencode strings - */ -jQuery.urlencode = encodeURIComponent; - -/** - * This function returns the parsed url parameters of the - * current request. Multiple values per key are supported, - * it will always return arrays of strings for the value parts. - */ -jQuery.getQueryParameters = function(s) { - if (typeof s == 'undefined') - s = document.location.search; - var parts = s.substr(s.indexOf('?') + 1).split('&'); - var result = {}; - for (var i = 0; i < parts.length; i++) { - var tmp = parts[i].split('=', 2); - var key = jQuery.urldecode(tmp[0]); - var value = jQuery.urldecode(tmp[1]); - if (key in result) - result[key].push(value); - else - result[key] = [value]; - } - return result; -}; - -/** - * small function to check if an array contains - * a given item. - */ -jQuery.contains = function(arr, item) { - for (var i = 0; i < arr.length; i++) { - if (arr[i] == item) - return true; - } - return false; -}; - -/** - * highlight a given string on a jquery object by wrapping it in - * span elements with the given class name. - */ -jQuery.fn.highlightText = function(text, className) { - function highlight(node) { - if (node.nodeType == 3) { - var val = node.nodeValue; - var pos = val.toLowerCase().indexOf(text); - if (pos >= 0 && !jQuery(node.parentNode).hasClass(className)) { - var span = document.createElement("span"); - span.className = className; - span.appendChild(document.createTextNode(val.substr(pos, text.length))); - node.parentNode.insertBefore(span, node.parentNode.insertBefore( - document.createTextNode(val.substr(pos + text.length)), - node.nextSibling)); - node.nodeValue = val.substr(0, pos); - } - } - else if (!jQuery(node).is("button, select, textarea")) { - jQuery.each(node.childNodes, function() { - highlight(this); - }); - } - } - return this.each(function() { - highlight(this); - }); -}; - -/** - * Small JavaScript module for the documentation. - */ -var Documentation = { - - init : function() { - this.fixFirefoxAnchorBug(); - this.highlightSearchWords(); - this.initIndexTable(); - }, - - /** - * i18n support - */ - TRANSLATIONS : {}, - PLURAL_EXPR : function(n) { return n == 1 ? 0 : 1; }, - LOCALE : 'unknown', - - // gettext and ngettext don't access this so that the functions - // can safely bound to a different name (_ = Documentation.gettext) - gettext : function(string) { - var translated = Documentation.TRANSLATIONS[string]; - if (typeof translated == 'undefined') - return string; - return (typeof translated == 'string') ? translated : translated[0]; - }, - - ngettext : function(singular, plural, n) { - var translated = Documentation.TRANSLATIONS[singular]; - if (typeof translated == 'undefined') - return (n == 1) ? singular : plural; - return translated[Documentation.PLURALEXPR(n)]; - }, - - addTranslations : function(catalog) { - for (var key in catalog.messages) - this.TRANSLATIONS[key] = catalog.messages[key]; - this.PLURAL_EXPR = new Function('n', 'return +(' + catalog.plural_expr + ')'); - this.LOCALE = catalog.locale; - }, - - /** - * add context elements like header anchor links - */ - addContextElements : function() { - $('div[id] > :header:first').each(function() { - $('\u00B6'). - attr('href', '#' + this.id). - attr('title', _('Permalink to this headline')). - appendTo(this); - }); - $('dt[id]').each(function() { - $('\u00B6'). - attr('href', '#' + this.id). - attr('title', _('Permalink to this definition')). - appendTo(this); - }); - }, - - /** - * workaround a firefox stupidity - */ - fixFirefoxAnchorBug : function() { - if (document.location.hash && $.browser.mozilla) - window.setTimeout(function() { - document.location.href += ''; - }, 10); - }, - - /** - * highlight the search words provided in the url in the text - */ - highlightSearchWords : function() { - var params = $.getQueryParameters(); - var terms = (params.highlight) ? params.highlight[0].split(/\s+/) : []; - if (terms.length) { - var body = $('div.body'); - window.setTimeout(function() { - $.each(terms, function() { - body.highlightText(this.toLowerCase(), 'highlighted'); - }); - }, 10); - $('

' + _('Hide Search Matches') + '

') - .appendTo($('#searchbox')); - } - }, - - /** - * init the domain index toggle buttons - */ - initIndexTable : function() { - var togglers = $('img.toggler').click(function() { - var src = $(this).attr('src'); - var idnum = $(this).attr('id').substr(7); - $('tr.cg-' + idnum).toggle(); - if (src.substr(-9) == 'minus.png') - $(this).attr('src', src.substr(0, src.length-9) + 'plus.png'); - else - $(this).attr('src', src.substr(0, src.length-8) + 'minus.png'); - }).css('display', ''); - if (DOCUMENTATION_OPTIONS.COLLAPSE_INDEX) { - togglers.click(); - } - }, - - /** - * helper function to hide the search marks again - */ - hideSearchWords : function() { - $('#searchbox .highlight-link').fadeOut(300); - $('span.highlighted').removeClass('highlighted'); - }, - - /** - * make the url absolute - */ - makeURL : function(relativeURL) { - return DOCUMENTATION_OPTIONS.URL_ROOT + '/' + relativeURL; - }, - - /** - * get the current relative url - */ - getCurrentURL : function() { - var path = document.location.pathname; - var parts = path.split(/\//); - $.each(DOCUMENTATION_OPTIONS.URL_ROOT.split(/\//), function() { - if (this == '..') - parts.pop(); - }); - var url = parts.join('/'); - return path.substring(url.lastIndexOf('/') + 1, path.length - 1); - } -}; - -// quick alias for translations -_ = Documentation.gettext; - -$(document).ready(function() { - Documentation.init(); -}); diff --git a/python/plugins/sextante/help/_static/down-pressed.png b/python/plugins/sextante/help/_static/down-pressed.png deleted file mode 100644 index 6f7ad782782e..000000000000 Binary files a/python/plugins/sextante/help/_static/down-pressed.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/down.png b/python/plugins/sextante/help/_static/down.png deleted file mode 100644 index 3003a88770de..000000000000 Binary files a/python/plugins/sextante/help/_static/down.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/file.png b/python/plugins/sextante/help/_static/file.png deleted file mode 100644 index d18082e397e7..000000000000 Binary files a/python/plugins/sextante/help/_static/file.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/jquery.js b/python/plugins/sextante/help/_static/jquery.js deleted file mode 100644 index 7c2430802337..000000000000 --- a/python/plugins/sextante/help/_static/jquery.js +++ /dev/null @@ -1,154 +0,0 @@ -/*! - * jQuery JavaScript Library v1.4.2 - * http://jquery.com/ - * - * Copyright 2010, John Resig - * Dual licensed under the MIT or GPL Version 2 licenses. - * http://jquery.org/license - * - * Includes Sizzle.js - * http://sizzlejs.com/ - * Copyright 2010, The Dojo Foundation - * Released under the MIT, BSD, and GPL Licenses. - * - * Date: Sat Feb 13 22:33:48 2010 -0500 - */ -(function(A,w){function ma(){if(!c.isReady){try{s.documentElement.doScroll("left")}catch(a){setTimeout(ma,1);return}c.ready()}}function Qa(a,b){b.src?c.ajax({url:b.src,async:false,dataType:"script"}):c.globalEval(b.text||b.textContent||b.innerHTML||"");b.parentNode&&b.parentNode.removeChild(b)}function X(a,b,d,f,e,j){var i=a.length;if(typeof b==="object"){for(var o in b)X(a,o,b[o],f,e,d);return a}if(d!==w){f=!j&&f&&c.isFunction(d);for(o=0;o)[^>]*$|^#([\w-]+)$/,Ua=/^.[^:#\[\.,]*$/,Va=/\S/, -Wa=/^(\s|\u00A0)+|(\s|\u00A0)+$/g,Xa=/^<(\w+)\s*\/?>(?:<\/\1>)?$/,P=navigator.userAgent,xa=false,Q=[],L,$=Object.prototype.toString,aa=Object.prototype.hasOwnProperty,ba=Array.prototype.push,R=Array.prototype.slice,ya=Array.prototype.indexOf;c.fn=c.prototype={init:function(a,b){var d,f;if(!a)return this;if(a.nodeType){this.context=this[0]=a;this.length=1;return this}if(a==="body"&&!b){this.context=s;this[0]=s.body;this.selector="body";this.length=1;return this}if(typeof a==="string")if((d=Ta.exec(a))&& -(d[1]||!b))if(d[1]){f=b?b.ownerDocument||b:s;if(a=Xa.exec(a))if(c.isPlainObject(b)){a=[s.createElement(a[1])];c.fn.attr.call(a,b,true)}else a=[f.createElement(a[1])];else{a=sa([d[1]],[f]);a=(a.cacheable?a.fragment.cloneNode(true):a.fragment).childNodes}return c.merge(this,a)}else{if(b=s.getElementById(d[2])){if(b.id!==d[2])return T.find(a);this.length=1;this[0]=b}this.context=s;this.selector=a;return this}else if(!b&&/^\w+$/.test(a)){this.selector=a;this.context=s;a=s.getElementsByTagName(a);return c.merge(this, -a)}else return!b||b.jquery?(b||T).find(a):c(b).find(a);else if(c.isFunction(a))return T.ready(a);if(a.selector!==w){this.selector=a.selector;this.context=a.context}return c.makeArray(a,this)},selector:"",jquery:"1.4.2",length:0,size:function(){return this.length},toArray:function(){return R.call(this,0)},get:function(a){return a==null?this.toArray():a<0?this.slice(a)[0]:this[a]},pushStack:function(a,b,d){var f=c();c.isArray(a)?ba.apply(f,a):c.merge(f,a);f.prevObject=this;f.context=this.context;if(b=== -"find")f.selector=this.selector+(this.selector?" ":"")+d;else if(b)f.selector=this.selector+"."+b+"("+d+")";return f},each:function(a,b){return c.each(this,a,b)},ready:function(a){c.bindReady();if(c.isReady)a.call(s,c);else Q&&Q.push(a);return this},eq:function(a){return a===-1?this.slice(a):this.slice(a,+a+1)},first:function(){return this.eq(0)},last:function(){return this.eq(-1)},slice:function(){return this.pushStack(R.apply(this,arguments),"slice",R.call(arguments).join(","))},map:function(a){return this.pushStack(c.map(this, -function(b,d){return a.call(b,d,b)}))},end:function(){return this.prevObject||c(null)},push:ba,sort:[].sort,splice:[].splice};c.fn.init.prototype=c.fn;c.extend=c.fn.extend=function(){var a=arguments[0]||{},b=1,d=arguments.length,f=false,e,j,i,o;if(typeof a==="boolean"){f=a;a=arguments[1]||{};b=2}if(typeof a!=="object"&&!c.isFunction(a))a={};if(d===b){a=this;--b}for(;b
a"; -var e=d.getElementsByTagName("*"),j=d.getElementsByTagName("a")[0];if(!(!e||!e.length||!j)){c.support={leadingWhitespace:d.firstChild.nodeType===3,tbody:!d.getElementsByTagName("tbody").length,htmlSerialize:!!d.getElementsByTagName("link").length,style:/red/.test(j.getAttribute("style")),hrefNormalized:j.getAttribute("href")==="/a",opacity:/^0.55$/.test(j.style.opacity),cssFloat:!!j.style.cssFloat,checkOn:d.getElementsByTagName("input")[0].value==="on",optSelected:s.createElement("select").appendChild(s.createElement("option")).selected, -parentNode:d.removeChild(d.appendChild(s.createElement("div"))).parentNode===null,deleteExpando:true,checkClone:false,scriptEval:false,noCloneEvent:true,boxModel:null};b.type="text/javascript";try{b.appendChild(s.createTextNode("window."+f+"=1;"))}catch(i){}a.insertBefore(b,a.firstChild);if(A[f]){c.support.scriptEval=true;delete A[f]}try{delete b.test}catch(o){c.support.deleteExpando=false}a.removeChild(b);if(d.attachEvent&&d.fireEvent){d.attachEvent("onclick",function k(){c.support.noCloneEvent= -false;d.detachEvent("onclick",k)});d.cloneNode(true).fireEvent("onclick")}d=s.createElement("div");d.innerHTML="";a=s.createDocumentFragment();a.appendChild(d.firstChild);c.support.checkClone=a.cloneNode(true).cloneNode(true).lastChild.checked;c(function(){var k=s.createElement("div");k.style.width=k.style.paddingLeft="1px";s.body.appendChild(k);c.boxModel=c.support.boxModel=k.offsetWidth===2;s.body.removeChild(k).style.display="none"});a=function(k){var n= -s.createElement("div");k="on"+k;var r=k in n;if(!r){n.setAttribute(k,"return;");r=typeof n[k]==="function"}return r};c.support.submitBubbles=a("submit");c.support.changeBubbles=a("change");a=b=d=e=j=null}})();c.props={"for":"htmlFor","class":"className",readonly:"readOnly",maxlength:"maxLength",cellspacing:"cellSpacing",rowspan:"rowSpan",colspan:"colSpan",tabindex:"tabIndex",usemap:"useMap",frameborder:"frameBorder"};var G="jQuery"+J(),Ya=0,za={};c.extend({cache:{},expando:G,noData:{embed:true,object:true, -applet:true},data:function(a,b,d){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var f=a[G],e=c.cache;if(!f&&typeof b==="string"&&d===w)return null;f||(f=++Ya);if(typeof b==="object"){a[G]=f;e[f]=c.extend(true,{},b)}else if(!e[f]){a[G]=f;e[f]={}}a=e[f];if(d!==w)a[b]=d;return typeof b==="string"?a[b]:a}},removeData:function(a,b){if(!(a.nodeName&&c.noData[a.nodeName.toLowerCase()])){a=a==A?za:a;var d=a[G],f=c.cache,e=f[d];if(b){if(e){delete e[b];c.isEmptyObject(e)&&c.removeData(a)}}else{if(c.support.deleteExpando)delete a[c.expando]; -else a.removeAttribute&&a.removeAttribute(c.expando);delete f[d]}}}});c.fn.extend({data:function(a,b){if(typeof a==="undefined"&&this.length)return c.data(this[0]);else if(typeof a==="object")return this.each(function(){c.data(this,a)});var d=a.split(".");d[1]=d[1]?"."+d[1]:"";if(b===w){var f=this.triggerHandler("getData"+d[1]+"!",[d[0]]);if(f===w&&this.length)f=c.data(this[0],a);return f===w&&d[1]?this.data(d[0]):f}else return this.trigger("setData"+d[1]+"!",[d[0],b]).each(function(){c.data(this, -a,b)})},removeData:function(a){return this.each(function(){c.removeData(this,a)})}});c.extend({queue:function(a,b,d){if(a){b=(b||"fx")+"queue";var f=c.data(a,b);if(!d)return f||[];if(!f||c.isArray(d))f=c.data(a,b,c.makeArray(d));else f.push(d);return f}},dequeue:function(a,b){b=b||"fx";var d=c.queue(a,b),f=d.shift();if(f==="inprogress")f=d.shift();if(f){b==="fx"&&d.unshift("inprogress");f.call(a,function(){c.dequeue(a,b)})}}});c.fn.extend({queue:function(a,b){if(typeof a!=="string"){b=a;a="fx"}if(b=== -w)return c.queue(this[0],a);return this.each(function(){var d=c.queue(this,a,b);a==="fx"&&d[0]!=="inprogress"&&c.dequeue(this,a)})},dequeue:function(a){return this.each(function(){c.dequeue(this,a)})},delay:function(a,b){a=c.fx?c.fx.speeds[a]||a:a;b=b||"fx";return this.queue(b,function(){var d=this;setTimeout(function(){c.dequeue(d,b)},a)})},clearQueue:function(a){return this.queue(a||"fx",[])}});var Aa=/[\n\t]/g,ca=/\s+/,Za=/\r/g,$a=/href|src|style/,ab=/(button|input)/i,bb=/(button|input|object|select|textarea)/i, -cb=/^(a|area)$/i,Ba=/radio|checkbox/;c.fn.extend({attr:function(a,b){return X(this,a,b,true,c.attr)},removeAttr:function(a){return this.each(function(){c.attr(this,a,"");this.nodeType===1&&this.removeAttribute(a)})},addClass:function(a){if(c.isFunction(a))return this.each(function(n){var r=c(this);r.addClass(a.call(this,n,r.attr("class")))});if(a&&typeof a==="string")for(var b=(a||"").split(ca),d=0,f=this.length;d-1)return true;return false},val:function(a){if(a===w){var b=this[0];if(b){if(c.nodeName(b,"option"))return(b.attributes.value||{}).specified?b.value:b.text;if(c.nodeName(b,"select")){var d=b.selectedIndex,f=[],e=b.options;b=b.type==="select-one";if(d<0)return null;var j=b?d:0;for(d=b?d+1:e.length;j=0;else if(c.nodeName(this,"select")){var u=c.makeArray(r);c("option",this).each(function(){this.selected= -c.inArray(c(this).val(),u)>=0});if(!u.length)this.selectedIndex=-1}else this.value=r}})}});c.extend({attrFn:{val:true,css:true,html:true,text:true,data:true,width:true,height:true,offset:true},attr:function(a,b,d,f){if(!a||a.nodeType===3||a.nodeType===8)return w;if(f&&b in c.attrFn)return c(a)[b](d);f=a.nodeType!==1||!c.isXMLDoc(a);var e=d!==w;b=f&&c.props[b]||b;if(a.nodeType===1){var j=$a.test(b);if(b in a&&f&&!j){if(e){b==="type"&&ab.test(a.nodeName)&&a.parentNode&&c.error("type property can't be changed"); -a[b]=d}if(c.nodeName(a,"form")&&a.getAttributeNode(b))return a.getAttributeNode(b).nodeValue;if(b==="tabIndex")return(b=a.getAttributeNode("tabIndex"))&&b.specified?b.value:bb.test(a.nodeName)||cb.test(a.nodeName)&&a.href?0:w;return a[b]}if(!c.support.style&&f&&b==="style"){if(e)a.style.cssText=""+d;return a.style.cssText}e&&a.setAttribute(b,""+d);a=!c.support.hrefNormalized&&f&&j?a.getAttribute(b,2):a.getAttribute(b);return a===null?w:a}return c.style(a,b,d)}});var O=/\.(.*)$/,db=function(a){return a.replace(/[^\w\s\.\|`]/g, -function(b){return"\\"+b})};c.event={add:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){if(a.setInterval&&a!==A&&!a.frameElement)a=A;var e,j;if(d.handler){e=d;d=e.handler}if(!d.guid)d.guid=c.guid++;if(j=c.data(a)){var i=j.events=j.events||{},o=j.handle;if(!o)j.handle=o=function(){return typeof c!=="undefined"&&!c.event.triggered?c.event.handle.apply(o.elem,arguments):w};o.elem=a;b=b.split(" ");for(var k,n=0,r;k=b[n++];){j=e?c.extend({},e):{handler:d,data:f};if(k.indexOf(".")>-1){r=k.split("."); -k=r.shift();j.namespace=r.slice(0).sort().join(".")}else{r=[];j.namespace=""}j.type=k;j.guid=d.guid;var u=i[k],z=c.event.special[k]||{};if(!u){u=i[k]=[];if(!z.setup||z.setup.call(a,f,r,o)===false)if(a.addEventListener)a.addEventListener(k,o,false);else a.attachEvent&&a.attachEvent("on"+k,o)}if(z.add){z.add.call(a,j);if(!j.handler.guid)j.handler.guid=d.guid}u.push(j);c.event.global[k]=true}a=null}}},global:{},remove:function(a,b,d,f){if(!(a.nodeType===3||a.nodeType===8)){var e,j=0,i,o,k,n,r,u,z=c.data(a), -C=z&&z.events;if(z&&C){if(b&&b.type){d=b.handler;b=b.type}if(!b||typeof b==="string"&&b.charAt(0)==="."){b=b||"";for(e in C)c.event.remove(a,e+b)}else{for(b=b.split(" ");e=b[j++];){n=e;i=e.indexOf(".")<0;o=[];if(!i){o=e.split(".");e=o.shift();k=new RegExp("(^|\\.)"+c.map(o.slice(0).sort(),db).join("\\.(?:.*\\.)?")+"(\\.|$)")}if(r=C[e])if(d){n=c.event.special[e]||{};for(B=f||0;B=0){a.type= -e=e.slice(0,-1);a.exclusive=true}if(!d){a.stopPropagation();c.event.global[e]&&c.each(c.cache,function(){this.events&&this.events[e]&&c.event.trigger(a,b,this.handle.elem)})}if(!d||d.nodeType===3||d.nodeType===8)return w;a.result=w;a.target=d;b=c.makeArray(b);b.unshift(a)}a.currentTarget=d;(f=c.data(d,"handle"))&&f.apply(d,b);f=d.parentNode||d.ownerDocument;try{if(!(d&&d.nodeName&&c.noData[d.nodeName.toLowerCase()]))if(d["on"+e]&&d["on"+e].apply(d,b)===false)a.result=false}catch(j){}if(!a.isPropagationStopped()&& -f)c.event.trigger(a,b,f,true);else if(!a.isDefaultPrevented()){f=a.target;var i,o=c.nodeName(f,"a")&&e==="click",k=c.event.special[e]||{};if((!k._default||k._default.call(d,a)===false)&&!o&&!(f&&f.nodeName&&c.noData[f.nodeName.toLowerCase()])){try{if(f[e]){if(i=f["on"+e])f["on"+e]=null;c.event.triggered=true;f[e]()}}catch(n){}if(i)f["on"+e]=i;c.event.triggered=false}}},handle:function(a){var b,d,f,e;a=arguments[0]=c.event.fix(a||A.event);a.currentTarget=this;b=a.type.indexOf(".")<0&&!a.exclusive; -if(!b){d=a.type.split(".");a.type=d.shift();f=new RegExp("(^|\\.)"+d.slice(0).sort().join("\\.(?:.*\\.)?")+"(\\.|$)")}e=c.data(this,"events");d=e[a.type];if(e&&d){d=d.slice(0);e=0;for(var j=d.length;e-1?c.map(a.options,function(f){return f.selected}).join("-"):"";else if(a.nodeName.toLowerCase()==="select")d=a.selectedIndex;return d},fa=function(a,b){var d=a.target,f,e;if(!(!da.test(d.nodeName)||d.readOnly)){f=c.data(d,"_change_data");e=Fa(d);if(a.type!=="focusout"||d.type!=="radio")c.data(d,"_change_data", -e);if(!(f===w||e===f))if(f!=null||e){a.type="change";return c.event.trigger(a,b,d)}}};c.event.special.change={filters:{focusout:fa,click:function(a){var b=a.target,d=b.type;if(d==="radio"||d==="checkbox"||b.nodeName.toLowerCase()==="select")return fa.call(this,a)},keydown:function(a){var b=a.target,d=b.type;if(a.keyCode===13&&b.nodeName.toLowerCase()!=="textarea"||a.keyCode===32&&(d==="checkbox"||d==="radio")||d==="select-multiple")return fa.call(this,a)},beforeactivate:function(a){a=a.target;c.data(a, -"_change_data",Fa(a))}},setup:function(){if(this.type==="file")return false;for(var a in ea)c.event.add(this,a+".specialChange",ea[a]);return da.test(this.nodeName)},teardown:function(){c.event.remove(this,".specialChange");return da.test(this.nodeName)}};ea=c.event.special.change.filters}s.addEventListener&&c.each({focus:"focusin",blur:"focusout"},function(a,b){function d(f){f=c.event.fix(f);f.type=b;return c.event.handle.call(this,f)}c.event.special[b]={setup:function(){this.addEventListener(a, -d,true)},teardown:function(){this.removeEventListener(a,d,true)}}});c.each(["bind","one"],function(a,b){c.fn[b]=function(d,f,e){if(typeof d==="object"){for(var j in d)this[b](j,f,d[j],e);return this}if(c.isFunction(f)){e=f;f=w}var i=b==="one"?c.proxy(e,function(k){c(this).unbind(k,i);return e.apply(this,arguments)}):e;if(d==="unload"&&b!=="one")this.one(d,f,e);else{j=0;for(var o=this.length;j0){y=t;break}}t=t[g]}m[q]=y}}}var f=/((?:\((?:\([^()]+\)|[^()]+)+\)|\[(?:\[[^[\]]*\]|['"][^'"]*['"]|[^[\]'"]+)+\]|\\.|[^ >+~,(\[\\]+)+|[>+~])(\s*,\s*)?((?:.|\r|\n)*)/g, -e=0,j=Object.prototype.toString,i=false,o=true;[0,0].sort(function(){o=false;return 0});var k=function(g,h,l,m){l=l||[];var q=h=h||s;if(h.nodeType!==1&&h.nodeType!==9)return[];if(!g||typeof g!=="string")return l;for(var p=[],v,t,y,S,H=true,M=x(h),I=g;(f.exec(""),v=f.exec(I))!==null;){I=v[3];p.push(v[1]);if(v[2]){S=v[3];break}}if(p.length>1&&r.exec(g))if(p.length===2&&n.relative[p[0]])t=ga(p[0]+p[1],h);else for(t=n.relative[p[0]]?[h]:k(p.shift(),h);p.length;){g=p.shift();if(n.relative[g])g+=p.shift(); -t=ga(g,t)}else{if(!m&&p.length>1&&h.nodeType===9&&!M&&n.match.ID.test(p[0])&&!n.match.ID.test(p[p.length-1])){v=k.find(p.shift(),h,M);h=v.expr?k.filter(v.expr,v.set)[0]:v.set[0]}if(h){v=m?{expr:p.pop(),set:z(m)}:k.find(p.pop(),p.length===1&&(p[0]==="~"||p[0]==="+")&&h.parentNode?h.parentNode:h,M);t=v.expr?k.filter(v.expr,v.set):v.set;if(p.length>0)y=z(t);else H=false;for(;p.length;){var D=p.pop();v=D;if(n.relative[D])v=p.pop();else D="";if(v==null)v=h;n.relative[D](y,v,M)}}else y=[]}y||(y=t);y||k.error(D|| -g);if(j.call(y)==="[object Array]")if(H)if(h&&h.nodeType===1)for(g=0;y[g]!=null;g++){if(y[g]&&(y[g]===true||y[g].nodeType===1&&E(h,y[g])))l.push(t[g])}else for(g=0;y[g]!=null;g++)y[g]&&y[g].nodeType===1&&l.push(t[g]);else l.push.apply(l,y);else z(y,l);if(S){k(S,q,l,m);k.uniqueSort(l)}return l};k.uniqueSort=function(g){if(B){i=o;g.sort(B);if(i)for(var h=1;h":function(g,h){var l=typeof h==="string";if(l&&!/\W/.test(h)){h=h.toLowerCase();for(var m=0,q=g.length;m=0))l||m.push(v);else if(l)h[p]=false;return false},ID:function(g){return g[1].replace(/\\/g,"")},TAG:function(g){return g[1].toLowerCase()}, -CHILD:function(g){if(g[1]==="nth"){var h=/(-?)(\d*)n((?:\+|-)?\d*)/.exec(g[2]==="even"&&"2n"||g[2]==="odd"&&"2n+1"||!/\D/.test(g[2])&&"0n+"+g[2]||g[2]);g[2]=h[1]+(h[2]||1)-0;g[3]=h[3]-0}g[0]=e++;return g},ATTR:function(g,h,l,m,q,p){h=g[1].replace(/\\/g,"");if(!p&&n.attrMap[h])g[1]=n.attrMap[h];if(g[2]==="~=")g[4]=" "+g[4]+" ";return g},PSEUDO:function(g,h,l,m,q){if(g[1]==="not")if((f.exec(g[3])||"").length>1||/^\w/.test(g[3]))g[3]=k(g[3],null,null,h);else{g=k.filter(g[3],h,l,true^q);l||m.push.apply(m, -g);return false}else if(n.match.POS.test(g[0])||n.match.CHILD.test(g[0]))return true;return g},POS:function(g){g.unshift(true);return g}},filters:{enabled:function(g){return g.disabled===false&&g.type!=="hidden"},disabled:function(g){return g.disabled===true},checked:function(g){return g.checked===true},selected:function(g){return g.selected===true},parent:function(g){return!!g.firstChild},empty:function(g){return!g.firstChild},has:function(g,h,l){return!!k(l[3],g).length},header:function(g){return/h\d/i.test(g.nodeName)}, -text:function(g){return"text"===g.type},radio:function(g){return"radio"===g.type},checkbox:function(g){return"checkbox"===g.type},file:function(g){return"file"===g.type},password:function(g){return"password"===g.type},submit:function(g){return"submit"===g.type},image:function(g){return"image"===g.type},reset:function(g){return"reset"===g.type},button:function(g){return"button"===g.type||g.nodeName.toLowerCase()==="button"},input:function(g){return/input|select|textarea|button/i.test(g.nodeName)}}, -setFilters:{first:function(g,h){return h===0},last:function(g,h,l,m){return h===m.length-1},even:function(g,h){return h%2===0},odd:function(g,h){return h%2===1},lt:function(g,h,l){return hl[3]-0},nth:function(g,h,l){return l[3]-0===h},eq:function(g,h,l){return l[3]-0===h}},filter:{PSEUDO:function(g,h,l,m){var q=h[1],p=n.filters[q];if(p)return p(g,l,h,m);else if(q==="contains")return(g.textContent||g.innerText||a([g])||"").indexOf(h[3])>=0;else if(q==="not"){h= -h[3];l=0;for(m=h.length;l=0}},ID:function(g,h){return g.nodeType===1&&g.getAttribute("id")===h},TAG:function(g,h){return h==="*"&&g.nodeType===1||g.nodeName.toLowerCase()===h},CLASS:function(g,h){return(" "+(g.className||g.getAttribute("class"))+" ").indexOf(h)>-1},ATTR:function(g,h){var l=h[1];g=n.attrHandle[l]?n.attrHandle[l](g):g[l]!=null?g[l]:g.getAttribute(l);l=g+"";var m=h[2];h=h[4];return g==null?m==="!=":m=== -"="?l===h:m==="*="?l.indexOf(h)>=0:m==="~="?(" "+l+" ").indexOf(h)>=0:!h?l&&g!==false:m==="!="?l!==h:m==="^="?l.indexOf(h)===0:m==="$="?l.substr(l.length-h.length)===h:m==="|="?l===h||l.substr(0,h.length+1)===h+"-":false},POS:function(g,h,l,m){var q=n.setFilters[h[2]];if(q)return q(g,l,h,m)}}},r=n.match.POS;for(var u in n.match){n.match[u]=new RegExp(n.match[u].source+/(?![^\[]*\])(?![^\(]*\))/.source);n.leftMatch[u]=new RegExp(/(^(?:.|\r|\n)*?)/.source+n.match[u].source.replace(/\\(\d+)/g,function(g, -h){return"\\"+(h-0+1)}))}var z=function(g,h){g=Array.prototype.slice.call(g,0);if(h){h.push.apply(h,g);return h}return g};try{Array.prototype.slice.call(s.documentElement.childNodes,0)}catch(C){z=function(g,h){h=h||[];if(j.call(g)==="[object Array]")Array.prototype.push.apply(h,g);else if(typeof g.length==="number")for(var l=0,m=g.length;l";var l=s.documentElement;l.insertBefore(g,l.firstChild);if(s.getElementById(h)){n.find.ID=function(m,q,p){if(typeof q.getElementById!=="undefined"&&!p)return(q=q.getElementById(m[1]))?q.id===m[1]||typeof q.getAttributeNode!=="undefined"&& -q.getAttributeNode("id").nodeValue===m[1]?[q]:w:[]};n.filter.ID=function(m,q){var p=typeof m.getAttributeNode!=="undefined"&&m.getAttributeNode("id");return m.nodeType===1&&p&&p.nodeValue===q}}l.removeChild(g);l=g=null})();(function(){var g=s.createElement("div");g.appendChild(s.createComment(""));if(g.getElementsByTagName("*").length>0)n.find.TAG=function(h,l){l=l.getElementsByTagName(h[1]);if(h[1]==="*"){h=[];for(var m=0;l[m];m++)l[m].nodeType===1&&h.push(l[m]);l=h}return l};g.innerHTML=""; -if(g.firstChild&&typeof g.firstChild.getAttribute!=="undefined"&&g.firstChild.getAttribute("href")!=="#")n.attrHandle.href=function(h){return h.getAttribute("href",2)};g=null})();s.querySelectorAll&&function(){var g=k,h=s.createElement("div");h.innerHTML="

";if(!(h.querySelectorAll&&h.querySelectorAll(".TEST").length===0)){k=function(m,q,p,v){q=q||s;if(!v&&q.nodeType===9&&!x(q))try{return z(q.querySelectorAll(m),p)}catch(t){}return g(m,q,p,v)};for(var l in g)k[l]=g[l];h=null}}(); -(function(){var g=s.createElement("div");g.innerHTML="
";if(!(!g.getElementsByClassName||g.getElementsByClassName("e").length===0)){g.lastChild.className="e";if(g.getElementsByClassName("e").length!==1){n.order.splice(1,0,"CLASS");n.find.CLASS=function(h,l,m){if(typeof l.getElementsByClassName!=="undefined"&&!m)return l.getElementsByClassName(h[1])};g=null}}})();var E=s.compareDocumentPosition?function(g,h){return!!(g.compareDocumentPosition(h)&16)}: -function(g,h){return g!==h&&(g.contains?g.contains(h):true)},x=function(g){return(g=(g?g.ownerDocument||g:0).documentElement)?g.nodeName!=="HTML":false},ga=function(g,h){var l=[],m="",q;for(h=h.nodeType?[h]:h;q=n.match.PSEUDO.exec(g);){m+=q[0];g=g.replace(n.match.PSEUDO,"")}g=n.relative[g]?g+"*":g;q=0;for(var p=h.length;q=0===d})};c.fn.extend({find:function(a){for(var b=this.pushStack("","find",a),d=0,f=0,e=this.length;f0)for(var j=d;j0},closest:function(a,b){if(c.isArray(a)){var d=[],f=this[0],e,j= -{},i;if(f&&a.length){e=0;for(var o=a.length;e-1:c(f).is(e)){d.push({selector:i,elem:f});delete j[i]}}f=f.parentNode}}return d}var k=c.expr.match.POS.test(a)?c(a,b||this.context):null;return this.map(function(n,r){for(;r&&r.ownerDocument&&r!==b;){if(k?k.index(r)>-1:c(r).is(a))return r;r=r.parentNode}return null})},index:function(a){if(!a||typeof a=== -"string")return c.inArray(this[0],a?c(a):this.parent().children());return c.inArray(a.jquery?a[0]:a,this)},add:function(a,b){a=typeof a==="string"?c(a,b||this.context):c.makeArray(a);b=c.merge(this.get(),a);return this.pushStack(qa(a[0])||qa(b[0])?b:c.unique(b))},andSelf:function(){return this.add(this.prevObject)}});c.each({parent:function(a){return(a=a.parentNode)&&a.nodeType!==11?a:null},parents:function(a){return c.dir(a,"parentNode")},parentsUntil:function(a,b,d){return c.dir(a,"parentNode", -d)},next:function(a){return c.nth(a,2,"nextSibling")},prev:function(a){return c.nth(a,2,"previousSibling")},nextAll:function(a){return c.dir(a,"nextSibling")},prevAll:function(a){return c.dir(a,"previousSibling")},nextUntil:function(a,b,d){return c.dir(a,"nextSibling",d)},prevUntil:function(a,b,d){return c.dir(a,"previousSibling",d)},siblings:function(a){return c.sibling(a.parentNode.firstChild,a)},children:function(a){return c.sibling(a.firstChild)},contents:function(a){return c.nodeName(a,"iframe")? -a.contentDocument||a.contentWindow.document:c.makeArray(a.childNodes)}},function(a,b){c.fn[a]=function(d,f){var e=c.map(this,b,d);eb.test(a)||(f=d);if(f&&typeof f==="string")e=c.filter(f,e);e=this.length>1?c.unique(e):e;if((this.length>1||gb.test(f))&&fb.test(a))e=e.reverse();return this.pushStack(e,a,R.call(arguments).join(","))}});c.extend({filter:function(a,b,d){if(d)a=":not("+a+")";return c.find.matches(a,b)},dir:function(a,b,d){var f=[];for(a=a[b];a&&a.nodeType!==9&&(d===w||a.nodeType!==1||!c(a).is(d));){a.nodeType=== -1&&f.push(a);a=a[b]}return f},nth:function(a,b,d){b=b||1;for(var f=0;a;a=a[d])if(a.nodeType===1&&++f===b)break;return a},sibling:function(a,b){for(var d=[];a;a=a.nextSibling)a.nodeType===1&&a!==b&&d.push(a);return d}});var Ja=/ jQuery\d+="(?:\d+|null)"/g,V=/^\s+/,Ka=/(<([\w:]+)[^>]*?)\/>/g,hb=/^(?:area|br|col|embed|hr|img|input|link|meta|param)$/i,La=/<([\w:]+)/,ib=/"},F={option:[1,""],legend:[1,"
","
"],thead:[1,"","
"],tr:[2,"","
"],td:[3,"","
"],col:[2,"","
"],area:[1,"",""],_default:[0,"",""]};F.optgroup=F.option;F.tbody=F.tfoot=F.colgroup=F.caption=F.thead;F.th=F.td;if(!c.support.htmlSerialize)F._default=[1,"div
","
"];c.fn.extend({text:function(a){if(c.isFunction(a))return this.each(function(b){var d= -c(this);d.text(a.call(this,b,d.text()))});if(typeof a!=="object"&&a!==w)return this.empty().append((this[0]&&this[0].ownerDocument||s).createTextNode(a));return c.text(this)},wrapAll:function(a){if(c.isFunction(a))return this.each(function(d){c(this).wrapAll(a.call(this,d))});if(this[0]){var b=c(a,this[0].ownerDocument).eq(0).clone(true);this[0].parentNode&&b.insertBefore(this[0]);b.map(function(){for(var d=this;d.firstChild&&d.firstChild.nodeType===1;)d=d.firstChild;return d}).append(this)}return this}, -wrapInner:function(a){if(c.isFunction(a))return this.each(function(b){c(this).wrapInner(a.call(this,b))});return this.each(function(){var b=c(this),d=b.contents();d.length?d.wrapAll(a):b.append(a)})},wrap:function(a){return this.each(function(){c(this).wrapAll(a)})},unwrap:function(){return this.parent().each(function(){c.nodeName(this,"body")||c(this).replaceWith(this.childNodes)}).end()},append:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.appendChild(a)})}, -prepend:function(){return this.domManip(arguments,true,function(a){this.nodeType===1&&this.insertBefore(a,this.firstChild)})},before:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b,this)});else if(arguments.length){var a=c(arguments[0]);a.push.apply(a,this.toArray());return this.pushStack(a,"before",arguments)}},after:function(){if(this[0]&&this[0].parentNode)return this.domManip(arguments,false,function(b){this.parentNode.insertBefore(b, -this.nextSibling)});else if(arguments.length){var a=this.pushStack(this,"after",arguments);a.push.apply(a,c(arguments[0]).toArray());return a}},remove:function(a,b){for(var d=0,f;(f=this[d])!=null;d++)if(!a||c.filter(a,[f]).length){if(!b&&f.nodeType===1){c.cleanData(f.getElementsByTagName("*"));c.cleanData([f])}f.parentNode&&f.parentNode.removeChild(f)}return this},empty:function(){for(var a=0,b;(b=this[a])!=null;a++)for(b.nodeType===1&&c.cleanData(b.getElementsByTagName("*"));b.firstChild;)b.removeChild(b.firstChild); -return this},clone:function(a){var b=this.map(function(){if(!c.support.noCloneEvent&&!c.isXMLDoc(this)){var d=this.outerHTML,f=this.ownerDocument;if(!d){d=f.createElement("div");d.appendChild(this.cloneNode(true));d=d.innerHTML}return c.clean([d.replace(Ja,"").replace(/=([^="'>\s]+\/)>/g,'="$1">').replace(V,"")],f)[0]}else return this.cloneNode(true)});if(a===true){ra(this,b);ra(this.find("*"),b.find("*"))}return b},html:function(a){if(a===w)return this[0]&&this[0].nodeType===1?this[0].innerHTML.replace(Ja, -""):null;else if(typeof a==="string"&&!ta.test(a)&&(c.support.leadingWhitespace||!V.test(a))&&!F[(La.exec(a)||["",""])[1].toLowerCase()]){a=a.replace(Ka,Ma);try{for(var b=0,d=this.length;b0||e.cacheable||this.length>1?k.cloneNode(true):k)}o.length&&c.each(o,Qa)}return this}});c.fragments={};c.each({appendTo:"append",prependTo:"prepend",insertBefore:"before",insertAfter:"after",replaceAll:"replaceWith"},function(a,b){c.fn[a]=function(d){var f=[];d=c(d);var e=this.length===1&&this[0].parentNode;if(e&&e.nodeType===11&&e.childNodes.length===1&&d.length===1){d[b](this[0]); -return this}else{e=0;for(var j=d.length;e0?this.clone(true):this).get();c.fn[b].apply(c(d[e]),i);f=f.concat(i)}return this.pushStack(f,a,d.selector)}}});c.extend({clean:function(a,b,d,f){b=b||s;if(typeof b.createElement==="undefined")b=b.ownerDocument||b[0]&&b[0].ownerDocument||s;for(var e=[],j=0,i;(i=a[j])!=null;j++){if(typeof i==="number")i+="";if(i){if(typeof i==="string"&&!jb.test(i))i=b.createTextNode(i);else if(typeof i==="string"){i=i.replace(Ka,Ma);var o=(La.exec(i)||["", -""])[1].toLowerCase(),k=F[o]||F._default,n=k[0],r=b.createElement("div");for(r.innerHTML=k[1]+i+k[2];n--;)r=r.lastChild;if(!c.support.tbody){n=ib.test(i);o=o==="table"&&!n?r.firstChild&&r.firstChild.childNodes:k[1]===""&&!n?r.childNodes:[];for(k=o.length-1;k>=0;--k)c.nodeName(o[k],"tbody")&&!o[k].childNodes.length&&o[k].parentNode.removeChild(o[k])}!c.support.leadingWhitespace&&V.test(i)&&r.insertBefore(b.createTextNode(V.exec(i)[0]),r.firstChild);i=r.childNodes}if(i.nodeType)e.push(i);else e= -c.merge(e,i)}}if(d)for(j=0;e[j];j++)if(f&&c.nodeName(e[j],"script")&&(!e[j].type||e[j].type.toLowerCase()==="text/javascript"))f.push(e[j].parentNode?e[j].parentNode.removeChild(e[j]):e[j]);else{e[j].nodeType===1&&e.splice.apply(e,[j+1,0].concat(c.makeArray(e[j].getElementsByTagName("script"))));d.appendChild(e[j])}return e},cleanData:function(a){for(var b,d,f=c.cache,e=c.event.special,j=c.support.deleteExpando,i=0,o;(o=a[i])!=null;i++)if(d=o[c.expando]){b=f[d];if(b.events)for(var k in b.events)e[k]? -c.event.remove(o,k):Ca(o,k,b.handle);if(j)delete o[c.expando];else o.removeAttribute&&o.removeAttribute(c.expando);delete f[d]}}});var kb=/z-?index|font-?weight|opacity|zoom|line-?height/i,Na=/alpha\([^)]*\)/,Oa=/opacity=([^)]*)/,ha=/float/i,ia=/-([a-z])/ig,lb=/([A-Z])/g,mb=/^-?\d+(?:px)?$/i,nb=/^-?\d/,ob={position:"absolute",visibility:"hidden",display:"block"},pb=["Left","Right"],qb=["Top","Bottom"],rb=s.defaultView&&s.defaultView.getComputedStyle,Pa=c.support.cssFloat?"cssFloat":"styleFloat",ja= -function(a,b){return b.toUpperCase()};c.fn.css=function(a,b){return X(this,a,b,true,function(d,f,e){if(e===w)return c.curCSS(d,f);if(typeof e==="number"&&!kb.test(f))e+="px";c.style(d,f,e)})};c.extend({style:function(a,b,d){if(!a||a.nodeType===3||a.nodeType===8)return w;if((b==="width"||b==="height")&&parseFloat(d)<0)d=w;var f=a.style||a,e=d!==w;if(!c.support.opacity&&b==="opacity"){if(e){f.zoom=1;b=parseInt(d,10)+""==="NaN"?"":"alpha(opacity="+d*100+")";a=f.filter||c.curCSS(a,"filter")||"";f.filter= -Na.test(a)?a.replace(Na,b):b}return f.filter&&f.filter.indexOf("opacity=")>=0?parseFloat(Oa.exec(f.filter)[1])/100+"":""}if(ha.test(b))b=Pa;b=b.replace(ia,ja);if(e)f[b]=d;return f[b]},css:function(a,b,d,f){if(b==="width"||b==="height"){var e,j=b==="width"?pb:qb;function i(){e=b==="width"?a.offsetWidth:a.offsetHeight;f!=="border"&&c.each(j,function(){f||(e-=parseFloat(c.curCSS(a,"padding"+this,true))||0);if(f==="margin")e+=parseFloat(c.curCSS(a,"margin"+this,true))||0;else e-=parseFloat(c.curCSS(a, -"border"+this+"Width",true))||0})}a.offsetWidth!==0?i():c.swap(a,ob,i);return Math.max(0,Math.round(e))}return c.curCSS(a,b,d)},curCSS:function(a,b,d){var f,e=a.style;if(!c.support.opacity&&b==="opacity"&&a.currentStyle){f=Oa.test(a.currentStyle.filter||"")?parseFloat(RegExp.$1)/100+"":"";return f===""?"1":f}if(ha.test(b))b=Pa;if(!d&&e&&e[b])f=e[b];else if(rb){if(ha.test(b))b="float";b=b.replace(lb,"-$1").toLowerCase();e=a.ownerDocument.defaultView;if(!e)return null;if(a=e.getComputedStyle(a,null))f= -a.getPropertyValue(b);if(b==="opacity"&&f==="")f="1"}else if(a.currentStyle){d=b.replace(ia,ja);f=a.currentStyle[b]||a.currentStyle[d];if(!mb.test(f)&&nb.test(f)){b=e.left;var j=a.runtimeStyle.left;a.runtimeStyle.left=a.currentStyle.left;e.left=d==="fontSize"?"1em":f||0;f=e.pixelLeft+"px";e.left=b;a.runtimeStyle.left=j}}return f},swap:function(a,b,d){var f={};for(var e in b){f[e]=a.style[e];a.style[e]=b[e]}d.call(a);for(e in b)a.style[e]=f[e]}});if(c.expr&&c.expr.filters){c.expr.filters.hidden=function(a){var b= -a.offsetWidth,d=a.offsetHeight,f=a.nodeName.toLowerCase()==="tr";return b===0&&d===0&&!f?true:b>0&&d>0&&!f?false:c.curCSS(a,"display")==="none"};c.expr.filters.visible=function(a){return!c.expr.filters.hidden(a)}}var sb=J(),tb=//gi,ub=/select|textarea/i,vb=/color|date|datetime|email|hidden|month|number|password|range|search|tel|text|time|url|week/i,N=/=\?(&|$)/,ka=/\?/,wb=/(\?|&)_=.*?(&|$)/,xb=/^(\w+:)?\/\/([^\/?#]+)/,yb=/%20/g,zb=c.fn.load;c.fn.extend({load:function(a,b,d){if(typeof a!== -"string")return zb.call(this,a);else if(!this.length)return this;var f=a.indexOf(" ");if(f>=0){var e=a.slice(f,a.length);a=a.slice(0,f)}f="GET";if(b)if(c.isFunction(b)){d=b;b=null}else if(typeof b==="object"){b=c.param(b,c.ajaxSettings.traditional);f="POST"}var j=this;c.ajax({url:a,type:f,dataType:"html",data:b,complete:function(i,o){if(o==="success"||o==="notmodified")j.html(e?c("
").append(i.responseText.replace(tb,"")).find(e):i.responseText);d&&j.each(d,[i.responseText,o,i])}});return this}, -serialize:function(){return c.param(this.serializeArray())},serializeArray:function(){return this.map(function(){return this.elements?c.makeArray(this.elements):this}).filter(function(){return this.name&&!this.disabled&&(this.checked||ub.test(this.nodeName)||vb.test(this.type))}).map(function(a,b){a=c(this).val();return a==null?null:c.isArray(a)?c.map(a,function(d){return{name:b.name,value:d}}):{name:b.name,value:a}}).get()}});c.each("ajaxStart ajaxStop ajaxComplete ajaxError ajaxSuccess ajaxSend".split(" "), -function(a,b){c.fn[b]=function(d){return this.bind(b,d)}});c.extend({get:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b=null}return c.ajax({type:"GET",url:a,data:b,success:d,dataType:f})},getScript:function(a,b){return c.get(a,null,b,"script")},getJSON:function(a,b,d){return c.get(a,b,d,"json")},post:function(a,b,d,f){if(c.isFunction(b)){f=f||d;d=b;b={}}return c.ajax({type:"POST",url:a,data:b,success:d,dataType:f})},ajaxSetup:function(a){c.extend(c.ajaxSettings,a)},ajaxSettings:{url:location.href, -global:true,type:"GET",contentType:"application/x-www-form-urlencoded",processData:true,async:true,xhr:A.XMLHttpRequest&&(A.location.protocol!=="file:"||!A.ActiveXObject)?function(){return new A.XMLHttpRequest}:function(){try{return new A.ActiveXObject("Microsoft.XMLHTTP")}catch(a){}},accepts:{xml:"application/xml, text/xml",html:"text/html",script:"text/javascript, application/javascript",json:"application/json, text/javascript",text:"text/plain",_default:"*/*"}},lastModified:{},etag:{},ajax:function(a){function b(){e.success&& -e.success.call(k,o,i,x);e.global&&f("ajaxSuccess",[x,e])}function d(){e.complete&&e.complete.call(k,x,i);e.global&&f("ajaxComplete",[x,e]);e.global&&!--c.active&&c.event.trigger("ajaxStop")}function f(q,p){(e.context?c(e.context):c.event).trigger(q,p)}var e=c.extend(true,{},c.ajaxSettings,a),j,i,o,k=a&&a.context||e,n=e.type.toUpperCase();if(e.data&&e.processData&&typeof e.data!=="string")e.data=c.param(e.data,e.traditional);if(e.dataType==="jsonp"){if(n==="GET")N.test(e.url)||(e.url+=(ka.test(e.url)? -"&":"?")+(e.jsonp||"callback")+"=?");else if(!e.data||!N.test(e.data))e.data=(e.data?e.data+"&":"")+(e.jsonp||"callback")+"=?";e.dataType="json"}if(e.dataType==="json"&&(e.data&&N.test(e.data)||N.test(e.url))){j=e.jsonpCallback||"jsonp"+sb++;if(e.data)e.data=(e.data+"").replace(N,"="+j+"$1");e.url=e.url.replace(N,"="+j+"$1");e.dataType="script";A[j]=A[j]||function(q){o=q;b();d();A[j]=w;try{delete A[j]}catch(p){}z&&z.removeChild(C)}}if(e.dataType==="script"&&e.cache===null)e.cache=false;if(e.cache=== -false&&n==="GET"){var r=J(),u=e.url.replace(wb,"$1_="+r+"$2");e.url=u+(u===e.url?(ka.test(e.url)?"&":"?")+"_="+r:"")}if(e.data&&n==="GET")e.url+=(ka.test(e.url)?"&":"?")+e.data;e.global&&!c.active++&&c.event.trigger("ajaxStart");r=(r=xb.exec(e.url))&&(r[1]&&r[1]!==location.protocol||r[2]!==location.host);if(e.dataType==="script"&&n==="GET"&&r){var z=s.getElementsByTagName("head")[0]||s.documentElement,C=s.createElement("script");C.src=e.url;if(e.scriptCharset)C.charset=e.scriptCharset;if(!j){var B= -false;C.onload=C.onreadystatechange=function(){if(!B&&(!this.readyState||this.readyState==="loaded"||this.readyState==="complete")){B=true;b();d();C.onload=C.onreadystatechange=null;z&&C.parentNode&&z.removeChild(C)}}}z.insertBefore(C,z.firstChild);return w}var E=false,x=e.xhr();if(x){e.username?x.open(n,e.url,e.async,e.username,e.password):x.open(n,e.url,e.async);try{if(e.data||a&&a.contentType)x.setRequestHeader("Content-Type",e.contentType);if(e.ifModified){c.lastModified[e.url]&&x.setRequestHeader("If-Modified-Since", -c.lastModified[e.url]);c.etag[e.url]&&x.setRequestHeader("If-None-Match",c.etag[e.url])}r||x.setRequestHeader("X-Requested-With","XMLHttpRequest");x.setRequestHeader("Accept",e.dataType&&e.accepts[e.dataType]?e.accepts[e.dataType]+", */*":e.accepts._default)}catch(ga){}if(e.beforeSend&&e.beforeSend.call(k,x,e)===false){e.global&&!--c.active&&c.event.trigger("ajaxStop");x.abort();return false}e.global&&f("ajaxSend",[x,e]);var g=x.onreadystatechange=function(q){if(!x||x.readyState===0||q==="abort"){E|| -d();E=true;if(x)x.onreadystatechange=c.noop}else if(!E&&x&&(x.readyState===4||q==="timeout")){E=true;x.onreadystatechange=c.noop;i=q==="timeout"?"timeout":!c.httpSuccess(x)?"error":e.ifModified&&c.httpNotModified(x,e.url)?"notmodified":"success";var p;if(i==="success")try{o=c.httpData(x,e.dataType,e)}catch(v){i="parsererror";p=v}if(i==="success"||i==="notmodified")j||b();else c.handleError(e,x,i,p);d();q==="timeout"&&x.abort();if(e.async)x=null}};try{var h=x.abort;x.abort=function(){x&&h.call(x); -g("abort")}}catch(l){}e.async&&e.timeout>0&&setTimeout(function(){x&&!E&&g("timeout")},e.timeout);try{x.send(n==="POST"||n==="PUT"||n==="DELETE"?e.data:null)}catch(m){c.handleError(e,x,null,m);d()}e.async||g();return x}},handleError:function(a,b,d,f){if(a.error)a.error.call(a.context||a,b,d,f);if(a.global)(a.context?c(a.context):c.event).trigger("ajaxError",[b,a,f])},active:0,httpSuccess:function(a){try{return!a.status&&location.protocol==="file:"||a.status>=200&&a.status<300||a.status===304||a.status=== -1223||a.status===0}catch(b){}return false},httpNotModified:function(a,b){var d=a.getResponseHeader("Last-Modified"),f=a.getResponseHeader("Etag");if(d)c.lastModified[b]=d;if(f)c.etag[b]=f;return a.status===304||a.status===0},httpData:function(a,b,d){var f=a.getResponseHeader("content-type")||"",e=b==="xml"||!b&&f.indexOf("xml")>=0;a=e?a.responseXML:a.responseText;e&&a.documentElement.nodeName==="parsererror"&&c.error("parsererror");if(d&&d.dataFilter)a=d.dataFilter(a,b);if(typeof a==="string")if(b=== -"json"||!b&&f.indexOf("json")>=0)a=c.parseJSON(a);else if(b==="script"||!b&&f.indexOf("javascript")>=0)c.globalEval(a);return a},param:function(a,b){function d(i,o){if(c.isArray(o))c.each(o,function(k,n){b||/\[\]$/.test(i)?f(i,n):d(i+"["+(typeof n==="object"||c.isArray(n)?k:"")+"]",n)});else!b&&o!=null&&typeof o==="object"?c.each(o,function(k,n){d(i+"["+k+"]",n)}):f(i,o)}function f(i,o){o=c.isFunction(o)?o():o;e[e.length]=encodeURIComponent(i)+"="+encodeURIComponent(o)}var e=[];if(b===w)b=c.ajaxSettings.traditional; -if(c.isArray(a)||a.jquery)c.each(a,function(){f(this.name,this.value)});else for(var j in a)d(j,a[j]);return e.join("&").replace(yb,"+")}});var la={},Ab=/toggle|show|hide/,Bb=/^([+-]=)?([\d+-.]+)(.*)$/,W,va=[["height","marginTop","marginBottom","paddingTop","paddingBottom"],["width","marginLeft","marginRight","paddingLeft","paddingRight"],["opacity"]];c.fn.extend({show:function(a,b){if(a||a===0)return this.animate(K("show",3),a,b);else{a=0;for(b=this.length;a").appendTo("body");f=e.css("display");if(f==="none")f="block";e.remove();la[d]=f}c.data(this[a],"olddisplay",f)}}a=0;for(b=this.length;a=0;f--)if(d[f].elem===this){b&&d[f](true);d.splice(f,1)}});b||this.dequeue();return this}});c.each({slideDown:K("show",1),slideUp:K("hide",1),slideToggle:K("toggle",1),fadeIn:{opacity:"show"},fadeOut:{opacity:"hide"}},function(a,b){c.fn[a]=function(d,f){return this.animate(b,d,f)}});c.extend({speed:function(a,b,d){var f=a&&typeof a==="object"?a:{complete:d||!d&&b||c.isFunction(a)&&a,duration:a,easing:d&&b||b&&!c.isFunction(b)&&b};f.duration=c.fx.off?0:typeof f.duration=== -"number"?f.duration:c.fx.speeds[f.duration]||c.fx.speeds._default;f.old=f.complete;f.complete=function(){f.queue!==false&&c(this).dequeue();c.isFunction(f.old)&&f.old.call(this)};return f},easing:{linear:function(a,b,d,f){return d+f*a},swing:function(a,b,d,f){return(-Math.cos(a*Math.PI)/2+0.5)*f+d}},timers:[],fx:function(a,b,d){this.options=b;this.elem=a;this.prop=d;if(!b.orig)b.orig={}}});c.fx.prototype={update:function(){this.options.step&&this.options.step.call(this.elem,this.now,this);(c.fx.step[this.prop]|| -c.fx.step._default)(this);if((this.prop==="height"||this.prop==="width")&&this.elem.style)this.elem.style.display="block"},cur:function(a){if(this.elem[this.prop]!=null&&(!this.elem.style||this.elem.style[this.prop]==null))return this.elem[this.prop];return(a=parseFloat(c.css(this.elem,this.prop,a)))&&a>-10000?a:parseFloat(c.curCSS(this.elem,this.prop))||0},custom:function(a,b,d){function f(j){return e.step(j)}this.startTime=J();this.start=a;this.end=b;this.unit=d||this.unit||"px";this.now=this.start; -this.pos=this.state=0;var e=this;f.elem=this.elem;if(f()&&c.timers.push(f)&&!W)W=setInterval(c.fx.tick,13)},show:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.show=true;this.custom(this.prop==="width"||this.prop==="height"?1:0,this.cur());c(this.elem).show()},hide:function(){this.options.orig[this.prop]=c.style(this.elem,this.prop);this.options.hide=true;this.custom(this.cur(),0)},step:function(a){var b=J(),d=true;if(a||b>=this.options.duration+this.startTime){this.now= -this.end;this.pos=this.state=1;this.update();this.options.curAnim[this.prop]=true;for(var f in this.options.curAnim)if(this.options.curAnim[f]!==true)d=false;if(d){if(this.options.display!=null){this.elem.style.overflow=this.options.overflow;a=c.data(this.elem,"olddisplay");this.elem.style.display=a?a:this.options.display;if(c.css(this.elem,"display")==="none")this.elem.style.display="block"}this.options.hide&&c(this.elem).hide();if(this.options.hide||this.options.show)for(var e in this.options.curAnim)c.style(this.elem, -e,this.options.orig[e]);this.options.complete.call(this.elem)}return false}else{e=b-this.startTime;this.state=e/this.options.duration;a=this.options.easing||(c.easing.swing?"swing":"linear");this.pos=c.easing[this.options.specialEasing&&this.options.specialEasing[this.prop]||a](this.state,e,0,1,this.options.duration);this.now=this.start+(this.end-this.start)*this.pos;this.update()}return true}};c.extend(c.fx,{tick:function(){for(var a=c.timers,b=0;b
"; -a.insertBefore(b,a.firstChild);d=b.firstChild;f=d.firstChild;e=d.nextSibling.firstChild.firstChild;this.doesNotAddBorder=f.offsetTop!==5;this.doesAddBorderForTableAndCells=e.offsetTop===5;f.style.position="fixed";f.style.top="20px";this.supportsFixedPosition=f.offsetTop===20||f.offsetTop===15;f.style.position=f.style.top="";d.style.overflow="hidden";d.style.position="relative";this.subtractsBorderForOverflowNotVisible=f.offsetTop===-5;this.doesNotIncludeMarginInBodyOffset=a.offsetTop!==j;a.removeChild(b); -c.offset.initialize=c.noop},bodyOffset:function(a){var b=a.offsetTop,d=a.offsetLeft;c.offset.initialize();if(c.offset.doesNotIncludeMarginInBodyOffset){b+=parseFloat(c.curCSS(a,"marginTop",true))||0;d+=parseFloat(c.curCSS(a,"marginLeft",true))||0}return{top:b,left:d}},setOffset:function(a,b,d){if(/static/.test(c.curCSS(a,"position")))a.style.position="relative";var f=c(a),e=f.offset(),j=parseInt(c.curCSS(a,"top",true),10)||0,i=parseInt(c.curCSS(a,"left",true),10)||0;if(c.isFunction(b))b=b.call(a, -d,e);d={top:b.top-e.top+j,left:b.left-e.left+i};"using"in b?b.using.call(a,d):f.css(d)}};c.fn.extend({position:function(){if(!this[0])return null;var a=this[0],b=this.offsetParent(),d=this.offset(),f=/^body|html$/i.test(b[0].nodeName)?{top:0,left:0}:b.offset();d.top-=parseFloat(c.curCSS(a,"marginTop",true))||0;d.left-=parseFloat(c.curCSS(a,"marginLeft",true))||0;f.top+=parseFloat(c.curCSS(b[0],"borderTopWidth",true))||0;f.left+=parseFloat(c.curCSS(b[0],"borderLeftWidth",true))||0;return{top:d.top- -f.top,left:d.left-f.left}},offsetParent:function(){return this.map(function(){for(var a=this.offsetParent||s.body;a&&!/^body|html$/i.test(a.nodeName)&&c.css(a,"position")==="static";)a=a.offsetParent;return a})}});c.each(["Left","Top"],function(a,b){var d="scroll"+b;c.fn[d]=function(f){var e=this[0],j;if(!e)return null;if(f!==w)return this.each(function(){if(j=wa(this))j.scrollTo(!a?f:c(j).scrollLeft(),a?f:c(j).scrollTop());else this[d]=f});else return(j=wa(e))?"pageXOffset"in j?j[a?"pageYOffset": -"pageXOffset"]:c.support.boxModel&&j.document.documentElement[d]||j.document.body[d]:e[d]}});c.each(["Height","Width"],function(a,b){var d=b.toLowerCase();c.fn["inner"+b]=function(){return this[0]?c.css(this[0],d,false,"padding"):null};c.fn["outer"+b]=function(f){return this[0]?c.css(this[0],d,false,f?"margin":"border"):null};c.fn[d]=function(f){var e=this[0];if(!e)return f==null?null:this;if(c.isFunction(f))return this.each(function(j){var i=c(this);i[d](f.call(this,j,i[d]()))});return"scrollTo"in -e&&e.document?e.document.compatMode==="CSS1Compat"&&e.document.documentElement["client"+b]||e.document.body["client"+b]:e.nodeType===9?Math.max(e.documentElement["client"+b],e.body["scroll"+b],e.documentElement["scroll"+b],e.body["offset"+b],e.documentElement["offset"+b]):f===w?c.css(e,d):this.css(d,typeof f==="string"?f:f+"px")}});A.jQuery=A.$=c})(window); diff --git a/python/plugins/sextante/help/_static/minus.png b/python/plugins/sextante/help/_static/minus.png deleted file mode 100644 index da1c5620d10c..000000000000 Binary files a/python/plugins/sextante/help/_static/minus.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/plus.png b/python/plugins/sextante/help/_static/plus.png deleted file mode 100644 index b3cb37425ea6..000000000000 Binary files a/python/plugins/sextante/help/_static/plus.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/pygments.css b/python/plugins/sextante/help/_static/pygments.css deleted file mode 100644 index bc91280a73d3..000000000000 --- a/python/plugins/sextante/help/_static/pygments.css +++ /dev/null @@ -1,62 +0,0 @@ -.highlight .hll { background-color: #ffffcc } -.highlight { background: #eeffcc; } -.highlight .c { color: #408090; font-style: italic } /* Comment */ -.highlight .err { border: 1px solid #FF0000 } /* Error */ -.highlight .k { color: #007020; font-weight: bold } /* Keyword */ -.highlight .o { color: #666666 } /* Operator */ -.highlight .cm { color: #408090; font-style: italic } /* Comment.Multiline */ -.highlight .cp { color: #007020 } /* Comment.Preproc */ -.highlight .c1 { color: #408090; font-style: italic } /* Comment.Single */ -.highlight .cs { color: #408090; background-color: #fff0f0 } /* Comment.Special */ -.highlight .gd { color: #A00000 } /* Generic.Deleted */ -.highlight .ge { font-style: italic } /* Generic.Emph */ -.highlight .gr { color: #FF0000 } /* Generic.Error */ -.highlight .gh { color: #000080; font-weight: bold } /* Generic.Heading */ -.highlight .gi { color: #00A000 } /* Generic.Inserted */ -.highlight .go { color: #303030 } /* Generic.Output */ -.highlight .gp { color: #c65d09; font-weight: bold } /* Generic.Prompt */ -.highlight .gs { font-weight: bold } /* Generic.Strong */ -.highlight .gu { color: #800080; font-weight: bold } /* Generic.Subheading */ -.highlight .gt { color: #0040D0 } /* Generic.Traceback */ -.highlight .kc { color: #007020; font-weight: bold } /* Keyword.Constant */ -.highlight .kd { color: #007020; font-weight: bold } /* Keyword.Declaration */ -.highlight .kn { color: #007020; font-weight: bold } /* Keyword.Namespace */ -.highlight .kp { color: #007020 } /* Keyword.Pseudo */ -.highlight .kr { color: #007020; font-weight: bold } /* Keyword.Reserved */ -.highlight .kt { color: #902000 } /* Keyword.Type */ -.highlight .m { color: #208050 } /* Literal.Number */ -.highlight .s { color: #4070a0 } /* Literal.String */ -.highlight .na { color: #4070a0 } /* Name.Attribute */ -.highlight .nb { color: #007020 } /* Name.Builtin */ -.highlight .nc { color: #0e84b5; font-weight: bold } /* Name.Class */ -.highlight .no { color: #60add5 } /* Name.Constant */ -.highlight .nd { color: #555555; font-weight: bold } /* Name.Decorator */ -.highlight .ni { color: #d55537; font-weight: bold } /* Name.Entity */ -.highlight .ne { color: #007020 } /* Name.Exception */ -.highlight .nf { color: #06287e } /* Name.Function */ -.highlight .nl { color: #002070; font-weight: bold } /* Name.Label */ -.highlight .nn { color: #0e84b5; font-weight: bold } /* Name.Namespace */ -.highlight .nt { color: #062873; font-weight: bold } /* Name.Tag */ -.highlight .nv { color: #bb60d5 } /* Name.Variable */ -.highlight .ow { color: #007020; font-weight: bold } /* Operator.Word */ -.highlight .w { color: #bbbbbb } /* Text.Whitespace */ -.highlight .mf { color: #208050 } /* Literal.Number.Float */ -.highlight .mh { color: #208050 } /* Literal.Number.Hex */ -.highlight .mi { color: #208050 } /* Literal.Number.Integer */ -.highlight .mo { color: #208050 } /* Literal.Number.Oct */ -.highlight .sb { color: #4070a0 } /* Literal.String.Backtick */ -.highlight .sc { color: #4070a0 } /* Literal.String.Char */ -.highlight .sd { color: #4070a0; font-style: italic } /* Literal.String.Doc */ -.highlight .s2 { color: #4070a0 } /* Literal.String.Double */ -.highlight .se { color: #4070a0; font-weight: bold } /* Literal.String.Escape */ -.highlight .sh { color: #4070a0 } /* Literal.String.Heredoc */ -.highlight .si { color: #70a0d0; font-style: italic } /* Literal.String.Interpol */ -.highlight .sx { color: #c65d09 } /* Literal.String.Other */ -.highlight .sr { color: #235388 } /* Literal.String.Regex */ -.highlight .s1 { color: #4070a0 } /* Literal.String.Single */ -.highlight .ss { color: #517918 } /* Literal.String.Symbol */ -.highlight .bp { color: #007020 } /* Name.Builtin.Pseudo */ -.highlight .vc { color: #bb60d5 } /* Name.Variable.Class */ -.highlight .vg { color: #bb60d5 } /* Name.Variable.Global */ -.highlight .vi { color: #bb60d5 } /* Name.Variable.Instance */ -.highlight .il { color: #208050 } /* Literal.Number.Integer.Long */ \ No newline at end of file diff --git a/python/plugins/sextante/help/_static/searchtools.js b/python/plugins/sextante/help/_static/searchtools.js deleted file mode 100644 index d7fc9cd6705b..000000000000 --- a/python/plugins/sextante/help/_static/searchtools.js +++ /dev/null @@ -1,560 +0,0 @@ -/* - * searchtools.js_t - * ~~~~~~~~~~~~~~~~ - * - * Sphinx JavaScript utilities for the full-text search. - * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -/** - * helper function to return a node containing the - * search summary for a given text. keywords is a list - * of stemmed words, hlwords is the list of normal, unstemmed - * words. the first one is used to find the occurance, the - * latter for highlighting it. - */ - -jQuery.makeSearchSummary = function(text, keywords, hlwords) { - var textLower = text.toLowerCase(); - var start = 0; - $.each(keywords, function() { - var i = textLower.indexOf(this.toLowerCase()); - if (i > -1) - start = i; - }); - start = Math.max(start - 120, 0); - var excerpt = ((start > 0) ? '...' : '') + - $.trim(text.substr(start, 240)) + - ((start + 240 - text.length) ? '...' : ''); - var rv = $('
').text(excerpt); - $.each(hlwords, function() { - rv = rv.highlightText(this, 'highlighted'); - }); - return rv; -} - - -/** - * Porter Stemmer - */ -var Stemmer = function() { - - var step2list = { - ational: 'ate', - tional: 'tion', - enci: 'ence', - anci: 'ance', - izer: 'ize', - bli: 'ble', - alli: 'al', - entli: 'ent', - eli: 'e', - ousli: 'ous', - ization: 'ize', - ation: 'ate', - ator: 'ate', - alism: 'al', - iveness: 'ive', - fulness: 'ful', - ousness: 'ous', - aliti: 'al', - iviti: 'ive', - biliti: 'ble', - logi: 'log' - }; - - var step3list = { - icate: 'ic', - ative: '', - alize: 'al', - iciti: 'ic', - ical: 'ic', - ful: '', - ness: '' - }; - - var c = "[^aeiou]"; // consonant - var v = "[aeiouy]"; // vowel - var C = c + "[^aeiouy]*"; // consonant sequence - var V = v + "[aeiou]*"; // vowel sequence - - var mgr0 = "^(" + C + ")?" + V + C; // [C]VC... is m>0 - var meq1 = "^(" + C + ")?" + V + C + "(" + V + ")?$"; // [C]VC[V] is m=1 - var mgr1 = "^(" + C + ")?" + V + C + V + C; // [C]VCVC... is m>1 - var s_v = "^(" + C + ")?" + v; // vowel in stem - - this.stemWord = function (w) { - var stem; - var suffix; - var firstch; - var origword = w; - - if (w.length < 3) - return w; - - var re; - var re2; - var re3; - var re4; - - firstch = w.substr(0,1); - if (firstch == "y") - w = firstch.toUpperCase() + w.substr(1); - - // Step 1a - re = /^(.+?)(ss|i)es$/; - re2 = /^(.+?)([^s])s$/; - - if (re.test(w)) - w = w.replace(re,"$1$2"); - else if (re2.test(w)) - w = w.replace(re2,"$1$2"); - - // Step 1b - re = /^(.+?)eed$/; - re2 = /^(.+?)(ed|ing)$/; - if (re.test(w)) { - var fp = re.exec(w); - re = new RegExp(mgr0); - if (re.test(fp[1])) { - re = /.$/; - w = w.replace(re,""); - } - } - else if (re2.test(w)) { - var fp = re2.exec(w); - stem = fp[1]; - re2 = new RegExp(s_v); - if (re2.test(stem)) { - w = stem; - re2 = /(at|bl|iz)$/; - re3 = new RegExp("([^aeiouylsz])\\1$"); - re4 = new RegExp("^" + C + v + "[^aeiouwxy]$"); - if (re2.test(w)) - w = w + "e"; - else if (re3.test(w)) { - re = /.$/; - w = w.replace(re,""); - } - else if (re4.test(w)) - w = w + "e"; - } - } - - // Step 1c - re = /^(.+?)y$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - re = new RegExp(s_v); - if (re.test(stem)) - w = stem + "i"; - } - - // Step 2 - re = /^(.+?)(ational|tional|enci|anci|izer|bli|alli|entli|eli|ousli|ization|ation|ator|alism|iveness|fulness|ousness|aliti|iviti|biliti|logi)$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - suffix = fp[2]; - re = new RegExp(mgr0); - if (re.test(stem)) - w = stem + step2list[suffix]; - } - - // Step 3 - re = /^(.+?)(icate|ative|alize|iciti|ical|ful|ness)$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - suffix = fp[2]; - re = new RegExp(mgr0); - if (re.test(stem)) - w = stem + step3list[suffix]; - } - - // Step 4 - re = /^(.+?)(al|ance|ence|er|ic|able|ible|ant|ement|ment|ent|ou|ism|ate|iti|ous|ive|ize)$/; - re2 = /^(.+?)(s|t)(ion)$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - re = new RegExp(mgr1); - if (re.test(stem)) - w = stem; - } - else if (re2.test(w)) { - var fp = re2.exec(w); - stem = fp[1] + fp[2]; - re2 = new RegExp(mgr1); - if (re2.test(stem)) - w = stem; - } - - // Step 5 - re = /^(.+?)e$/; - if (re.test(w)) { - var fp = re.exec(w); - stem = fp[1]; - re = new RegExp(mgr1); - re2 = new RegExp(meq1); - re3 = new RegExp("^" + C + v + "[^aeiouwxy]$"); - if (re.test(stem) || (re2.test(stem) && !(re3.test(stem)))) - w = stem; - } - re = /ll$/; - re2 = new RegExp(mgr1); - if (re.test(w) && re2.test(w)) { - re = /.$/; - w = w.replace(re,""); - } - - // and turn initial Y back to y - if (firstch == "y") - w = firstch.toLowerCase() + w.substr(1); - return w; - } -} - - -/** - * Search Module - */ -var Search = { - - _index : null, - _queued_query : null, - _pulse_status : -1, - - init : function() { - var params = $.getQueryParameters(); - if (params.q) { - var query = params.q[0]; - $('input[name="q"]')[0].value = query; - this.performSearch(query); - } - }, - - loadIndex : function(url) { - $.ajax({type: "GET", url: url, data: null, success: null, - dataType: "script", cache: true}); - }, - - setIndex : function(index) { - var q; - this._index = index; - if ((q = this._queued_query) !== null) { - this._queued_query = null; - Search.query(q); - } - }, - - hasIndex : function() { - return this._index !== null; - }, - - deferQuery : function(query) { - this._queued_query = query; - }, - - stopPulse : function() { - this._pulse_status = 0; - }, - - startPulse : function() { - if (this._pulse_status >= 0) - return; - function pulse() { - Search._pulse_status = (Search._pulse_status + 1) % 4; - var dotString = ''; - for (var i = 0; i < Search._pulse_status; i++) - dotString += '.'; - Search.dots.text(dotString); - if (Search._pulse_status > -1) - window.setTimeout(pulse, 500); - }; - pulse(); - }, - - /** - * perform a search for something - */ - performSearch : function(query) { - // create the required interface elements - this.out = $('#search-results'); - this.title = $('

' + _('Searching') + '

').appendTo(this.out); - this.dots = $('').appendTo(this.title); - this.status = $('

').appendTo(this.out); - this.output = $('
    ').appendTo(this.out); - - $('#search-progress').text(_('Preparing search...')); - this.startPulse(); - - // index already loaded, the browser was quick! - if (this.hasIndex()) - this.query(query); - else - this.deferQuery(query); - }, - - query : function(query) { - var stopwords = ["and","then","into","it","as","are","in","if","for","no","there","their","was","is","be","to","that","but","they","not","such","with","by","a","on","these","of","will","this","near","the","or","at"]; - - // Stem the searchterms and add them to the correct list - var stemmer = new Stemmer(); - var searchterms = []; - var excluded = []; - var hlterms = []; - var tmp = query.split(/\s+/); - var objectterms = []; - for (var i = 0; i < tmp.length; i++) { - if (tmp[i] != "") { - objectterms.push(tmp[i].toLowerCase()); - } - - if ($u.indexOf(stopwords, tmp[i]) != -1 || tmp[i].match(/^\d+$/) || - tmp[i] == "") { - // skip this "word" - continue; - } - // stem the word - var word = stemmer.stemWord(tmp[i]).toLowerCase(); - // select the correct list - if (word[0] == '-') { - var toAppend = excluded; - word = word.substr(1); - } - else { - var toAppend = searchterms; - hlterms.push(tmp[i].toLowerCase()); - } - // only add if not already in the list - if (!$.contains(toAppend, word)) - toAppend.push(word); - }; - var highlightstring = '?highlight=' + $.urlencode(hlterms.join(" ")); - - // console.debug('SEARCH: searching for:'); - // console.info('required: ', searchterms); - // console.info('excluded: ', excluded); - - // prepare search - var filenames = this._index.filenames; - var titles = this._index.titles; - var terms = this._index.terms; - var fileMap = {}; - var files = null; - // different result priorities - var importantResults = []; - var objectResults = []; - var regularResults = []; - var unimportantResults = []; - $('#search-progress').empty(); - - // lookup as object - for (var i = 0; i < objectterms.length; i++) { - var others = [].concat(objectterms.slice(0,i), - objectterms.slice(i+1, objectterms.length)) - var results = this.performObjectSearch(objectterms[i], others); - // Assume first word is most likely to be the object, - // other words more likely to be in description. - // Therefore put matches for earlier words first. - // (Results are eventually used in reverse order). - objectResults = results[0].concat(objectResults); - importantResults = results[1].concat(importantResults); - unimportantResults = results[2].concat(unimportantResults); - } - - // perform the search on the required terms - for (var i = 0; i < searchterms.length; i++) { - var word = searchterms[i]; - // no match but word was a required one - if ((files = terms[word]) == null) - break; - if (files.length == undefined) { - files = [files]; - } - // create the mapping - for (var j = 0; j < files.length; j++) { - var file = files[j]; - if (file in fileMap) - fileMap[file].push(word); - else - fileMap[file] = [word]; - } - } - - // now check if the files don't contain excluded terms - for (var file in fileMap) { - var valid = true; - - // check if all requirements are matched - if (fileMap[file].length != searchterms.length) - continue; - - // ensure that none of the excluded terms is in the - // search result. - for (var i = 0; i < excluded.length; i++) { - if (terms[excluded[i]] == file || - $.contains(terms[excluded[i]] || [], file)) { - valid = false; - break; - } - } - - // if we have still a valid result we can add it - // to the result list - if (valid) - regularResults.push([filenames[file], titles[file], '', null]); - } - - // delete unused variables in order to not waste - // memory until list is retrieved completely - delete filenames, titles, terms; - - // now sort the regular results descending by title - regularResults.sort(function(a, b) { - var left = a[1].toLowerCase(); - var right = b[1].toLowerCase(); - return (left > right) ? -1 : ((left < right) ? 1 : 0); - }); - - // combine all results - var results = unimportantResults.concat(regularResults) - .concat(objectResults).concat(importantResults); - - // print the results - var resultCount = results.length; - function displayNextItem() { - // results left, load the summary and display it - if (results.length) { - var item = results.pop(); - var listItem = $('
  • '); - if (DOCUMENTATION_OPTIONS.FILE_SUFFIX == '') { - // dirhtml builder - var dirname = item[0] + '/'; - if (dirname.match(/\/index\/$/)) { - dirname = dirname.substring(0, dirname.length-6); - } else if (dirname == 'index/') { - dirname = ''; - } - listItem.append($('').attr('href', - DOCUMENTATION_OPTIONS.URL_ROOT + dirname + - highlightstring + item[2]).html(item[1])); - } else { - // normal html builders - listItem.append($('').attr('href', - item[0] + DOCUMENTATION_OPTIONS.FILE_SUFFIX + - highlightstring + item[2]).html(item[1])); - } - if (item[3]) { - listItem.append($(' (' + item[3] + ')')); - Search.output.append(listItem); - listItem.slideDown(5, function() { - displayNextItem(); - }); - } else if (DOCUMENTATION_OPTIONS.HAS_SOURCE) { - $.get(DOCUMENTATION_OPTIONS.URL_ROOT + '_sources/' + - item[0] + '.txt', function(data) { - if (data != '') { - listItem.append($.makeSearchSummary(data, searchterms, hlterms)); - Search.output.append(listItem); - } - listItem.slideDown(5, function() { - displayNextItem(); - }); - }, "text"); - } else { - // no source available, just display title - Search.output.append(listItem); - listItem.slideDown(5, function() { - displayNextItem(); - }); - } - } - // search finished, update title and status message - else { - Search.stopPulse(); - Search.title.text(_('Search Results')); - if (!resultCount) - Search.status.text(_('Your search did not match any documents. Please make sure that all words are spelled correctly and that you\'ve selected enough categories.')); - else - Search.status.text(_('Search finished, found %s page(s) matching the search query.').replace('%s', resultCount)); - Search.status.fadeIn(500); - } - } - displayNextItem(); - }, - - performObjectSearch : function(object, otherterms) { - var filenames = this._index.filenames; - var objects = this._index.objects; - var objnames = this._index.objnames; - var titles = this._index.titles; - - var importantResults = []; - var objectResults = []; - var unimportantResults = []; - - for (var prefix in objects) { - for (var name in objects[prefix]) { - var fullname = (prefix ? prefix + '.' : '') + name; - if (fullname.toLowerCase().indexOf(object) > -1) { - var match = objects[prefix][name]; - var objname = objnames[match[1]][2]; - var title = titles[match[0]]; - // If more than one term searched for, we require other words to be - // found in the name/title/description - if (otherterms.length > 0) { - var haystack = (prefix + ' ' + name + ' ' + - objname + ' ' + title).toLowerCase(); - var allfound = true; - for (var i = 0; i < otherterms.length; i++) { - if (haystack.indexOf(otherterms[i]) == -1) { - allfound = false; - break; - } - } - if (!allfound) { - continue; - } - } - var descr = objname + _(', in ') + title; - anchor = match[3]; - if (anchor == '') - anchor = fullname; - else if (anchor == '-') - anchor = objnames[match[1]][1] + '-' + fullname; - result = [filenames[match[0]], fullname, '#'+anchor, descr]; - switch (match[2]) { - case 1: objectResults.push(result); break; - case 0: importantResults.push(result); break; - case 2: unimportantResults.push(result); break; - } - } - } - } - - // sort results descending - objectResults.sort(function(a, b) { - return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); - }); - - importantResults.sort(function(a, b) { - return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); - }); - - unimportantResults.sort(function(a, b) { - return (a[1] > b[1]) ? -1 : ((a[1] < b[1]) ? 1 : 0); - }); - - return [importantResults, objectResults, unimportantResults] - } -} - -$(document).ready(function() { - Search.init(); -}); diff --git a/python/plugins/sextante/help/_static/sidebar.js b/python/plugins/sextante/help/_static/sidebar.js deleted file mode 100644 index a45e1926addf..000000000000 --- a/python/plugins/sextante/help/_static/sidebar.js +++ /dev/null @@ -1,151 +0,0 @@ -/* - * sidebar.js - * ~~~~~~~~~~ - * - * This script makes the Sphinx sidebar collapsible. - * - * .sphinxsidebar contains .sphinxsidebarwrapper. This script adds - * in .sphixsidebar, after .sphinxsidebarwrapper, the #sidebarbutton - * used to collapse and expand the sidebar. - * - * When the sidebar is collapsed the .sphinxsidebarwrapper is hidden - * and the width of the sidebar and the margin-left of the document - * are decreased. When the sidebar is expanded the opposite happens. - * This script saves a per-browser/per-session cookie used to - * remember the position of the sidebar among the pages. - * Once the browser is closed the cookie is deleted and the position - * reset to the default (expanded). - * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -$(function() { - // global elements used by the functions. - // the 'sidebarbutton' element is defined as global after its - // creation, in the add_sidebar_button function - var bodywrapper = $('.bodywrapper'); - var sidebar = $('.sphinxsidebar'); - var sidebarwrapper = $('.sphinxsidebarwrapper'); - - // for some reason, the document has no sidebar; do not run into errors - if (!sidebar.length) return; - - // original margin-left of the bodywrapper and width of the sidebar - // with the sidebar expanded - var bw_margin_expanded = bodywrapper.css('margin-left'); - var ssb_width_expanded = sidebar.width(); - - // margin-left of the bodywrapper and width of the sidebar - // with the sidebar collapsed - var bw_margin_collapsed = '.8em'; - var ssb_width_collapsed = '.8em'; - - // colors used by the current theme - var dark_color = $('.related').css('background-color'); - var light_color = $('.document').css('background-color'); - - function sidebar_is_collapsed() { - return sidebarwrapper.is(':not(:visible)'); - } - - function toggle_sidebar() { - if (sidebar_is_collapsed()) - expand_sidebar(); - else - collapse_sidebar(); - } - - function collapse_sidebar() { - sidebarwrapper.hide(); - sidebar.css('width', ssb_width_collapsed); - bodywrapper.css('margin-left', bw_margin_collapsed); - sidebarbutton.css({ - 'margin-left': '0', - 'height': bodywrapper.height() - }); - sidebarbutton.find('span').text('»'); - sidebarbutton.attr('title', _('Expand sidebar')); - document.cookie = 'sidebar=collapsed'; - } - - function expand_sidebar() { - bodywrapper.css('margin-left', bw_margin_expanded); - sidebar.css('width', ssb_width_expanded); - sidebarwrapper.show(); - sidebarbutton.css({ - 'margin-left': ssb_width_expanded-12, - 'height': bodywrapper.height() - }); - sidebarbutton.find('span').text('«'); - sidebarbutton.attr('title', _('Collapse sidebar')); - document.cookie = 'sidebar=expanded'; - } - - function add_sidebar_button() { - sidebarwrapper.css({ - 'float': 'left', - 'margin-right': '0', - 'width': ssb_width_expanded - 28 - }); - // create the button - sidebar.append( - '
    «
    ' - ); - var sidebarbutton = $('#sidebarbutton'); - light_color = sidebarbutton.css('background-color'); - // find the height of the viewport to center the '<<' in the page - var viewport_height; - if (window.innerHeight) - viewport_height = window.innerHeight; - else - viewport_height = $(window).height(); - sidebarbutton.find('span').css({ - 'display': 'block', - 'margin-top': (viewport_height - sidebar.position().top - 20) / 2 - }); - - sidebarbutton.click(toggle_sidebar); - sidebarbutton.attr('title', _('Collapse sidebar')); - sidebarbutton.css({ - 'color': '#FFFFFF', - 'border-left': '1px solid ' + dark_color, - 'font-size': '1.2em', - 'cursor': 'pointer', - 'height': bodywrapper.height(), - 'padding-top': '1px', - 'margin-left': ssb_width_expanded - 12 - }); - - sidebarbutton.hover( - function () { - $(this).css('background-color', dark_color); - }, - function () { - $(this).css('background-color', light_color); - } - ); - } - - function set_position_from_cookie() { - if (!document.cookie) - return; - var items = document.cookie.split(';'); - for(var k=0; k=e.computed&&(e={value:f,computed:g})});return e.value};b.min=function(a,c,d){if(!c&&b.isArray(a))return Math.min.apply(Math,a);var e={computed:Infinity};b.each(a,function(f,g,h){g=c?c.call(d,f,g,h):f;gf?1:0}),"value")};b.sortedIndex=function(a,c,d){d=d||b.identity;for(var e=0,f=a.length;e>1;d(a[g])=0})})};b.zip=function(){for(var a=b.toArray(arguments),c=b.max(b.pluck(a,"length")),d=new Array(c),e=0;e0?f-c:c-f)>=0)return e;e[g++]=f}};b.bind=function(a,c){var d=b.rest(arguments,2);return function(){return a.apply(c||j,d.concat(b.toArray(arguments)))}};b.bindAll=function(a){var c=b.rest(arguments);if(c.length==0)c=b.functions(a);b.each(c,function(d){a[d]=b.bind(a[d],a)}); -return a};b.delay=function(a,c){var d=b.rest(arguments,2);return setTimeout(function(){return a.apply(a,d)},c)};b.defer=function(a){return b.delay.apply(b,[a,1].concat(b.rest(arguments)))};b.wrap=function(a,c){return function(){var d=[a].concat(b.toArray(arguments));return c.apply(c,d)}};b.compose=function(){var a=b.toArray(arguments);return function(){for(var c=b.toArray(arguments),d=a.length-1;d>=0;d--)c=[a[d].apply(this,c)];return c[0]}};b.keys=function(a){if(b.isArray(a))return b.range(0,a.length); -var c=[];for(var d in a)q.call(a,d)&&c.push(d);return c};b.values=function(a){return b.map(a,b.identity)};b.functions=function(a){return b.select(b.keys(a),function(c){return b.isFunction(a[c])}).sort()};b.extend=function(a,c){for(var d in c)a[d]=c[d];return a};b.clone=function(a){if(b.isArray(a))return a.slice(0);return b.extend({},a)};b.tap=function(a,c){c(a);return a};b.isEqual=function(a,c){if(a===c)return true;var d=typeof a;if(d!=typeof c)return false;if(a==c)return true;if(!a&&c||a&&!c)return false; -if(a.isEqual)return a.isEqual(c);if(b.isDate(a)&&b.isDate(c))return a.getTime()===c.getTime();if(b.isNaN(a)&&b.isNaN(c))return true;if(b.isRegExp(a)&&b.isRegExp(c))return a.source===c.source&&a.global===c.global&&a.ignoreCase===c.ignoreCase&&a.multiline===c.multiline;if(d!=="object")return false;if(a.length&&a.length!==c.length)return false;d=b.keys(a);var e=b.keys(c);if(d.length!=e.length)return false;for(var f in a)if(!b.isEqual(a[f],c[f]))return false;return true};b.isEmpty=function(a){return b.keys(a).length== -0};b.isElement=function(a){return!!(a&&a.nodeType==1)};b.isArray=function(a){return!!(a&&a.concat&&a.unshift)};b.isArguments=function(a){return a&&b.isNumber(a.length)&&!b.isArray(a)&&!r.call(a,"length")};b.isFunction=function(a){return!!(a&&a.constructor&&a.call&&a.apply)};b.isString=function(a){return!!(a===""||a&&a.charCodeAt&&a.substr)};b.isNumber=function(a){return p.call(a)==="[object Number]"};b.isDate=function(a){return!!(a&&a.getTimezoneOffset&&a.setUTCFullYear)};b.isRegExp=function(a){return!!(a&& -a.test&&a.exec&&(a.ignoreCase||a.ignoreCase===false))};b.isNaN=function(a){return b.isNumber(a)&&isNaN(a)};b.isNull=function(a){return a===null};b.isUndefined=function(a){return typeof a=="undefined"};b.noConflict=function(){j._=n;return this};b.identity=function(a){return a};b.breakLoop=function(){throw m;};var s=0;b.uniqueId=function(a){var c=s++;return a?a+c:c};b.template=function(a,c){a=new Function("obj","var p=[],print=function(){p.push.apply(p,arguments);};with(obj){p.push('"+a.replace(/[\r\t\n]/g, -" ").replace(/'(?=[^%]*%>)/g,"\t").split("'").join("\\'").split("\t").join("'").replace(/<%=(.+?)%>/g,"',$1,'").split("<%").join("');").split("%>").join("p.push('")+"');}return p.join('');");return c?a(c):a};b.forEach=b.each;b.foldl=b.inject=b.reduce;b.foldr=b.reduceRight;b.filter=b.select;b.every=b.all;b.some=b.any;b.head=b.first;b.tail=b.rest;b.methods=b.functions;var l=function(a,c){return c?b(a).chain():a};b.each(b.functions(b),function(a){var c=b[a];i.prototype[a]=function(){var d=b.toArray(arguments); -o.call(d,this._wrapped);return l(c.apply(b,d),this._chain)}});b.each(["pop","push","reverse","shift","sort","splice","unshift"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){c.apply(this._wrapped,arguments);return l(this._wrapped,this._chain)}});b.each(["concat","join","slice"],function(a){var c=Array.prototype[a];i.prototype[a]=function(){return l(c.apply(this._wrapped,arguments),this._chain)}});i.prototype.chain=function(){this._chain=true;return this};i.prototype.value=function(){return this._wrapped}})(); diff --git a/python/plugins/sextante/help/_static/up-pressed.png b/python/plugins/sextante/help/_static/up-pressed.png deleted file mode 100644 index 8bd587afee2f..000000000000 Binary files a/python/plugins/sextante/help/_static/up-pressed.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/up.png b/python/plugins/sextante/help/_static/up.png deleted file mode 100644 index b94625680b4a..000000000000 Binary files a/python/plugins/sextante/help/_static/up.png and /dev/null differ diff --git a/python/plugins/sextante/help/_static/websupport.js b/python/plugins/sextante/help/_static/websupport.js deleted file mode 100644 index 33d66fb56290..000000000000 --- a/python/plugins/sextante/help/_static/websupport.js +++ /dev/null @@ -1,808 +0,0 @@ -/* - * websupport.js - * ~~~~~~~~~~~~~ - * - * sphinx.websupport utilities for all documentation. - * - * :copyright: Copyright 2007-2011 by the Sphinx team, see AUTHORS. - * :license: BSD, see LICENSE for details. - * - */ - -(function($) { - $.fn.autogrow = function() { - return this.each(function() { - var textarea = this; - - $.fn.autogrow.resize(textarea); - - $(textarea) - .focus(function() { - textarea.interval = setInterval(function() { - $.fn.autogrow.resize(textarea); - }, 500); - }) - .blur(function() { - clearInterval(textarea.interval); - }); - }); - }; - - $.fn.autogrow.resize = function(textarea) { - var lineHeight = parseInt($(textarea).css('line-height'), 10); - var lines = textarea.value.split('\n'); - var columns = textarea.cols; - var lineCount = 0; - $.each(lines, function() { - lineCount += Math.ceil(this.length / columns) || 1; - }); - var height = lineHeight * (lineCount + 1); - $(textarea).css('height', height); - }; -})(jQuery); - -(function($) { - var comp, by; - - function init() { - initEvents(); - initComparator(); - } - - function initEvents() { - $('a.comment-close').live("click", function(event) { - event.preventDefault(); - hide($(this).attr('id').substring(2)); - }); - $('a.vote').live("click", function(event) { - event.preventDefault(); - handleVote($(this)); - }); - $('a.reply').live("click", function(event) { - event.preventDefault(); - openReply($(this).attr('id').substring(2)); - }); - $('a.close-reply').live("click", function(event) { - event.preventDefault(); - closeReply($(this).attr('id').substring(2)); - }); - $('a.sort-option').live("click", function(event) { - event.preventDefault(); - handleReSort($(this)); - }); - $('a.show-proposal').live("click", function(event) { - event.preventDefault(); - showProposal($(this).attr('id').substring(2)); - }); - $('a.hide-proposal').live("click", function(event) { - event.preventDefault(); - hideProposal($(this).attr('id').substring(2)); - }); - $('a.show-propose-change').live("click", function(event) { - event.preventDefault(); - showProposeChange($(this).attr('id').substring(2)); - }); - $('a.hide-propose-change').live("click", function(event) { - event.preventDefault(); - hideProposeChange($(this).attr('id').substring(2)); - }); - $('a.accept-comment').live("click", function(event) { - event.preventDefault(); - acceptComment($(this).attr('id').substring(2)); - }); - $('a.delete-comment').live("click", function(event) { - event.preventDefault(); - deleteComment($(this).attr('id').substring(2)); - }); - $('a.comment-markup').live("click", function(event) { - event.preventDefault(); - toggleCommentMarkupBox($(this).attr('id').substring(2)); - }); - } - - /** - * Set comp, which is a comparator function used for sorting and - * inserting comments into the list. - */ - function setComparator() { - // If the first three letters are "asc", sort in ascending order - // and remove the prefix. - if (by.substring(0,3) == 'asc') { - var i = by.substring(3); - comp = function(a, b) { return a[i] - b[i]; }; - } else { - // Otherwise sort in descending order. - comp = function(a, b) { return b[by] - a[by]; }; - } - - // Reset link styles and format the selected sort option. - $('a.sel').attr('href', '#').removeClass('sel'); - $('a.by' + by).removeAttr('href').addClass('sel'); - } - - /** - * Create a comp function. If the user has preferences stored in - * the sortBy cookie, use those, otherwise use the default. - */ - function initComparator() { - by = 'rating'; // Default to sort by rating. - // If the sortBy cookie is set, use that instead. - if (document.cookie.length > 0) { - var start = document.cookie.indexOf('sortBy='); - if (start != -1) { - start = start + 7; - var end = document.cookie.indexOf(";", start); - if (end == -1) { - end = document.cookie.length; - by = unescape(document.cookie.substring(start, end)); - } - } - } - setComparator(); - } - - /** - * Show a comment div. - */ - function show(id) { - $('#ao' + id).hide(); - $('#ah' + id).show(); - var context = $.extend({id: id}, opts); - var popup = $(renderTemplate(popupTemplate, context)).hide(); - popup.find('textarea[name="proposal"]').hide(); - popup.find('a.by' + by).addClass('sel'); - var form = popup.find('#cf' + id); - form.submit(function(event) { - event.preventDefault(); - addComment(form); - }); - $('#s' + id).after(popup); - popup.slideDown('fast', function() { - getComments(id); - }); - } - - /** - * Hide a comment div. - */ - function hide(id) { - $('#ah' + id).hide(); - $('#ao' + id).show(); - var div = $('#sc' + id); - div.slideUp('fast', function() { - div.remove(); - }); - } - - /** - * Perform an ajax request to get comments for a node - * and insert the comments into the comments tree. - */ - function getComments(id) { - $.ajax({ - type: 'GET', - url: opts.getCommentsURL, - data: {node: id}, - success: function(data, textStatus, request) { - var ul = $('#cl' + id); - var speed = 100; - $('#cf' + id) - .find('textarea[name="proposal"]') - .data('source', data.source); - - if (data.comments.length === 0) { - ul.html('
  • No comments yet.
    • '); - ul.data('empty', true); - } else { - // If there are comments, sort them and put them in the list. - var comments = sortComments(data.comments); - speed = data.comments.length * 100; - appendComments(comments, ul); - ul.data('empty', false); - } - $('#cn' + id).slideUp(speed + 200); - ul.slideDown(speed); - }, - error: function(request, textStatus, error) { - showError('Oops, there was a problem retrieving the comments.'); - }, - dataType: 'json' - }); - } - - /** - * Add a comment via ajax and insert the comment into the comment tree. - */ - function addComment(form) { - var node_id = form.find('input[name="node"]').val(); - var parent_id = form.find('input[name="parent"]').val(); - var text = form.find('textarea[name="comment"]').val(); - var proposal = form.find('textarea[name="proposal"]').val(); - - if (text == '') { - showError('Please enter a comment.'); - return; - } - - // Disable the form that is being submitted. - form.find('textarea,input').attr('disabled', 'disabled'); - - // Send the comment to the server. - $.ajax({ - type: "POST", - url: opts.addCommentURL, - dataType: 'json', - data: { - node: node_id, - parent: parent_id, - text: text, - proposal: proposal - }, - success: function(data, textStatus, error) { - // Reset the form. - if (node_id) { - hideProposeChange(node_id); - } - form.find('textarea') - .val('') - .add(form.find('input')) - .removeAttr('disabled'); - var ul = $('#cl' + (node_id || parent_id)); - if (ul.data('empty')) { - $(ul).empty(); - ul.data('empty', false); - } - insertComment(data.comment); - var ao = $('#ao' + node_id); - ao.find('img').attr({'src': opts.commentBrightImage}); - if (node_id) { - // if this was a "root" comment, remove the commenting box - // (the user can get it back by reopening the comment popup) - $('#ca' + node_id).slideUp(); - } - }, - error: function(request, textStatus, error) { - form.find('textarea,input').removeAttr('disabled'); - showError('Oops, there was a problem adding the comment.'); - } - }); - } - - /** - * Recursively append comments to the main comment list and children - * lists, creating the comment tree. - */ - function appendComments(comments, ul) { - $.each(comments, function() { - var div = createCommentDiv(this); - ul.append($(document.createElement('li')).html(div)); - appendComments(this.children, div.find('ul.comment-children')); - // To avoid stagnating data, don't store the comments children in data. - this.children = null; - div.data('comment', this); - }); - } - - /** - * After adding a new comment, it must be inserted in the correct - * location in the comment tree. - */ - function insertComment(comment) { - var div = createCommentDiv(comment); - - // To avoid stagnating data, don't store the comments children in data. - comment.children = null; - div.data('comment', comment); - - var ul = $('#cl' + (comment.node || comment.parent)); - var siblings = getChildren(ul); - - var li = $(document.createElement('li')); - li.hide(); - - // Determine where in the parents children list to insert this comment. - for(i=0; i < siblings.length; i++) { - if (comp(comment, siblings[i]) <= 0) { - $('#cd' + siblings[i].id) - .parent() - .before(li.html(div)); - li.slideDown('fast'); - return; - } - } - - // If we get here, this comment rates lower than all the others, - // or it is the only comment in the list. - ul.append(li.html(div)); - li.slideDown('fast'); - } - - function acceptComment(id) { - $.ajax({ - type: 'POST', - url: opts.acceptCommentURL, - data: {id: id}, - success: function(data, textStatus, request) { - $('#cm' + id).fadeOut('fast'); - $('#cd' + id).removeClass('moderate'); - }, - error: function(request, textStatus, error) { - showError('Oops, there was a problem accepting the comment.'); - } - }); - } - - function deleteComment(id) { - $.ajax({ - type: 'POST', - url: opts.deleteCommentURL, - data: {id: id}, - success: function(data, textStatus, request) { - var div = $('#cd' + id); - if (data == 'delete') { - // Moderator mode: remove the comment and all children immediately - div.slideUp('fast', function() { - div.remove(); - }); - return; - } - // User mode: only mark the comment as deleted - div - .find('span.user-id:first') - .text('[deleted]').end() - .find('div.comment-text:first') - .text('[deleted]').end() - .find('#cm' + id + ', #dc' + id + ', #ac' + id + ', #rc' + id + - ', #sp' + id + ', #hp' + id + ', #cr' + id + ', #rl' + id) - .remove(); - var comment = div.data('comment'); - comment.username = '[deleted]'; - comment.text = '[deleted]'; - div.data('comment', comment); - }, - error: function(request, textStatus, error) { - showError('Oops, there was a problem deleting the comment.'); - } - }); - } - - function showProposal(id) { - $('#sp' + id).hide(); - $('#hp' + id).show(); - $('#pr' + id).slideDown('fast'); - } - - function hideProposal(id) { - $('#hp' + id).hide(); - $('#sp' + id).show(); - $('#pr' + id).slideUp('fast'); - } - - function showProposeChange(id) { - $('#pc' + id).hide(); - $('#hc' + id).show(); - var textarea = $('#pt' + id); - textarea.val(textarea.data('source')); - $.fn.autogrow.resize(textarea[0]); - textarea.slideDown('fast'); - } - - function hideProposeChange(id) { - $('#hc' + id).hide(); - $('#pc' + id).show(); - var textarea = $('#pt' + id); - textarea.val('').removeAttr('disabled'); - textarea.slideUp('fast'); - } - - function toggleCommentMarkupBox(id) { - $('#mb' + id).toggle(); - } - - /** Handle when the user clicks on a sort by link. */ - function handleReSort(link) { - var classes = link.attr('class').split(/\s+/); - for (var i=0; iThank you! Your comment will show up ' - + 'once it is has been approved by a moderator.'); - } - // Prettify the comment rating. - comment.pretty_rating = comment.rating + ' point' + - (comment.rating == 1 ? '' : 's'); - // Make a class (for displaying not yet moderated comments differently) - comment.css_class = comment.displayed ? '' : ' moderate'; - // Create a div for this comment. - var context = $.extend({}, opts, comment); - var div = $(renderTemplate(commentTemplate, context)); - - // If the user has voted on this comment, highlight the correct arrow. - if (comment.vote) { - var direction = (comment.vote == 1) ? 'u' : 'd'; - div.find('#' + direction + 'v' + comment.id).hide(); - div.find('#' + direction + 'u' + comment.id).show(); - } - - if (opts.moderator || comment.text != '[deleted]') { - div.find('a.reply').show(); - if (comment.proposal_diff) - div.find('#sp' + comment.id).show(); - if (opts.moderator && !comment.displayed) - div.find('#cm' + comment.id).show(); - if (opts.moderator || (opts.username == comment.username)) - div.find('#dc' + comment.id).show(); - } - return div; - } - - /** - * A simple template renderer. Placeholders such as <%id%> are replaced - * by context['id'] with items being escaped. Placeholders such as <#id#> - * are not escaped. - */ - function renderTemplate(template, context) { - var esc = $(document.createElement('div')); - - function handle(ph, escape) { - var cur = context; - $.each(ph.split('.'), function() { - cur = cur[this]; - }); - return escape ? esc.text(cur || "").html() : cur; - } - - return template.replace(/<([%#])([\w\.]*)\1>/g, function() { - return handle(arguments[2], arguments[1] == '%' ? true : false); - }); - } - - /** Flash an error message briefly. */ - function showError(message) { - $(document.createElement('div')).attr({'class': 'popup-error'}) - .append($(document.createElement('div')) - .attr({'class': 'error-message'}).text(message)) - .appendTo('body') - .fadeIn("slow") - .delay(2000) - .fadeOut("slow"); - } - - /** Add a link the user uses to open the comments popup. */ - $.fn.comment = function() { - return this.each(function() { - var id = $(this).attr('id').substring(1); - var count = COMMENT_METADATA[id]; - var title = count + ' comment' + (count == 1 ? '' : 's'); - var image = count > 0 ? opts.commentBrightImage : opts.commentImage; - var addcls = count == 0 ? ' nocomment' : ''; - $(this) - .append( - $(document.createElement('a')).attr({ - href: '#', - 'class': 'sphinx-comment-open' + addcls, - id: 'ao' + id - }) - .append($(document.createElement('img')).attr({ - src: image, - alt: 'comment', - title: title - })) - .click(function(event) { - event.preventDefault(); - show($(this).attr('id').substring(2)); - }) - ) - .append( - $(document.createElement('a')).attr({ - href: '#', - 'class': 'sphinx-comment-close hidden', - id: 'ah' + id - }) - .append($(document.createElement('img')).attr({ - src: opts.closeCommentImage, - alt: 'close', - title: 'close' - })) - .click(function(event) { - event.preventDefault(); - hide($(this).attr('id').substring(2)); - }) - ); - }); - }; - - var opts = { - processVoteURL: '/_process_vote', - addCommentURL: '/_add_comment', - getCommentsURL: '/_get_comments', - acceptCommentURL: '/_accept_comment', - deleteCommentURL: '/_delete_comment', - commentImage: '/static/_static/comment.png', - closeCommentImage: '/static/_static/comment-close.png', - loadingImage: '/static/_static/ajax-loader.gif', - commentBrightImage: '/static/_static/comment-bright.png', - upArrow: '/static/_static/up.png', - downArrow: '/static/_static/down.png', - upArrowPressed: '/static/_static/up-pressed.png', - downArrowPressed: '/static/_static/down-pressed.png', - voting: false, - moderator: false - }; - - if (typeof COMMENT_OPTIONS != "undefined") { - opts = jQuery.extend(opts, COMMENT_OPTIONS); - } - - var popupTemplate = '\ -
    \ -

    \ - Sort by:\ - best rated\ - newest\ - oldest\ -

    \ -
    Comments
    \ -
    \ - loading comments...
    \ -
      \ -
      \ -

      Add a comment\ - (markup):

      \ -
      \ - reStructured text markup: *emph*, **strong**, \ - ``code``, \ - code blocks: :: and an indented block after blank line
      \ -
      \ - \ -

      \ - \ - Propose a change ▹\ - \ - \ - Propose a change ▿\ - \ -

      \ - \ - \ - \ - \ -
      \ -
      \ -
      '; - - var commentTemplate = '\ -
      \ -
      \ -
      \ - \ - \ - \ - \ - \ - \ -
      \ -
      \ - \ - \ - \ - \ - \ - \ -
      \ -
      \ -
      \ -

      \ - <%username%>\ - <%pretty_rating%>\ - <%time.delta%>\ -

      \ -
      <#text#>
      \ -

      \ - \ - reply ▿\ - proposal ▹\ - proposal ▿\ - \ - \ -

      \ - 
      \
-<#proposal_diff#>\
-
      \ -
        \ -
        \ -
        \ -
        \ - '; - - var replyTemplate = '\ -
      • \ -
        \ -
        \ - \ - \ - \ - \ - \ -
        \ -
        \ -
        • '; - - $(document).ready(function() { - init(); - }); -})(jQuery); - -$(document).ready(function() { - // add comment anchors for all paragraphs that are commentable - $('.sphinx-has-comment').comment(); - - // highlight search words in search results - $("div.context").each(function() { - var params = $.getQueryParameters(); - var terms = (params.q) ? params.q[0].split(/\s+/) : []; - var result = $(this); - $.each(terms, function() { - result.highlightText(this.toLowerCase(), 'highlighted'); - }); - }); - - // directly open comment window if requested - var anchor = document.location.hash; - if (anchor.substring(0, 9) == '#comment-') { - $('#ao' + anchor.substring(9)).click(); - document.location.hash = '#s' + anchor.substring(9); - } -}); diff --git a/python/plugins/sextante/help/batch.html b/python/plugins/sextante/help/batch.html deleted file mode 100644 index a70fc18be5ec..000000000000 --- a/python/plugins/sextante/help/batch.html +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - The SEXTANTE batch processing interface — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - -
        -

        The SEXTANTE batch processing interface

        -
        -

        Introduction

        -

        SEXTANTE algorithms (including models) can be executed as a batch -process. That is, they can be executed using not a single set of inputs, -but several of them, executing the algorithm as many times as needed. -This is useful when processing large amounts of data, since it is not -necessary to launch the algorithm many times from the toolbox.

        -

        To execute an algorithm as a batch process, right-click on its name in -the toolbox and select the Execute as batch process option in the -pop-up menu that will appear

        -_images/batch_processing_right_click.png -
        -
        -

        The parameters table

        -

        Executing a batch process is similar to performing a single execution of -an algorithm. Parameter values have to be defined, but in this case we -need not just a single value for each parameter, but a set of them -instead, one for each time the algorithm has to be executed. Values are -introduced using a table like the one shown next.

        -_images/batch_processing.png -

        Each line of this table represents a single execution of the algorithm, -and each cell contains the value of one of the parameters. It is similar -to the parameters dialog that you see when executing an algorithm from -the toolbox, but with a different arrangement.

        -

        By default, the table contains just two rows. You can add or remove rows -using the buttons on the lower part of the window.

        -

        Once the size of the table has been set, it has to be filled with the -desired values

        -
        -
        -

        Filling the parameters table

        -

        For most parameters, setting its value is trivial. Just type the value -or select it from the list of available options, depending on the -parameter type.

        -

        The main differences are found for parameters representing layers or -tables, and for output filepaths. Regarding input layers and tables, -when an algorithm is executed as part of a batch process those input -data objects are taken directly from files, and not from the set of them -already opened in QGIS. For this reason, any algorithm can be executed -as a batch process even if no data objects at all are opened and the -algorithm cannot be run from the toolbox.

        -

        Filenames for input data objects are introduced directly typing or, more -conveniently, clicking on the button on the right hand of the cell, -which shows a typical file chooser dialog. Multiple files can be -selected at once. If the input parameter represents a single data object -and several files are selected, each one of them will be put in a -separate row, adding new ones if needed. If it represents a multiple -input, all the selected files will be added to a single cell, separated -by semicolons.

        -

        Output data objects are always saved to a file and, unlike when -executing an algorithm from the toolbox, saving to a temporary one is -not permitted. You can type the name directly or use the file chooser -dialog that appears when clicking on the accompanying button.

        -

        Once you select the file, a new dialog is shown to allow for -autocompletion of other cells in the same column (same parameter).

        -_images/batch_processing_save.png -

        If the default value (Do not autocomplete) is selected, SEXTANTE will -just put the selected filename in the selected cell from the parameters -table. If any of the other options is selected, all the cells below the -selected one will be automatically filled based on a defined criteria. -This way, it is much easier to fill the table, and the batch process can -be defined with less effort.

        -

        Automatic filling can be done simply adding correlative numbers to the -selected filepath, or appending the value of another field at the same -row. This is particularly useful for naming output data object according -to input ones.

        -_images/batch_processing_filepath.png -
        -
        -

        Executing the batch process

        -

        To execute the batch process once you have introduced all the necessary -values, just click on OK. SEXTANTE will show the progress of the -global batch process in the progress bar in the lower part of the -dialog.

        -
        -
        - - -
        -
        -
        -
        -
        -

        Table Of Contents

        - - -

        Previous topic

        -

        The SEXTANTE graphical modeler

        -

        Next topic

        -

        Using SEXTANTE from the console. Creating scripts.

        -

        This Page

        - - - -
        -
        -
        -
        -
        -

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/help/console.html b/python/plugins/sextante/help/console.html deleted file mode 100644 index 7e2ad4925a1e..000000000000 --- a/python/plugins/sextante/help/console.html +++ /dev/null @@ -1,410 +0,0 @@ - - - - - - - - - - Using SEXTANTE from the console. Creating scripts. — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - -
        -

        Using SEXTANTE from the console. Creating scripts.

        -
        -

        Introduction

        -

        The console allows advanced users to increase their productivity and -perform complex operations that cannot be performed using any of the -other elements of the SEXTANTE GUI. Models involving several algorithms -can be defined using the command-line interface, and additional -operations such as loops and conditional sentences can be added to -create more flexible and powerful workflows.

        -

        There is not a SEXTANTE console in QGIS, but all SEXTANTE commands are -available instead from QGIS built-in Python console. That means that you -can incorporate those command to your console work and connect SEXTANTE -algorithms to all the other features (including methods from the QGIS -API) available from there.

        -

        The code that you can execute from the Python console, even if it does -call any SEXTANTE method, can be converted into a new SEXTANTE algorithm -that you can later call from the toolbox, the graphical modeler or any -other SEXTANTE component, just like you do with any other SEXTANTE -algorithm. In fact, some algorithms that you can find in the toolbox, -like all the ones in the mmqgis group, are simple scripts.

        -

        In this chapter we will see how to use SEXTANTE from the QGIS Python -console, and also how to write your own algorithms using Python.

        -
        -
        -

        Calling SEXTANTE from the Python console

        -

        The first thing you have to do is to import the Sextante class with -the following line:

        -
        >>from sextante.core.Sextante import Sextante
        -
        -

        Now, there is basically just one (interesting) thing you can do with -SEXTANTE from the console: to execute an algorithm. That is done using -the runalg() method, which takes the name of the algorithm to -execute as its first parameter, and then a variable number of additional -parameter depending on the requirements of the algorithm. So the first -thing you need to know is the name of the algorithm to execute. That is -not the name you see in the toolbox, but rather a unique command–line -name. To find the right name for your algorithm, you can use the -algslist() method. Type the following line in you console:

        -

        You will see something like this.

        -
        >>> Sextante.alglist()
-Accumulated Cost (Anisotropic)---------------->saga:accumulatedcost(anisotropic)
-Accumulated Cost (Isotropic)------------------>saga:accumulatedcost(isotropic)
-Add Coordinates to points--------------------->saga:addcoordinatestopoints
-Add Grid Values to Points--------------------->saga:addgridvaluestopoints
-Add Grid Values to Shapes--------------------->saga:addgridvaluestoshapes
-Add Polygon Attributes to Points-------------->saga:addpolygonattributestopoints
-Aggregate------------------------------------->saga:aggregate
-Aggregate Point Observations------------------>saga:aggregatepointobservations
-Aggregation Index----------------------------->saga:aggregationindex
-Analytical Hierarchy Process------------------>saga:analyticalhierarchyprocess
-Analytical Hillshading------------------------>saga:analyticalhillshading
-Average With Mask 1--------------------------->saga:averagewithmask1
-Average With Mask 2--------------------------->saga:averagewithmask2
-Average With Thereshold 1--------------------->saga:averagewiththereshold1
-Average With Thereshold 2--------------------->saga:averagewiththereshold2
-Average With Thereshold 3--------------------->saga:averagewiththereshold3
-B-Spline Approximation------------------------>saga:b-splineapproximation
-.
-.
-.
-
        -
        -

        That’s a list of all the available algorithms, alphabetically ordered, -along with their corresponding command-line names.

        -

        You can use a string as a parameter for this method. Instead of -returning the full list of algorithm, it will only display those that -include that string. If, for instance, you are looking for an algorithm -to calculate slope from a DEM, type alglist("slope") to get the -following result:

        -
        DTM Filter (slope-based)---------------------->saga:dtmfilter(slope-based)
-Downslope Distance Gradient------------------->saga:downslopedistancegradient
-Relative Heights and Slope Positions---------->saga:relativeheightsandslopepositions
-Slope Length---------------------------------->saga:slopelength
-Slope, Aspect, Curvature---------------------->saga:slopeaspectcurvature
-Upslope Area---------------------------------->saga:upslopearea
-Vegetation Index[slope based]----------------->saga:vegetationindex[slopebased]
        -
        -

        It is easier now to find the algorithm you are looking for and its -command-line name, in this case saga:slopeaspectcurvature

        -

        Once you know the command-line name of the algorithm, the next thing to -do is to know the right syntax to execute it. That means knowing which -parameters are needed and the order in which they have to be passed when -calling the runalg() method. SEXTANTE has a method to describe an -algorithm in detail, which can be used to get a list of the parameters -that an algorithms require and the outputs that it will generate. To do -it, you can use the alghelp(name_of_the_algorithm) method. Use the -command-line name of the algorithm, not the full descriptive name.

        -

        Calling the method with saga:slopeaspectcurvature as parameter, you -get the following description.

        -
        >Sextante.alghelp("saga:slopeaspectcurvature")
-ALGORITHM: Slope, Aspect, Curvature
-   ELEVATION <ParameterRaster>
-   METHOD <ParameterSelection>
-   SLOPE <OutputRaster>
-   ASPECT <OutputRaster>
-   CURV <OutputRaster>
-   HCURV <OutputRaster>
-   VCURV <OutputRaster>
        -
        -

        Now you have everything you need to run any algorithm. As we have -already mentioned, there is only one single command to execute -algorithms: runalg. Its syntax is as follows:

        -
        > runalg{name_of_the_algorithm, param1, param2, ..., paramN,
-         Output1, Output2, ..., OutputN)
        -
        -

        The list of parameters and outputs to add depends on the algorithm you -want to run, and is exactly the list that the describealg method -gives you, in the same order as shown.

        -

        Depending on the type of parameter, values are introduced differently. -The next one is a quick review of how to introduce values for each type -of input parameter

        -
          -

        • Raster Layer, Vector Layer or Table. Simply use a string with the -name that identifies the data object to use (the name it has in the -QGIS Table of Contents) or a filename (if the corresponding layer is -not opened, it will be opened, but not added to the map canvas). If -you have an instance of a QGIS object representing the layer, you can -also pass it as parameter. If the input is optional and you do not -want to use any data object, use None.

          -
          • -

        • Selection. If an algorithm has a selection parameter, the value of -that parameter should be entered using an integer value. To know the -available options, you can use the algoptions command, as shown -in the following example:

          -
          >>Sextante.algoptions("saga:slopeaspectcurvature")
-METHOD(Method)
-    0 - [0] Maximum Slope (Travis et al. 1975)
-    1 - [1] Maximum Triangle Slope (Tarboton 1997)
-    2 - [2] Least Squares Fitted Plane (Horn 1981, Costa-Cabral & Burgess 1996)
-    3 - [3] Fit 2.Degree Polynom (Bauer, Rohdenburg, Bork 1985)
-    4 - [4] Fit 2.Degree Polynom (Heerdegen & Beran 1982)
-    5 - [5] Fit 2.Degree Polynom (Zevenbergen & Thorne 1987)
-    6 - [6] Fit 3.Degree Polynom (Haralick 1983)
          -
          -

          In this case, the algorithm has one of such such parameters, with 7 -options. Notice that ordering is zero-based.

          -
          • -

        • Multiple input. The value is a string with input descriptors -separated by semicolons. As in the case of single layers or tables, -each input descriptor can be the data object name, or its filepath.

          -
          • -

        • Table Field from XXX. Use a string with the name of the field to use. -This parameter is case-sensitive.

          -
          • -

        • Fixed Table. Type the list of all table values separated by commas -and enclosed between quotes. Values start on the upper row and go -from left to right. You can also use a 2D array of values -representing the table.

          -
          • -

        • CRS: Enter the EPSG code number of the desired CRS

          -
          • -

        • Extent: You must use a string with xmin,xmax,ymin and ymax values separated by commas

          -
          • -
        -

        Boolean, file, string and numerical parameters do not need any additional -explanations.

        -

        Input parameters such as strings booleans or numerical values have default -values. To use them, use None in the corresponding parameter entry.

        -

        For output data objects, type the filepath to be used to save it, just -as it is done from the toolbox. If you want to save the result to a -temporary file, use None. The extension of the file determines the -file format. If you enter a file extension not included in the ones -supported by the algorithm, the default file format for that output -type will be used, and its corresponding extension appended to the given -filepath.

        -

        Unlike when an algorithm is executed from the toolbox, outputs are not -added to the map canvas if you execute that same algorithm from the -Python console. If you want to add an output to it, you have to do it -yourself after running the algorithm. To do so, you can use QGIS API -commands, or, even easier, use one of the handy methods provided by -SEXTANTE for such task.

        -

        The runalg method returns a dictionary with the output names (the -ones shown in the algorithm description) as keys and the filepaths of -those outputs as values. To add all the outputs generated by an -algorithm, pass that dictionary to the loadFromAlg() method. You can -also load an individual layer passing its filepath to the load() -method.

        -
        -
        -

        Creating scripts and running them from the toolbox

        -

        You can create your own algorithms by writing the corresponding Python -code and adding a few extra lines to supply additional information -needed by SEXTANTE. You can find a Create new script under the tools -group in the script algorithms block of the toolbox. Double click on it -to open the script edition dialog. That’s where you should type your -code. Saving the script from there in the scripts folder (the default -one when you open the save file dialog), with .py extension, will -automatically create the corresponding algorithm.

        -

        The name of the algorithm (the one you will see in the toolbox) is -created from the filename, removing its extension and replacing low -hyphens with blank spaces.

        -

        Let’s have the following code, which calculates the Topographic Wetness -Index(TWI) directly from a DEM

        -
        ##dem=raster
-##twi=output
-ret_slope = Sextante.runalg("saga:slopeaspectcurvature", dem, 0, None,
-                None, None, None, None)
-ret_area = Sextante.runalg("saga:catchmentarea(mass-fluxmethod)", "dem",
-                0, False, False, False, False, None, None, None, None, None)
-Sextante.runalg("saga:topographicwetnessindex(twi), ret_slope['SLOPE'],
-                ret_area['AREA'], None, 1, 0, twi)
        -
        -

        As you can see, it involves 3 algorithms, all of them coming from SAGA. -The last one of them calculates de TWI, but it needs a slope layer and a -flow accumulation layer. We do not have these ones, but since we have -the DEM, we can calculate them calling the corresponding SAGA -algorithms.

        -

        The part of the code where this processing takes place is not difficult -to understand if you have read the previous sections in this chapter. -The first lines, however, need some additional explanation. They provide -SEXTANTE the information it needs to turn your code into an algorithm -that can be run from any of its components, like the toolbox or the -graphical modeler.

        -

        These lines start with a double Python comment symbol and have the -following structure: [parameter_name]=[parameter_type] -[optional_values]. Here is a list of all the parameter types that -SEXTANTE supports in its scripts, their syntax and some examples.

        -
          -
        • raster. A raster layer
          • -
        • vector. A vector layer
          • -
        • table. A table
          • -
        • number. A numerical value. A default value must be provided. For -instance, depth=number 2.4
          • -
        • string. A text string. As in the case of numerical values, a -default value must be added. For instance, name=string Victor
          • -
        • boolean. A boolean value. Add True or False after it to -set the default value. For example, verbose=boolean True
          • -
        • multiple raster. A set of input raster layers.
          • -
        • multiple vector. A set of input vector layers.
          • -
        • field. A field in the attributes table of a vector layer. The -name of the layer has to be added after the field tag. For -instance, if you have declared a vector input with -mylayer=vector, you could use myfield=field mylayer to add a -field from that layer as parameter.
          • -
        • folder. A folder
          • -
        • file. A filename
          • -
        -

        The parameter name is the name that will be shown to the user when -executing the algorithm, and also the variable name to use in the script -code. The value entered by the user for that parameter will be assigned -to a variable with that name.

        -

        When showing the name of the parameter to the user, SEXTANTE will edit it to improve its appearance, replacing low hyphens with blankspaces. So, for instance, if you want the user to see a parameter named A numerical value, you can use the variable name A_numerical_value

        -

        Layers and tables values are strings containing the filepath of the -corresponding object. To turn them into a QGIS object, you can use the -getObject() method in the Sextante class. Multiple inputs also -have a string value, which contains the filepaths to all selected -object, separated by semicolons.

        -

        Outputs are defined in a similar manner, using the following tags:

        -
          -
        • output raster
          • -
        • output vector
          • -
        • output table
          • -
        • output html
          • -
        • output file
          • -
        -

        The value assigned to the output variables is always a string with a -filepath. It will correspond to a temporary filepath in case the user -has not entered any output filename.

        -

        When you declare an output, SEXTANTE will try to add it to QGIS once the -algorithm is finished. That is the reason why, although the runalg() -method does not load the layers it produces, the final TWI layer will be -loaded, since it is saved to the file entered by the user, which is the -value of the corresponding output.

        -

        Do not use the load() method in your script algorithms, but just -when working with the console line. If a layer is created as output of -an algorithm, it should be declared as such. Otherwise, you will not be -able to properly use the algorithm in the modeler, since its syntax (as -defined by the tags explained above) will not match what the algorithm -really creates.

        -

        In addition to the tags for parameters and outputs, you can also define -the group under which the algorithm will be shown, using the group -tag.

        -

        Several examples are provided with SEXTANTE. Please, check them to see -real examples of how to create algorithms using this feature of -SEXTANTE. You can right-click on any script algorithm and select Edit -script to edit its code or just to see it.

        -
        -
        -

        Documenting your scripts

        -

        As in the case of models, you can create additional documentation for your script, to explain what they do and how to use them. In the script editing dialog you will find a Edit script help button. Click on it and it will take you to the help editing dialog. Check the chapter about the graphical modeler to know more about this dialog and how to use it.

        -

        Help files are saved in the same folder as the script itself, adding the .help extension to the filename. Notice that you can edit your script’s help before saving it for the first time. If you later close the script editing dialog without saving the script (i.e. you discard it), the help content you wrote will be lost. If your script was already saved and is associated to a filename, saving is done automatically.

        -
        -
        -

        Communicating with the user

        -

        You can send messages to the user to inform about the progress of the algorithm. To do so, just print whatever information you want to show in the textbox above the progress bar in the algorithm dialog, using the print command. For instance, just use print "Processing polygon layer" and the text will be redirected to that textbox.

        -

        If the text you print is just a number between 0 and 100, it will be understood as the percentage of the process that has been already finished, and instead of redirecting the text to the textbox, the progress bar will be update to that percentage of completion.

        -
        -
        - - -
        -
        -
        -
        -
        -

        Table Of Contents

        - - -

        Previous topic

        -

        The SEXTANTE batch processing interface

        -

        Next topic

        -

        The SEXTANTE history manager

        -

        This Page

        - - - -
        -
        -
        -
        -
        -

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/help/genindex.html b/python/plugins/sextante/help/genindex.html deleted file mode 100644 index 1e51022278f2..000000000000 --- a/python/plugins/sextante/help/genindex.html +++ /dev/null @@ -1,95 +0,0 @@ - - - - - - - - - - - - Index — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - - -

        Index

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

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/help/history.html b/python/plugins/sextante/help/history.html deleted file mode 100644 index 66324d27fe99..000000000000 --- a/python/plugins/sextante/help/history.html +++ /dev/null @@ -1,156 +0,0 @@ - - - - - - - - - - The SEXTANTE history manager — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - -
        -

        The SEXTANTE history manager

        -
        -
        -

        The SEXTANTE history

        -

        Every time you execute a SEXTANTE algorithm, information about the -process is stored in the SEXTANTE history manager. Along with the -parameters used, the date and time of the execution are also saved.

        -

        This way, it is easy to track the and control all the work that has been -developed using SEXTANTE, and easily reproduce it.

        -

        The SEXTANTE history manager is a set of registry entries grouped -according to their date of execution, making it easier to find -information about an algorithm executed at any particular moment.

        -_images/history.png -

        Process information is kept as a command-line expression, even if the -algorithm was launched from the toolbox. This makes it also useful for -those learning how to use the command-line interface, since they can call -an algorithm using the toolbox and then check the history manager to see -how that same algorithm could be called from the command line.

        -

        Apart from browsing the entries in the registry, processes can be -re-executed, simply double-clicking on the corresponding entry.

        -

        Along with algorithm executions, SEXTANTE communicates with the user -using the other groups of the registry, namely Errors, Warnings and -Information. In case something is not working properly, having a look -at the Errors might help you to see what is happening. If you get in -contact with a SEXTANTE developer to report a bug or error, the -information in that group will be very useful for him to find out what -is going wrong.

        -

        When executing third party algorithms, this is usually done calling -their command-line interfaces, which communicate with the user using the -console. Although that console is not shown, a full dump of it is stored -in the Information group each time you run one of those algorithms. -If, for instance, you are having problems executing a SAGA algorithm, -look for an entry name SAGA execution console output to check all the -messages generated by SAGA and try to find out where the problem is.

        -

        Some algorithms, even if they can produce a result with the given input -data, might add comments or additional information to Warning in case -they detect potential problems from that data, in order to warn you -about them. Make sure you check those messages in case you are having -unexpected results.

        -
        - - -
        -
        -
        -
        -
        -

        Table Of Contents

        - - -

        Previous topic

        -

        Using SEXTANTE from the console. Creating scripts.

        -

        Next topic

        -

        Configuring external applications

        -

        This Page

        - - - -
        -
        -
        -
        -
        -

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/help/index.html b/python/plugins/sextante/help/index.html deleted file mode 100644 index 78607b97fee2..000000000000 --- a/python/plugins/sextante/help/index.html +++ /dev/null @@ -1,181 +0,0 @@ - - - - - - - - - - SEXTANTE for QGIS’s documentation — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - - -
        -

        Indices and tables

        - -
        - - -
        -
        -
        -
        -
        -

        Table Of Contents

        - - -

        Next topic

        -

        Introduction

        -

        This Page

        - - - -
        -
        -
        -
        -
        -

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/help/intro.html b/python/plugins/sextante/help/intro.html deleted file mode 100644 index d1399e8dd34c..000000000000 --- a/python/plugins/sextante/help/intro.html +++ /dev/null @@ -1,169 +0,0 @@ - - - - - - - - - - Introduction — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - -
        -

        Introduction

        -

        This chapter introduces SEXTANTE, the powerful geospatial analysis framework of QGIS. -SEXTANTE is a geoprocessing environment that can be used to call native -and third party algorithms from QGIS, making your spatial analysis tasks -more productive and easy to accomplish.

        -

        In the following sections we will review how to use the graphical -elements of SEXTANTE and take the most out of each one of them

        -
        -

        Basic elements of the SEXTANTE GUI

        -

        There are four basic elements in the SEXTANTE GUI, which are used to run -SEXTANTE algorithms for different purposes. Choosing one tool or another -will depend on the kind of analysis that is to be performed and the -particular characteristics of each user and project. All of them (except -for the batch processing interface, which is called from the toolbox, as -we will see) can be accessed from the SEXTANTE menu item (you will see -more than four entries. The remaining ones are not used to execute -algorithms and will be explained later in this chapter).

        -
          -

        • The SEXTANTE toolbox. The main element of the SEXTANTE GUI, it is -used to execute a single algorithm or run a batch process based on -that algorithm.

          -
          -image -
          -
          • -

        • The SEXTANTE graphical modeler. Several algorithms can be combined -graphically using the modeler to define a workflow, creating a single -process that involves several sub-processes

          -
          -image -
          -
          • -

        • The SEXTANTE history manager. All actions performed using any of the -aforementioned elements are stored in a history file and can be later -easily reproduced using the history manager

          -
          -image -
          -
          • -

        • The SEXTANTE batch processing interface manager. This interface -allows you to execute batch processes and automate the execution of a -single algorithm on multiple datasets.

          -
          -image -
          -
          • -
        -

        Along the following sections we will review each one of this elements in -detail.

        -
        -
        - - -
        -
        -
        -
        -
        -

        Table Of Contents

        - - -

        Previous topic

        -

        SEXTANTE for QGIS’s documentation

        -

        Next topic

        -

        The SEXTANTE toolbox

        -

        This Page

        - - - -
        -
        -
        -
        -
        -

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/help/modeler.html b/python/plugins/sextante/help/modeler.html deleted file mode 100644 index b5c4c5e93b03..000000000000 --- a/python/plugins/sextante/help/modeler.html +++ /dev/null @@ -1,349 +0,0 @@ - - - - - - - - - - The SEXTANTE graphical modeler — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - -
        -

        The SEXTANTE graphical modeler

        -
        -

        Introduction

        -

        The graphical modeler allows to create complex models using a simple -and easy-to-use interface. When working with a GIS, most analysis -operations are not isolated, but part of a chain of operations instead. -Using the graphical modeler, that chain of processes can be wrapped into -a single process, so it is easier and more convenient to execute than a -single process later on a different set on inputs. No matter how many -steps and different algorithms it involves, a model is executed as a -single algorithm, thus saving time and effort, specially for larger -models.

        -

        The modeler can be opened from the SEXTANTE menu, but also from the -toolbox. In the Modeler branch of the algorithms tree you will find a -group named Tools, which contains an entry called Create new model

        -

        The modeler has a working canvas where the structure of the model and -the workflow it represents are shown. On the left part of the window, a -panel with two tabs can be used to add new elements to the model.

        -
        -image -
        -

        Creating a model involves two steps:

        -
          -
        • Definition of necessary inputs. These inputs will be added to the -parameters window, so the user can set their values when executing -the model. The model itself is a SEXTANTE algorithm, so the -parameters window is generated automatically as it happens with all -the algorithms included in SEXTANTE.
          • -
        • Definition of the workflow. Using the input data of the model, the -workflow is defined adding algorithms and selecting how they use -those inputs or the outputs generated by other algorithms already in -the model
          • -
        -
        -
        -

        Definition of inputs

        -

        The first step to create a model is to define the inputs it needs. The -following elements are found in the Inputs tabs on the left side of -the modeler window:

        -
          -
        • Raster layer
          • -
        • Vector layer
          • -
        • String
          • -
        • Table field
          • -
        • Table
          • -
        • Numerical value
          • -
        • Boolean value
          • -
        -

        Double-clicking on any of them, a dialog is shown to define its -caracteristics. Depending on the parameter itself, the dialog will -contain just one basic element (the description, which is what the user -will see when executing the model) or more of them. For instance, when -adding a numerical value, as it can be seen in the next figure, apart -from the description of the parameter you have to set a default value -and a range of valid values.

        -
        -image -
        -

        For each added input, a new element is added to the modeler canvas.

        -
        -image -
        -
        -
        -

        Definition of the workflow

        -

        Once the inputs have been defined, it is time to define the algorithms -to apply on them. Algorithms can be found in the Algorithms tab, -grouped much in the same way as they are in the toolbox.

        -
        -image -
        -

        To add an algorithm, double-click on its name. An execution dialog will -appear, with a content similar to the one found in the execution panel -that SEXTANTE shows when executing the algorithm from the toolbox. the -one shown next correspond to the SAGA convergence index algorithm, the -same one we saw in the section dedicated to the SEXTANTe toolbox.

        -
        -image -
        -

        As you can see, some differences exist. Instead of the file output box -that was used to set the filepath for output layers and tables, a simple -text box is. If the layer generated by the algorithm is just a temporary -result that will be used as the input of another algorithm and should -not be kept as a final result, just do not edit that textbox. Typing -anything on it means that the result is a final one, and the text that -you supply will be the description for the output, which will be the one -the user will see when executing the model.

        -

        Selecting the value of each parameter is also a bit different, since -there are importante differences between the context of the modeler and -the toolbox one. Let’s see how to introduce the values for each type of -parameter.

        -
          -
        • Layers (raster and vector) and tables. They are selected from a -list, but in this case the possible values are not the layers or -tables currently loaded in QGIS, but the list of model inputs of the -corresponding type, or other layers or tables generated by algorithms -already added to the model.
          • -
        • Numerical values. Literal values can be introduced directly on the -textbox. But this textbox is also a list that can be used to select -any of the numerical value inputs of the model. In this case, the -parameter will take the value introduced by the user when executing -the model.
          • -
        • String. Like in the case of numerical values, literal strings can be -typed, or an input string can be selected.
          • -
        • Table field. The fields of the parent table or layer cannot be known -at design-time, since they depend of the selection of the user each -time the model is executed. To set the value for this parameter, type -the name of a field directly in the textbox, or use the list to -select a table field input already added to the model. The validity -of the selected field will be checked by SEXTANTE at run-time
          • -
        -

        Once all the parameter have been assigned valid values, click on OK -and the algorithm will be added to the canvas. It will be linked to all -the other elements in the canvas, whether algorithms or inputs, which -provide objects that are used as inputs for that algorithm.

        -
        -image -
        -

        Elements can be dragged to a different position within the canvas, to -change the way the module structure is displayed and make it more clear -and intuitive. Links between elements are update automatically.

        -

        You can run your algorithm anytime clicking on the Run button. However, in order to use it from the toolbox, it has to be saved and the modeler dialog closed, to allow the toolbox to refresh its contents.

        -
        -
        -

        Saving and loading models

        -

        Use the Save button to save the current model and the Open one to -open any model previously saved. Model are saved with the .model -extension. If the model has been previously saved from the modeler -window, you will not be prompted for a filename, since there is already -a file associated with that model, and it will be used.

        -

        Before saving a model, you have to enter a name and a group for it, -using the text boxes in the upper part of the window.

        -

        Models saved on the models folder (the default folder when you are -prompted for a filename to save the model) will appear in the toolbox in -the corresponding branch. When the toolbox is invoked, SEXTANTE searches -the models folder for files with .model extension and loads the -models they contain. Since a model is itself a SEXTANTE algorithm, it -can be added to the toolbox just like any other algorithm.

        -

        The models folder can be set from the SEXTANTE configuration dialog, -under the Modeler group.

        -

        Models loaded from the models folder appear not only in the toolbox, but -also in the algorithms tree in the Algorithms tab of the modeler -window. That means that you can incorporate a model as a part of a -bigger model, just as you add any other algorithm.

        -

        In some cases, SEXTANTE might not be able to load a model because it -cannot find all the algorithms included in its workflow. If you have -used a given algorithm as part of your model, it should be available -(that is, it should appear on the toolbox) in order to load that model. -Deactivating an algorithm provider in the SEXTANTE configuration window -renders all the algorithms in that provider unusable by the modeler, -which might cause problems when loading models. Keep that in mind when -you have trouble loading or executing models.

        -
        -
        -

        Editing a model

        -

        You can edit the model you are currently creating, redefining the workflow and the relationships between the algorithms and inputs that define the model itself.

        -

        If you right-click on an algorithm in the canvas representing the model, you will see a context menu like the one shown next:

        -
        -_images/modeler_right_click.png -
        -

        Selecting the Remove option will cause the selected algorithm to be removed. An algorithm can be removed only if there are no other algorithms dependind on it. That is, if no output from the algorithm is used in a different one as input. If you try to remove an algorithm that has others depending on it, SEXTANTE will show you a warning message like the one you can see below:

        -
        -_images/cannot_delete_alg.png -
        -

        Selecting the Edit option or simply double-clicking on the algorithm icon will show the parameters dialog of the algorithm, so you can change the inputs and parameter values. Not all input elements available in the model will appear in this case as available inputs. Layers or values generated at a more advanced step in the workflow defined by the model will not be available if they cause circular dependencies.

        -

        Select the new values and then click on the OK button as usual. The connections between the model elements will change accordingly in the modeler canvas.

        -
        -
        -

        Activating and deactivating algorithms

        -

        Algorithms can be deactivated in the modeler, so they will not be executed once the model is run. This can be used to test just a given part of the model, or when you do not need all the outputs it generates.

        -

        To deactivate an algorithm, right–click on its icon in the model canvas and select the Deactivate option. You will see that the algorithm is represented now with a red label under its name indicating that is not active.

        -
        -_images/deactivated.png -
        -

        All algorithms depending (directly or undirectly) on that algorithm will also appear as inactive, since they cannot be executed now.

        -

        To activate an algorithm, just right–click on its icon and select the Activate option.

        -
        -
        -

        Editing model help files and meta-information

        -

        You can document your models from SEXTANTE. Just click on the Edit model help button and a dialog like the one shown next will appear.

        -
        -image -
        -

        On the right-hand side you will see a simple HTML page, created using the description of the input parameters and outputs of the algorithm, along with some additional items like a general description of the model or its author. The first time you open the help editor all those descriptions are empty, but you can edit them using the elements on the left-hand side of the dialog. Select an element on the upper part and the write its description in the texbox below.

        -

        Model help is saved in a file in the same folder as the model itself. You do not have to worry about saving it, since it is done automatically.

        -
        -
        -

        About available algorithms

        -

        You might notice that some algorithms that can be be executed from the -toolbox do not appear in the list of available ones when you are -designing a model. To be included in a model, and algorithm must have a -correct semantic, so as to be properly linked to other in the workflow. -If an algorithm does not have such well-defined semantic (for instance, -if the number of output layers cannot be know in advance), then it is -not possible to use it within a model, and thus does not appear in the -list of them that you can find in the modeler dialog.

        -

        Additionally, you will see some algorithms in the modeler that are not -found in the toolbox. This algorithms are meant to be used exclusively -as part of a model, and they are of no interest in a different context. -The Calculator algorithm is an example of that. It is just a simple -arithmetic calculator that you can use to modify numerical values -(entered by the user or generated by some other algorithm). This tools -is really useful within a model, but outside of that context, it doesn’t -make too much sense.

        -
        -
        -

        SEXTANTE models as Python code

        -

        [This feature is temporarily unavailable]

        -

        Along with the tab that contains the graphical design of the model, you -will find another one containing a Python script which performs the same -task as the model itself. Using that code, you can create a console -script (we will explain them later in this same manual) and modify it to -incorporate actions and methods not available in the graphical modeler, -such as loops or conditional sentences.

        -

        This feature is also a very practical way of learning how to use -SEXTANTE from the console and how to create SEXTANTE algorithms using -Python code, so you can use it as a learning tool when you start -creating your own SEXTANTE scripts.

        -

        You will find a button below the text field containing the Python code. -Click on it to directly create a new script from that code, without -having to copy and paste it in the SEXTANTE script editor.

        -
        -
        - - -
        -
        -
        -
        -
        -

        Table Of Contents

        - - -

        Previous topic

        -

        The SEXTANTE toolbox

        -

        Next topic

        -

        The SEXTANTE batch processing interface

        -

        This Page

        - - - -
        -
        -
        -
        -
        -

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - diff --git a/python/plugins/sextante/help/objects.inv b/python/plugins/sextante/help/objects.inv deleted file mode 100644 index 7ecf6821aaa1..000000000000 Binary files a/python/plugins/sextante/help/objects.inv and /dev/null differ diff --git a/python/plugins/sextante/help/search.html b/python/plugins/sextante/help/search.html deleted file mode 100644 index e939e72d9eae..000000000000 --- a/python/plugins/sextante/help/search.html +++ /dev/null @@ -1,99 +0,0 @@ - - - - - - - - - - Search — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - -

        Search

        -
        - -

        - Please activate JavaScript to enable the search - functionality. -

        -
        -

        - From here you can search these documents. Enter your search - words into the box below and click "search". Note that the search - function will automatically search for all of the words. Pages - containing fewer words won't appear in the result list. -

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

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/help/searchindex.js b/python/plugins/sextante/help/searchindex.js deleted file mode 100644 index 864c5e86e43e..000000000000 --- a/python/plugins/sextante/help/searchindex.js +++ /dev/null @@ -1 +0,0 @@ -Search.setIndex({objects:{},terms:{all:[1,2,3,4,5,6,7],code:[0,5,2,6],chain:6,maximum:[1,2],stlye:5,thi:[1,2,3,4,5,6,7],global:3,four:[5,4],analyticalhierarchyprocess:2,signific:1,correl:3,follow:[4,5,1,2,6],disk:5,row:[5,2,3],whose:5,depend:[5,4,2,3,6],sensit:2,lilli:1,intermedi:1,specif:5,send:2,program:[5,1],under:[2,6],aris:1,parameterrast:2,introduc:[5,4,2,3,6],deactiv:[0,6],lack:5,everi:7,string:[5,1,2,6],fals:2,undirectli:6,describealg:2,trough:1,veri:[1,6,7],retriev:5,syntax:[1,2],brows:7,tri:1,button:[5,1,2,3,6],list:[5,2,3,6],geograph:1,iter:5,"try":[1,2,6,7],item:[5,1,4,6],vector:[0,5,1,2,6],larg:[1,3],quick:2,anal:5,outputrast:2,retun:1,pleas:[1,2],upper:[5,2,6],sign:1,past:6,zero:2,cost:2,design:6,aggreg:2,pass:[1,2],download:1,howev:[1,2,6],algopt:2,click:[5,7,2,3,6],append:[5,2,3],victor:2,even:[5,1,2,3,7],index:[0,5,2,6],what:[5,1,2,6,7],hide:5,appear:[5,1,2,3,6],section:[4,5,1,2,6],workflow:[0,5,4,2,6],abl:[5,1,2,6],calcul:[5,1,2,6],find:[5,1,2,6,7],current:[5,1,6],delet:5,accumulatedcost:2,version:1,vegetationindex:2,"new":[5,1,2,3,6],aggregatepointobserv:2,ever:1,method:[1,2,6],whatev:2,involv:[5,4,2,6],full:[5,2,7],deriv:5,tarboton:2,resampl:1,gener:[0,1,2,5,6,7],greatli:1,here:[1,2],behaviour:1,let:[5,1,2,6],path:[5,1],along:[1,2,4,5,6,7],modifi:[5,1,6],sinc:[1,2,3,5,6,7],valu:[5,1,2,3,6],box:[5,6],search:[0,6],pretti:1,readogr:1,larger:[1,6],prior:1,amount:3,behav:[5,1],permit:3,action:[4,6],implement:5,semant:6,vcurv:2,regardless:1,extra:[1,2],output2:2,solut:5,approxim:2,output1:2,prefer:1,"while":[5,1],put:3,api:2,instal:[5,1],ymin:[5,2],select:[0,1,2,3,5,6],reproject:5,plot:1,from:[0,1,2,3,4,5,6,7],describ:[5,1,2],msy:1,commun:[0,2,7],epsg:[5,2],doubl:[5,1,2,6,7],chooser:3,two:[5,1,3,6],next:[5,2,3,6],websit:1,few:[1,2],call:[0,1,2,4,5,6,7],criteria:3,taken:3,type:[5,1,2,3,6],tell:[5,1],toggl:5,more:[1,2,3,4,5,6],desir:[5,2,3],etern:[],relat:[5,1],notic:[5,1,2,6],warn:[6,7],remot:5,outputn:2,accept:1,particular:[5,1,4,7],known:[1,6],effort:[3,6],must:[1,2,6],fly:5,none:2,graphic:[0,1,2,4,5,6],word:[5,1],prepar:5,work:[5,1,2,6,7],uniqu:[1,2],histori:[0,1,4,7],descriptor:2,remain:4,minimum:1,thereshold:2,slopelength:2,learn:[6,7],purpos:4,spatialpointsdatafram:1,control:[1,7],aggregationindex:2,prompt:6,tab:6,give:[5,1,2],process:[0,1,2,3,4,5,6,7],indic:[0,1,6],sourc:5,unavail:6,want:[5,1,2],phrase:5,xmin:[5,2],addgridvaluestoshap:2,beran:2,unus:6,uncheck:5,alwai:[2,3],cours:5,multipl:[4,1,2,3],divid:5,rather:[1,2],anoth:[5,4,3,6],write:[1,2,6],how:[1,2,4,5,6,7],low:2,instead:[5,1,2,3,6],csv:[5,1],downslop:2,updat:[2,6],map:[5,2],product:[4,2],hillshad:2,max:[5,1],after:[1,2],upload:5,befor:[1,2,6],showplot:1,plane:2,lat:1,end:5,data:[0,1,2,3,5,6,7],averag:2,sextant:[0,1,2,3,4,5,6,7],practic:6,third:[5,1,4,7],filepath:[5,2,3,6],correspond:[5,1,2,6,7],element:[0,1,2,4,5,6],caus:[1,6],inform:[0,1,2,5,6,7],environ:[1,4],incorpor:[5,1,2,6],enter:[5,1,2,6],exclus:6,order:[2,6,7],blankspac:2,catchmentarea:2,origin:[5,1],lingua:1,help:[0,1,2,5,6,7],ouput:[],soon:[5,1],increas:2,addgridvaluestopoint:2,own:[5,1,2,6],comma:[5,2],hierarchi:2,flexibl:2,myfil:5,paramet:[0,1,2,3,5,6,7],style:5,group:[5,1,2,6,7],directli:[5,2,3,6],fit:2,binari:1,chosen:1,fix:2,whether:[5,1,6],addpolygonattributestopoint:2,complex:[1,2,6],qgi:[0,1,2,3,4,5,6],shipe:5,main:[5,4,3],might:[5,1,6,7],easier:[5,7,2,3,6],them:[0,1,2,3,4,5,6,7],good:5,"return":2,thei:[1,2,3,5,6,7],dem:2,python:[0,1,2,6],sentenc:[2,6],parameterselect:2,handi:[5,2],rectangl:5,cellsiz:[5,1],now:[1,2,6],bigger:6,introduct:[0,1,2,3,4,5,6],itself:[5,1,2,6],somewher:5,name:[1,2,3,5,6,7],anyth:[5,6],edit:[0,5,2,6],simpl:[1,2,6],refresh:6,separ:[5,2,3],easili:[4,7],alreadi:[5,1,2,3,6],each:[1,2,3,4,5,6,7],found:[5,1,3,6],complet:[1,2],gui:[0,5,4,2],mean:[1,2,6],downslopedistancegradi:2,replac:2,individu:[5,2],realli:[2,6],meta:[0,6],expect:[5,1],our:1,happen:[1,6,7],special:[1,6],out:[1,4,7],variabl:[5,1,2],optional_valu:2,shown:[1,2,3,5,6,7],accomplish:4,space:2,gradient:2,your:[0,1,2,4,5,6],categori:5,upslop:2,suitabl:1,rel:2,print:[1,2],correct:6,red:6,common:[5,1],model:[0,1,2,3,4,5,6],advanc:[2,6],given:[5,1,2,6,7],like:[5,1,2,3,6],small:5,reason:[1,2,3],base:[5,4,2,3],dictionari:2,ask:1,algslist:2,gdal:[0,1],care:5,sampl:1,raster:[5,1,2,6],launch:[3,7],could:[2,7],yur:[],wrong:[1,7],keep:[5,6],filter:2,thing:[1,2],length:2,place:[5,2],descript:[5,1,2,6],outsid:6,onto:5,assign:[2,6],first:[5,1,2,6],oper:[1,2,6],softwar:[5,1],rang:[5,6],suffix:1,render:[5,6],feel:5,onc:[5,1,2,3,6],arrai:2,number:[5,1,2,3,6],yourself:[1,2],restrict:5,date:7,unlik:[2,3],ret_area:2,done:[5,7,2,3,6],messag:[1,2,6,7],blank:2,polygon:[1,2],additionali:[1,6],open:[5,1,2,3,6],predefin:1,size:[5,1,3],avail:[0,1,2,3,5,6],differ:[1,2,3,4,5,6],script:[0,5,1,2,6],paramn:2,system:[0,5,1],least:2,regarless:[],too:6,burgess:2,interfac:[0,1,2,3,4,5,6,7],conveni:[3,6],"final":[1,2,6],store:[5,1,4,7],cabral:2,shell:1,consol:[0,1,2,6,7],option:[5,1,2,3,6],relationship:6,travi:2,tool:[5,4,2,6],copi:6,lower:[5,3],selector:5,part:[5,1,2,3,6],accompani:3,horn:2,than:[5,4,6],liter:6,target:1,dtm:2,whenev:5,provid:[5,1,2,6],remov:[2,3,6],tree:6,second:5,structur:[5,2,6],exampl:[1,2,6],project:[0,5,1,4],matter:6,reus:5,param2:2,param1:2,posit:[2,6],arrang:3,saga_cmd:1,qml:5,"function":1,rohdenburg:2,viewer:5,mind:6,spsampl:1,packag:1,aforement:[5,4],manner:[1,2],have:[1,2,3,5,6,7],reserv:1,need:[5,1,2,3,6],seen:[1,6],dedic:[1,6],turn:2,saw:[1,6],dependind:6,built:2,min:[5,1],geoprocess:[5,4],note:[0,5,1],also:[5,1,2,6,7],zevenbergen:2,without:[5,1,2,6],take:[4,5,1,2,6],which:[1,2,3,4,5,6,7],combin:4,geoalgorithm:1,singl:[5,4,2,3,6],parti:[5,1,4,7],begin:1,sure:[5,1,7],unless:1,scripta:[],normal:1,track:7,object:[0,1,2,3,5,6],most:[5,1,4,3,6],regular:1,"class":[1,2],sub:4,clear:6,later:[4,5,1,2,6],cover:[5,1],doe:[5,1,2,6],declar:[1,2],determin:2,enclos:2,usual:[5,1,6,7],someth:[2,7],datafram:1,slope:2,show:[5,1,2,3,6],saga:[0,1,2,5,6,7],text:[5,1,2,6],supported:[],name_of_the_algorithm:2,dbf:5,session:5,particularli:3,trivial:3,anywai:5,slopeaspectcurvatur:2,cell:3,onli:[5,1,2,6],explicitli:1,locat:1,execut:[0,1,2,3,4,5,6,7],northern:5,menu:[5,4,3,6],explain:[5,4,2,6],configur:[0,5,1,6],activ:[0,5,6],figur:6,should:[5,1,2,6],getobject:2,folder:[5,1,2,6],analyt:2,meant:6,contribut:5,get:[5,2,7],express:[5,7],kind:[5,1,4],autom:4,nativ:4,acces:1,cannot:[2,3,6],mention:[5,2],"import":[1,2],report:7,toolbox:[0,1,2,3,4,5,6,7],him:7,requir:[5,1,2],rgdal:1,shp:[5,1],bar:[2,3],addcoordinatestopoint:2,"default":[5,1,2,3,6],integr:1,xmax:2,contain:[5,1,2,3,6],anisotrop:2,where:[5,1,2,6,7],wrote:2,kernel:5,set:[1,2,3,5,6,7],dump:7,frame:1,knowledg:1,displai:[2,6],see:[1,2,3,4,5,6,7],temporarili:6,mandatori:1,result:[5,1,2,6,7],close:[1,2,6],averagewithmask1:2,becaus:[1,6],chose:[],awar:1,detect:7,extend:1,correctli:1,redirect:[1,2],databas:[5,1],review:[4,2],anytim:6,label:6,caracterist:6,won:5,between:[1,2,6],progress:[2,3],neither:1,experi:1,attribut:[5,1,2],accord:[3,7],kei:2,numer:[5,2,6],isol:6,extens:[5,1,2,6],extent:[5,1,2],solv:1,come:[5,2],addit:[5,1,2,6,7],both:1,exactli:[1,2],shapefil:1,plugin:5,region:1,upslopearea:2,instanc:[5,1,2,6,7],orfeo:1,averagewithmask2:2,mani:[3,6],load:[0,5,1,2,6],among:5,simpli:[7,2,3,6],can:[1,2,3,4,5,6,7],slopebas:2,hyphen:2,pop:[5,3],height:2,written:1,readgdal:1,linux:1,typic:3,alghelp:2,creat:[0,1,2,4,5,6],addition:5,hcurv:2,convolut:5,due:5,empti:[5,1,6],compon:[5,1,2],accumul:2,mmqgi:[5,2],much:[1,3,6],treat:5,interest:[5,2,6],basic:[4,0,1,2,6],haralick:2,curvatur:2,otb:[0,1],xxx:2,convert:[1,2],uncommon:1,ani:[1,2,3,4,5,6,7],coordin:[5,1,2],understand:[1,2],last:[1,2],spatialpolygonsdatafram:1,those:[1,2,3,5,6,7],"case":[1,2,3,5,6,7],look:[1,2,7],servic:5,batch:[0,5,4,3],asign:[],defin:[1,2,3,4,5,6],invok:6,abov:[5,1,2],error:[1,7],observ:2,loop:[2,6],layer:[0,1,2,3,5,6],almost:1,tabl:[0,1,2,3,5,6],non:5,worri:[1,6],exit:5,bauer:2,twi:2,seem:5,sever:[4,5,1,2,3],parent:6,develop:[1,7],welcom:[],author:6,perform:[1,2,3,4,5,6],alphabet:2,make:[5,1,4,6,7],belong:[5,1],same:[1,2,3,5,6,7],handl:5,isotrop:2,rsx:1,document:[0,5,1,2,6],infer:1,difficult:2,finish:[1,2],context:6,hand:[5,3,6],capabl:5,moment:7,temporari:[5,1,2,3,6],user:[0,1,2,4,5,6,7],improv:2,canva:[5,2,6],numpoint:1,squar:2,topographicwetnessindex:2,costa:2,redefin:6,task:[5,4,2,6],kept:[1,6,7],framework:4,entri:[1,2,4,5,6,7],random:1,well:[5,1,6],contact:7,command:[1,2,7],elev:2,choos:[5,4],everyth:2,polyg:1,left:[5,2,6],explan:2,comment:[1,2,7],distanc:2,identifi:2,loadfromalg:2,just:[5,1,2,3,6],less:3,fluxmethod:2,usedto:[],converg:[5,6],obtain:1,shape:2,aspect:2,yet:5,previous:6,a_numerical_valu:2,easi:[1,4,6,7],point:[5,1,2],except:[1,4],add:[1,2,3,5,6,7],other:[1,2,3,5,6,7],circular:6,wet:2,input:[0,1,2,3,5,6,7],dtmfilter:2,save:[0,1,2,3,5,6,7],modul:6,match:[5,1,2],real:2,applic:[0,5,1],splineapproxim:2,format:[0,5,1,2],read:[1,2],intuit:6,outut:5,grid:[0,1,2],know:[1,2,6],dbase:5,press:5,bit:[5,6],characterist:[5,4],associ:[2,6],tif:[5,1],apart:[5,6,7],relativeheightsandslopeposit:2,lost:2,filenam:[5,1,2,3,6],manual:[5,1,6],html:[5,2,6],integ:2,server:5,"boolean":[2,6],necessari:[1,3,6],channel:5,output:[1,2,3,5,6,7],page:[0,6],analyticalhillshad:2,heerdegen:2,right:[5,2,3,6],suppli:[2,6],some:[5,1,2,6,7],percentag:2,understood:[1,2],bork:2,polynom:2,inact:6,surpris:1,otput:[],librari:[5,1],distribut:1,thu:[1,6],averagewiththereshold3:2,averagewiththereshold2:2,averagewiththereshold1:2,assum:5,avoid:1,definit:[0,1,6],overlap:[5,1],mathemat:5,leav:5,textbox:[2,6],condit:[2,6],content:[0,5,2,6],reproduc:[4,7],symbol:2,refer:5,core:2,previou:2,run:[0,1,2,3,4,5,6,7],power:[4,2],ftool:5,step:6,although:[5,2,7],boundari:1,alglist:2,appli:6,panel:6,chapter:[4,1,2],about:[0,1,2,5,6,7],would:[5,1],reappear:5,memori:5,side:[5,6],degre:2,interpret:1,includ:[5,1,2,3,6],dialog:[0,1,2,3,5,6],discard:2,produc:[5,1,2,7],block:[5,1,2],franca:1,tiff:1,sens:6,within:[1,6],tag:2,automat:[5,1,2,3,6],dataset:4,ppp:1,been:[1,2,3,5,6,7],wrap:6,chang:[1,6],spline:2,manag:[0,5,1,4,7],connector:1,accordingli:6,triangl:2,ymax:[5,2],wai:[5,1,7,3,6],area:[1,2],support:[5,1,2],lon:1,column:[1,3],lidar:5,verbos:2,start:[5,1,2,6],reli:5,window:[5,1,3,6],arithmet:6,editor:6,icon:6,unfortun:5,analysi:[1,4,6],topograph:2,properli:[1,2,6,7],unexpect:7,nortest:1,regard:[1,3],link:6,mylay:2,line:[1,2,3,7],"true":[5,2],bug:7,possibl:[5,6],veget:2,geospati:4,access:[5,4],myfield:2,troubl:[1,6],below:[3,6],limit:[0,5,1],autocomplet:3,otherwis:2,problem:[1,6,7],grass:[0,5,1],similar:[5,1,2,3,6],connect:[1,2,6],curv:2,featur:[5,1,2,6],texbox:6,semicolon:[2,3],flow:2,dure:5,doesn:6,repres:[5,2,3,6],ret_slop:2,exist:[5,1,6],file:[0,1,2,3,4,5,6],runalg:2,ship:1,check:[5,1,2,6,7],fill:[0,1,3],again:1,readi:[5,1],quot:2,algorihtm:[],maptool:1,allow:[5,4,2,3,6],when:[1,2,3,5,6,7],detail:[5,4,2],virtual:5,parameter_typ:2,field:[5,1,2,3,6],valid:6,lookup:5,branch:6,spatial:[5,1,4],test:[1,6],ignor:1,you:[1,2,3,4,5,6,7],architectur:5,mapset:1,extern:[0,5,1],registri:7,parameter_nam:2,devot:5,why:2,drag:[5,6],important:6,log:1,reduc:5,algorithm:[0,1,2,3,4,5,6,7],thorn:2,mask:2,depth:2,mass:2,fact:[5,2],potenti:7,time:[1,2,3,5,6,7],"export":1,daili:5},objtypes:{},titles:["SEXTANTE for QGIS’s documentation","Configuring external applications","Using SEXTANTE from the console. Creating scripts.","The SEXTANTE batch processing interface","Introduction","The SEXTANTE toolbox","The SEXTANTE graphical modeler","The SEXTANTE history manager"],objnames:{},filenames:["index","3rdParty","console","batch","intro","toolbox","modeler","history"]}) \ No newline at end of file diff --git a/python/plugins/sextante/help/toolbox.html b/python/plugins/sextante/help/toolbox.html deleted file mode 100644 index ac7fe3b7b35a..000000000000 --- a/python/plugins/sextante/help/toolbox.html +++ /dev/null @@ -1,358 +0,0 @@ - - - - - - - - - - The SEXTANTE toolbox — SEXTANTE for QGIS 1.0 documentation - - - - - - - - - - - - - -
        -

        Navigation

        - -
        - -
        -
        -
        -
        - -
        -

        The SEXTANTE toolbox

        -
        -

        Introduction

        -

        The Toolbox is the main element of the SEXTANTE GUI, and the one that -you are more likely to use in your daily work. It shows the list of all -available algorithms grouped in different blocks, and is the access -point to run them whether as a single process or as a batch process -involving several executions of a same algorithm on different sets of -inputs.

        -_images/toolbox.png -

        The toolbox contains all the algorithms available, divided into groups. -Each group represents a so-called algorithm provider, which is a set of -algorithms coming from the same source, for instance, from a third-party -application with geoprocessing capabilities. Some of this groups -represent algorithms from one of such third-party applications -(like SAGA, GRASS or R), while other contain algorithms directly coded -along with SEXTANTE elements, not relying on any additional software. -Currently, these providers all reuse code from already-existing QGIS -plugins (more specifically, from the fTools vector library shiped along -with QGIS and the contributed mmqgis plugin that you can install using -the plugin manager), making them more useful, since they can be executed -from elements such as the modeler or the batch processing interface, -which we will soon describe.

        -

        Additionally, two more providers can be found, namely Models and -Scripts. This providers include user-created algorithms, and allow you -to define your own workflows and processing tasks. We will devote a full -section to them a bit later.

        -

        In the upper part of the toolbox you can find a text box. To reduce the -number of algorithms shown in the toolbox and make it easier to find the -one you need, you can enter any word or phrase on the text box. Notice -that, as you type, the number of algorithms in the toolbox is reduced to -just those which contain the text you have entered in their names.

        -

        To execute an algorithm, just double-click on its name in the toolbox.

        -
        -
        -

        The algorithm dialog

        -

        Once you double-click on the name of the algorithm that you want to -execute, a dialog similar to the next one is shown (in this case, the -dialog corresponds to the SAGA-Convergence index algorithm).

        -
        -image -
        -

        This dialog is used to set the input values that the algorithm needs to -be executed. It shows a table where input values and configuration -parameters are to be set. It, of course, has a different content -depending on the requirements of the algorithm to be executed, and is -created automatically based on those requirements. On the left side, the -name of the parameter is shown. On the right side the value of the -parameter can be set.

        -

        Although the number and type of parameters depend on the characteristics -of the algorithm, the structure is similar for all of them. The -parameters found on the table can be of one of the following types.

        -
          -
        • A raster layer, to select from a list of all the ones available -(currently opened) in QGIS. The selector contains as well a button on its right-hand side, to let you select filenames that represent layers currently not loaded in QGIS.
          • -
        • A vector layer, to select from a list of all the ones available in -the QGIS. Layers not loaded in QGIS can be selected as well, as in the case of raster layers, but only if the algorithm does not require a table field selected from the attributes table of the layer. In that case, only opened layers can be selected, since they need to be open so as to retrieve the list of field names available.
          • -
        -
        -
        You will see a button by each vector layer selector. If the algorithm contains several of them, you will be able to toggle just one of them. If the button corresponding to a vector input is toggled, the algorithm will be executed iteratively on each one of its features. We will see more about this kind of execution at the end of this section.
        -
          -

        • A table, to select from a list of all the ones available in QGIS. -Non-spatial tables are loaded into QGIS like vector layers, and in -fact they are treated as such by the program. Currently, the list of -available tables that you will see when executing a SEXTANTE -algorithm that needs one of them is restricted to tables coming from -files in DBase (.dbf) or Comma-Separated Values (.csv) formats

          -
          • -

        • An option, to choose from a selection list of possible options.

          -
          • -

        • A numerical value, to be introduced in a text box. You will find a -button by its side. Clicking on it you will see a dialog that allows -you to enter a mathematical expression, so you can use it as a handy -calculator. Some useful variables related to data loaded into QGIS -can be added to your expression, so you can select a value derived -from any of this variables such as the cellsize of a layer or the -northern most coordinate of another one.

          -
          -image -
          -
          • -

        • A range, with min and max values to be introduced in two text boxes.

          -
          • -

        • A text string, to be introduced in a text box.

          -
          • -

        • A field, to choose from the attributes table of a vector layer or a -single table selected in another parameter.

          -
          • -

        • A Coordinate Reference System. You can type the EPSG code directly in the text box, or select it from the CRS selection dialog that appear when you click on the button on the right-hand size

          -
          • -

        • A extent, to be entered by four number representing its xmin, max, ymin, ymax limits. Clicking on the button on the right-hand side of the value selector, a pop-up menu will appear, giving you two option: to select the value from a layer or the current canvas extent, or to define it by dragging directly onto the map canvas.

          -
          -_images/extent.png -
          -
          • -
        -
        -

        If you select the first option, you will see a window like the next one.

        -
        -
        -_images/extent_list.png -
        -
        -

        If you select the second one, the parameters window will hide itself, so you can click and drag onto the canvas. Once you have defined the selected rectangle, the dialog will reappear, containing the values in the extent text box.

        -
        -
        -image -
        -
        -
        -
          -

        • A list of elements (whether raster layers, vector ones or tables), to -select from the list of the ones available in QGIS. To make the -selection, click on the small button on the left side of the -corresponding row to see a dialog like the following one.

          -
          -image -
          -
          • -

        • A small table to be edited by the user. These are used to define -parameters like lookup tables or convolution kernels, among others.

          -

          Click on the button on the right side to see the table and edit its -values.

          -
          -image -
          -

          Depending on the algorithm, the number of rows can be modified or -not, using the buttons on the right side of the window.

          -

          You will find a help button in the lower part of the parameters -dialog. If a help file is available, it will be shown, giving you -more information about the algorithms and detailed descriptions of -what each parameter does. Unfortunately, most algorithms lack good -documentation, but if you feel like contributing to the project, this -would be a good place to start...

          -
          • -
        -
        -

        A note on projections

        -

        SEXTANTE -and also most of the external applications whose algorithms -are available from SEXTANTE- does not perform any reprojection on input -layers and assumes that all of them are already in a common coordinate -system and ready to be analized. Whenever you use more than one layer as -input to an algorithm, whether vector or raster, it is up to you to make -sure that they are all in the same coordinate system.

        -

        Note that, due to QGIS’s on-the-fly reprojecting capabilities, although -two layers might seem to overlap and match, that might not be true if -their original coordinates are used without reprojecting them onto a -common coordinate system. That reprojection should be done manually and -then use the resulting files as input to SEXTANTE. Also note that the -reprojection process can be performed with SEXTANTE, which incorporates -tools to do so.

        -
        -
        -
        -

        Data objects generated by SEXTANTE algorithms

        -

        Data objects generated by SEXTANTE can be of any of the following types:

        -
          -
        • A raster layer
          • -
        • A vector layer
          • -
        • A table
          • -
        • An HTML file (used for text and graphical outputs)
          • -
        -

        They are all saved to disk (there are no in-memory results), and the -parameters table will contain a text box corresponding to each one of -these outputs, where you can type the output channel to use for saving -it. An output channel contains the information needed to save the -resulting object somewhere. In the most usual case, you will save it to -a file, but the architecture of SEXTANTE allows for any other way of -storing it. For instance, a vector layer can be stored in a database or -even uploaded to a remote server using a WFS-T service. Although -solutions like these are not yet implemented, SEXTANTE is prepared to -handle them, and we expect to add new kinds of output channels in a near -feature.

        -

        To select an output channel, just click on the button on the right side -of the text box. That will open a save-file dialog, where you can select -the desired filepath. Supported file extensions are shown in the file -format selector of the dialog, depending on the kind of output and the -algorithm.

        -

        The format of the output is defined by the filename extension. The -supported formats depend on the ones supported by the algorithm itself. -To select a format, just select the corresponding file extension (or add -it if you are directly typing the filepath instead). If the extension of -the filepath you entered does not match any of the supported ones, a -default extension (usually dbf for tables, tif for raster layers -and shp for vector ones) will be appended to the filepath and the -file format corresponding to that extension will be used to save the -layer or table.

        -

        If you do not enter any filename, the result will be saved as a -temporary file and in the corresponding default file format, and will be -deleted once you exit QGIS (take care with that in case you save your -project and it contains temporary layers)

        -

        You can set a default folder for output data objects. Go to the -configuration dialog (you can open it from the SEXTANTE menu), and in -the General group you will find a parameter named Output folder. -This output folder is used as the default path in case you type just a -filename with no path (i.e. myfile.shp) when executing an algorithm.

        -

        Apart from raster layers and tables, SEXTANTE also generates graphics -and texts as HTML files. These results are shown at the end of the -algorithm execution in a new dialog. This dialog will keep the results -produced by SEXTANTE during the current session, and can be shown at any -time by selecting the SEXTANTE results viewer menu

        -

        Some external applications might have files (with no particular extension restrictions) as output, but they do not belong to any of the categories above. Those outut files will not be processed by QGIS (opened or included into the current QGIS project), since most of the times correspond to file formats or elements not supported by QGIS. This is, for instance, the case with LAS files used for LiDAR data. The files get created, but you won’t see anything new in your QGIS working session.

        -

        For all the other types of outputs, you will find a check box that you can use to tell SEXTANTE not whether to load the file once it is generated by the algorithm or not. By default, all files are opened.

        -

        SEXTANTE does not support optional outputs, so all outputs are created, but you can uncheck the corresponding check box if you are not interested in a given output, which virtually makes it behave like an optional output (although the layer is created anyway, but if you leave the text box empty, it will be saved to a temporary file and deleted once you exit QGIS)

        -
        -
        -

        Configuring SEXTANTE

        -

        As it has been mentioned, the configuration menu gives access to a new -dialog where you can configure how SEXTANTE works. Configuration -parameters are structured in separate blocks that you can select on the -left-hand side of the dialog.

        -

        Along with the aforementioned Output folder entry, the General block -contains parameters for setting the default rendering style for SEXTANTE -layers (that is, layers generated by using algorithms from any of the -SEXTANTE components). Just create the style you want using QGIS, save it -to a file, and then enter the path to that file in the settings so -SEXTANTE can use it. Whenever a layer is loaded by SEXTANTE and added to -the QGIS canvas, it will be rendered with that style.

        -

        Rendering stlyes can be configured individually for each algorithm and -each one of its outputs. Just right-click on the name of the algorithm -in the toolbox and select Edit rendering styles. You will see a dialog -like the one shown next.

        -
        -image -
        -

        Select the style file (*.qml) that you want for each output and press -OK.

        -

        Apart from the General block in the settings dialog, you will also -find one for each algorithm provider. They contain an Activate item -that you can use to make algorithms appear or not in the toolbox. Also, -some algorithm providers have their own configuration items, that we -will explain later when covering particular algorithm providers.

        -
        -
        - - -
        -
        -
        -
        -
        -

        Table Of Contents

        - - -

        Previous topic

        -

        Introduction

        -

        Next topic

        -

        The SEXTANTE graphical modeler

        -

        This Page

        - - - -
        -
        -
        -
        -
        -

        Navigation

        - -
        -
        - © Copyright 2012, Victor Olaya. - Created using Sphinx 1.1.3. -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/images/CMakeLists.txt b/python/plugins/sextante/images/CMakeLists.txt index 348cf8cc7216..f051e1ad6ea6 100644 --- a/python/plugins/sextante/images/CMakeLists.txt +++ b/python/plugins/sextante/images/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB IMAGE_FILES *.png) -INSTALL(FILES ${IMAGE_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/images) +PLUGIN_INSTALL(sextante ./images ${IMAGE_FILES}) diff --git a/python/plugins/sextante/images/geoserver.png b/python/plugins/sextante/images/geoserver.png new file mode 100644 index 000000000000..78bb8909abdd Binary files /dev/null and b/python/plugins/sextante/images/geoserver.png differ diff --git a/python/plugins/sextante/images/info.png b/python/plugins/sextante/images/info.png deleted file mode 100644 index 6627835ba32d..000000000000 Binary files a/python/plugins/sextante/images/info.png and /dev/null differ diff --git a/python/plugins/sextante/images/postgis.png b/python/plugins/sextante/images/postgis.png new file mode 100644 index 000000000000..cdde7bf21baf Binary files /dev/null and b/python/plugins/sextante/images/postgis.png differ diff --git a/python/plugins/sextante/lidar/CMakeLists.txt b/python/plugins/sextante/lidar/CMakeLists.txt index bd85d67e0c52..0a609dea4fac 100644 --- a/python/plugins/sextante/lidar/CMakeLists.txt +++ b/python/plugins/sextante/lidar/CMakeLists.txt @@ -3,4 +3,4 @@ FILE(GLOB PY_FILES *.py) ADD_SUBDIRECTORY(fusion) ADD_SUBDIRECTORY(lastools) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/lidar) +PLUGIN_INSTALL(sextante ./lidar ${PY_FILES}) diff --git a/python/plugins/sextante/lidar/fusion/CMakeLists.txt b/python/plugins/sextante/lidar/fusion/CMakeLists.txt index d9febd7f4055..53da9128780c 100644 --- a/python/plugins/sextante/lidar/fusion/CMakeLists.txt +++ b/python/plugins/sextante/lidar/fusion/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB PY_FILES *.py) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/lidar/fusion) +PLUGIN_INSTALL(sextante ./lidar/fusion ${PY_FILES}) diff --git a/python/plugins/sextante/lidar/lastools/CMakeLists.txt b/python/plugins/sextante/lidar/lastools/CMakeLists.txt index b56fe29e9de9..b67e95e3411b 100644 --- a/python/plugins/sextante/lidar/lastools/CMakeLists.txt +++ b/python/plugins/sextante/lidar/lastools/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB PY_FILES *.py) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/lidar/lastools) +PLUGIN_INSTALL(sextante ./lidar/lastools ${PY_FILES}) diff --git a/python/plugins/sextante/metadata.txt b/python/plugins/sextante/metadata.txt index 253798ee9650..ca0124f083dd 100644 --- a/python/plugins/sextante/metadata.txt +++ b/python/plugins/sextante/metadata.txt @@ -1,12 +1,14 @@ [general] name=SEXTANTE description=SEXTANTE Geoprocessing Platform for QGIS -version=1.0.8 -icon=images/toolbox.png -qgisMinimumVersion=1.0 -class_name=SextantePlugin -website=www.sextantegis.com +category=Analysis +version=1.0.9 +qgisMinimumVersion=1.8 -[author] -name=Victor Olaya +author=Victor Olaya email=volayaf@gmail.com +website=www.sextantegis.com + +icon=images/toolbox.png + +class_name=SextantePlugin diff --git a/python/plugins/sextante/mmqgisx/CMakeLists.txt b/python/plugins/sextante/mmqgisx/CMakeLists.txt index 6036976efc77..865b188d2c9f 100644 --- a/python/plugins/sextante/mmqgisx/CMakeLists.txt +++ b/python/plugins/sextante/mmqgisx/CMakeLists.txt @@ -2,6 +2,5 @@ FILE(GLOB PY_FILES *.py) FILE(GLOB OTHER_FILES copyright.txt) FILE(GLOB ICON_FILES icons/*.png) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/mmqgisx) -INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/mmqgisx) -INSTALL(FILES ${ICON_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/mmqgisx/icons) +PLUGIN_INSTALL(sextante ./mmqgisx ${PY_FILES} ${OTHER_FILES}) +PLUGIN_INSTALL(sextante ./mmqgisx/icons ${ICON_FILES}) diff --git a/python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py b/python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py index beda9db78424..61aab23b8d27 100644 --- a/python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py +++ b/python/plugins/sextante/mmqgisx/MMQGISXAlgorithmProvider.py @@ -37,9 +37,9 @@ class MMQGISXAlgorithmProvider(AlgorithmProvider): def __init__(self): AlgorithmProvider.__init__(self) - self.alglist = [ mmqgisx_attribute_export_dialog(), - mmqgisx_attribute_join_dialog(), - mmqgisx_delete_columns_dialog(), + self.alglist = [ mmqgisx_attribute_export_dialog(), + mmqgisx_attribute_join_dialog(), + mmqgisx_delete_columns_dialog(), mmqgisx_delete_duplicate_geometries_dialog(), mmqgisx_geocode_google_dialog(), mmqgisx_geometry_convert_dialog(), @@ -117,7 +117,7 @@ def processAlgorithm(self, progress): else: line_terminator = "\r\n" - message = mmqgisx_attribute_export(qgis, outfilename, layername, None, + message = mmqgisx_attribute_export(qgis, outfilename, layer, None, field_delimiter, line_terminator) if message: @@ -138,7 +138,7 @@ def defineCharacteristics(self): self.addParameter(ParameterTable(self.INFILENAME, "Input CSV File", False)) self.addParameter(ParameterTableField(self.JOINFIELD, "CSV File Field", self.INFILENAME)) - + self.addParameter(ParameterVector(self.LAYERNAME, "Join Layer", ParameterVector.VECTOR_TYPE_ANY)) self.addParameter(ParameterTableField(self.JOINATTRIBUTE, "Join Layer Attribute", mmqgisx_attribute_join_dialog.LAYERNAME)) @@ -166,7 +166,7 @@ def processAlgorithm(self, progress): outfilename = self.getOutputValue(self.OUTFILENAME) notfoundname = self.getOutputValue(self.NOTFOUNDNAME) - message = mmqgisx_attribute_join(qgis, layername, infilename, joinfield, + message = mmqgisx_attribute_join(qgis, layername, infilename, joinfield, joinattribute, outfilename, notfoundname, False) if message: @@ -200,7 +200,7 @@ def processAlgorithm(self, progress): column = self.getParameterValue(self.COLUMN) savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_delete_columns(qgis, layername, [ column ], savename, False) + message = mmqgisx_delete_columns(qgis, layer, [ column ], savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -231,7 +231,7 @@ def processAlgorithm(self, progress): savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_delete_duplicate_geometries(qgis, layername, savename, False) + message = mmqgisx_delete_duplicate_geometries(qgis, layer, savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -332,7 +332,7 @@ def processAlgorithm(self, progress): else: newtype = QGis.WKBPoint - message = mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, False) + message = mmqgisx_geometry_convert(qgis, layer, newtype, splitnodes, savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -392,7 +392,7 @@ def processAlgorithm(self, progress): else: line_terminator = "\r\n" - message = mmqgisx_geometry_export_to_csv(qgis, layername, node_filename, attribute_filename, + message = mmqgisx_geometry_export_to_csv(qgis, layername, node_filename, attribute_filename, field_delimiter, line_terminator) if message: @@ -436,7 +436,7 @@ def processAlgorithm(self, progress): geometrytype = self.geotypes[self.getParameterValue(self.GEOMETRYTYPE)] shapefilename = self.getOutputValue(self.SHAPEFILENAME) - message = mmqgisx_geometry_import_from_csv(qgis, node_filename, longitude, latitude, + message = mmqgisx_geometry_import_from_csv(qgis, node_filename, longitude, latitude, shapeid, geometrytype, shapefilename, False) if message: @@ -489,7 +489,7 @@ def processAlgorithm(self, progress): originy = centery - (height / 2.0) gridtype = self.gridtype_options[self.getParameterValue(self.GRIDTYPE)] - message = mmqgisx_grid(qgis, savename, hspacing, vspacing, width, + message = mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, originy, gridtype, 0) if message: @@ -525,7 +525,7 @@ def processAlgorithm(self, progress): vspacing = self.getParameterValue(self.VSPACING) savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_gridify_layer(qgis, layername, hspacing, vspacing, savename, False) + message = mmqgisx_gridify_layer(qgis, layer, hspacing, vspacing, savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -562,18 +562,15 @@ def processAlgorithm(self, progress): from sextante.core.Sextante import Sextante qgis = Sextante.getInterface() - layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.SOURCENAME)) - sourcename = layer.name() - - layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.DESTNAME)) - destname = layer.name() + layersource = QGisLayers.getObjectFromUri(self.getParameterValue(self.SOURCENAME)) + layerdest = QGisLayers.getObjectFromUri(self.getParameterValue(self.DESTNAME)) nameattribute = self.getParameterValue(self.NAMEATTRIBUTE) units = self.unitlist[self.getParameterValue(self.UNITS)] addlines = self.getParameterValue(self.SHAPETYPE) savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_hub_distance(qgis, sourcename, destname, nameattribute, units, addlines, savename, False) + message = mmqgisx_hub_distance(qgis, layersource, layerdest, nameattribute, units, addlines, savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -604,18 +601,15 @@ def processAlgorithm(self, progress): from sextante.core.Sextante import Sextante qgis = Sextante.getInterface() - layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.HUBNAME)) - hubname = layer.name() - - layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.SPOKENAME)) - spokename = layer.name() + hublayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.HUBNAME)) + spokelayer = QGisLayers.getObjectFromUri(self.getParameterValue(self.SPOKENAME)) hubattribute = self.getParameterValue(self.HUBATTRIBUTE) spokeattribute = self.getParameterValue(self.SPOKEATTRIBUTE) savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_hub_lines(qgis, hubname, hubattribute, spokename, spokeattribute, savename, False) + message = mmqgisx_hub_lines(qgis, hublayer, hubattribute, spokelayer, spokeattribute, savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -649,7 +643,7 @@ def processAlgorithm(self, progress): savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_label_point(qgis, layername, labelattribute, savename, False) + message = mmqgisx_label_point(qgis, layer, labelattribute, savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -676,11 +670,8 @@ def processAlgorithm(self, progress): from sextante.core.Sextante import Sextante qgis = Sextante.getInterface() - layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER1)) - layer1 = layer.name() - - layer = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER2)) - layer2 = layer.name() + layer1 = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER1)) + layer2 = QGisLayers.getObjectFromUri(self.getParameterValue(self.LAYER2)) savename = self.getOutputValue(self.SAVENAME) @@ -726,7 +717,7 @@ def processAlgorithm(self, progress): comparisonvalue = self.getParameterValue(self.COMPARISONVALUE) savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_select(qgis, layername, attribute, comparisonvalue, comparison, savename, False) + message = mmqgisx_select(qgis, layer, attribute, comparisonvalue, comparison, savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -763,7 +754,7 @@ def processAlgorithm(self, progress): direction = self.directions [ self.getParameterValue(self.DIRECTION) ] savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_sort(qgis, layername, attribute, savename, direction, False) + message = mmqgisx_sort(qgis, layer, attribute, savename, direction, False) if message: raise GeoAlgorithmExecutionException(message) @@ -799,7 +790,7 @@ def processAlgorithm(self, progress): attribute = self.getParameterValue(self.ATTRIBUTE) savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_text_to_float(qgis, layername, [ attribute ], savename, False) + message = mmqgisx_text_to_float(qgis, layer, [ attribute ], savename, False) if message: raise GeoAlgorithmExecutionException(message) @@ -829,7 +820,7 @@ def processAlgorithm(self, progress): savename = self.getOutputValue(self.SAVENAME) - message = mmqgisx_voronoi_diagram(qgis, layername, savename, False) + message = mmqgisx_voronoi_diagram(qgis, layer, savename, False) if message: raise GeoAlgorithmExecutionException(message) diff --git a/python/plugins/sextante/mmqgisx/mmqgisx_library.py b/python/plugins/sextante/mmqgisx/mmqgisx_library.py index ad10cf1fb091..811b3d6e9f28 100644 --- a/python/plugins/sextante/mmqgisx/mmqgisx_library.py +++ b/python/plugins/sextante/mmqgisx/mmqgisx_library.py @@ -8,8 +8,8 @@ # email : See michaelminn.com # # MMQGIS program is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published by -# the Free Software Foundation; either version 2 of the License, or +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or # (at your option) any later version. # ------------------------------------------------------------------------ @@ -105,16 +105,16 @@ def mmqgisx_gridify_points(hspacing, vspacing, points): while (len(newpoints) > 1) and (newpoints[0] == newpoints[len(newpoints) - 1]): newpoints.pop(len(newpoints) - 1) deleted_points += 2 - + return newpoints, point_count, deleted_points -# mmqgisx_layer_attribute_bounds() is needed because the -# QgsVectorDataProvider::minimumValue() and maximumValue() +# mmqgisx_layer_attribute_bounds() is needed because the +# QgsVectorDataProvider::minimumValue() and maximumValue() # do not work as of QGIS v1.5.0 def mmqgisx_layer_attribute_bounds(layer, attribute_name): #attribute_index = -1 - #for index, field in layer.dataProvider().fields().iteritems(): + #for index, field in layer.dataProvider().fields().iteritems(): # if str(field.name()) == attribute_name: # attribute_index = index @@ -142,7 +142,7 @@ def mmqgisx_layer_attribute_bounds(layer, attribute_name): # print str(value) + " : " + str(valid) + " : " + str(minimum) + " : " + str(maximum) count += 1 - return minimum, maximum, 1 + return minimum, maximum, 1 def mmqgisx_wkbtype_to_text(wkbtype): if wkbtype == QGis.WKBUnknown: return "Unknown" @@ -387,15 +387,15 @@ def mmqgisx_animate_rows(qgis, layer_names, cumulative, outdir): # mmqgisx_attribute_export - Export attributes to CSV file # ---------------------------------------------------------- -def mmqgisx_attribute_export(qgis, outfilename, layername, attribute_names, field_delimiter, line_terminator): +def mmqgisx_attribute_export(qgis, outfilename, layer, attribute_names, field_delimiter, line_terminator): # Error checks if (not outfilename) or (len(outfilename) <= 0): return "No output CSV file given" - - layer = mmqgisx_find_layer(layername) + + #layer = mmqgisx_find_layer(layername) if layer == None: - return "Layer " + layername + " not found" + return "Layer not found" # Find attribute indices attribute_indices = [] @@ -410,7 +410,7 @@ def mmqgisx_attribute_export(qgis, outfilename, layername, attribute_names, fiel for x in range(0, len(attribute_names)): index = layer.dataProvider().fieldNameIndex(attribute_names[x]) if index < 0: - return "Layer " + layername + " has no attribute " + attribute_names[x] + return "Layer has no attribute " + attribute_names[x] attribute_indices.append(index) # Create the CSV file @@ -467,13 +467,13 @@ def mmqgisx_attribute_join(qgis, layername, infilename, joinfield, joinattribute if len(outfilename) <= 0: return "No output shapefile name given" - + # Create a combined field list from the source layer and the CSV file header try: infile = open(infilename, 'r') except: return "Failure opening input file: " + unicode(infilename) - + try: dialect = csv.Sniffer().sniff(infile.read(2048)) except: @@ -565,7 +565,7 @@ def mmqgisx_attribute_join(qgis, layername, infilename, joinfield, joinattribute for name, value in attributes.iteritems(): newattributes[len(newattributes)] = value #print str(value) - + for combine in row: newattributes[len(newattributes)] = QVariant(combine) #print str(combine) @@ -600,8 +600,8 @@ def mmqgisx_attribute_join(qgis, layername, infilename, joinfield, joinattribute writer.writerow(csv_data[x]) del writer del outfile - - if addlayer: + + if addlayer: qgis.addVectorLayer(outfilename, os.path.basename(outfilename), "ogr") qgis.mainWindow().statusBar().showMessage(unicode(matched_count) + " records joined from " + \ @@ -683,7 +683,7 @@ def mmqgisx_set_color_map(qgis, layername, bandname, lowvalue, midvalue, highval red = unicode(int(round(lowred + ((midred - lowred) * interpolate)))) green = unicode(int(round(lowgreen + ((midgreen - lowgreen) * interpolate)))) blue = unicode(int(round(lowblue + ((midblue - lowblue) * interpolate)))) - os.write(outfile, "\n") else: interpolate = (interpolate - 0.5) * 2.0 @@ -691,7 +691,7 @@ def mmqgisx_set_color_map(qgis, layername, bandname, lowvalue, midvalue, highval red = unicode(int(round(midred + ((highred - midred) * interpolate)))) green = unicode(int(round(midgreen + ((highgreen - midgreen) * interpolate)))) blue = unicode(int(round(midblue + ((highblue - midblue) * interpolate)))) - os.write(outfile, "\n") #print str(x) + ", " + str(interpolate) + ", " + str(value) @@ -719,7 +719,7 @@ def mmqgisx_set_color_map(qgis, layername, bandname, lowvalue, midvalue, highval value = midvalue + ((highvalue - midvalue) * interpolate) values.append(value) # print str(x) + ", " + str(value) - + for x in range(0, steps): interpolate = x / float(steps) if (interpolate < 0.5): @@ -746,7 +746,7 @@ def mmqgisx_set_color_map(qgis, layername, bandname, lowvalue, midvalue, highval os.write(outfile, "\n") os.write(outfile, "SolidLine\n") os.write(outfile, "0.26\n") - os.write(outfile, "") os.write(outfile, "SolidPattern\n") os.write(outfile, "\n") @@ -770,10 +770,10 @@ def mmqgisx_set_color_map(qgis, layername, bandname, lowvalue, midvalue, highval # mmqgisx_delete_columns - Change text fields to numbers # --------------------------------------------------------- -def mmqgisx_delete_columns(qgis, layername, columns, savename, addlayer): - layer = mmqgisx_find_layer(layername) +def mmqgisx_delete_columns(qgis, layer, columns, savename, addlayer): + #layer = mmqgisx_find_layer(layername) if layer == None: - return "No layer specified to modify: " + layername + return "No layer specified to modify " if len(savename) <= 0: return "No output filename given" @@ -798,7 +798,7 @@ def mmqgisx_delete_columns(qgis, layername, columns, savename, addlayer): if len(destfields) <= 0: return "All columns being deleted" - + # Create the output file if QFile(savename).exists(): if not QgsVectorFileWriter.deleteShapeFile(QString(savename)): @@ -832,7 +832,7 @@ def mmqgisx_delete_columns(qgis, layername, columns, savename, addlayer): if addlayer: vlayer = qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage(unicode(len(columns)) + " columns deleted and written to " + savename) return None @@ -842,12 +842,12 @@ def mmqgisx_delete_columns(qgis, layername, columns, savename, addlayer): # while removing duplicate shapes # -------------------------------------------------------- -def mmqgisx_delete_duplicate_geometries(qgis, layername, savename, addlayer): +def mmqgisx_delete_duplicate_geometries(qgis, layer, savename, addlayer): # Initialization and error checking - layer = mmqgisx_find_layer(layername) + #layer = mmqgisx_find_layer(layername) if layer == None: - return "Invalid layer name: " + savename + return "Invalid layer" if len(savename) <= 0: return "No output filename given" @@ -863,7 +863,7 @@ def mmqgisx_delete_duplicate_geometries(qgis, layername, savename, addlayer): return "Failure creating output shapefile: " + unicode(outfile.errorMessage()) # Read geometries into an array - # Have to save as WKT because saving geometries causes segfault + # Have to save as WKT because saving geometries causes segfault # when they are used with equal() later geometries = [] layer.dataProvider().select(layer.dataProvider().attributeIndexes()) @@ -894,12 +894,12 @@ def mmqgisx_delete_duplicate_geometries(qgis, layername, savename, addlayer): if geometries[x] != None: writecount += 1 outfile.addFeature(feature) - + del outfile if addlayer: qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage(unicode(writecount) + " of " + \ unicode(layer.dataProvider().featureCount()) + \ " unique features written to " + savename) @@ -910,12 +910,12 @@ def mmqgisx_delete_duplicate_geometries(qgis, layername, savename, addlayer): # mmqgisx_float_to_text - String format numeric fields # --------------------------------------------------------- -def mmqgisx_float_to_text(qgis, layername, attributes, separator, +def mmqgisx_float_to_text(qgis, layer, attributes, separator, decimals, prefix, suffix, savename, addlayer): - layer = mmqgisx_find_layer(layername) + #layer = mmqgisx_find_layer(layername) if layer == None: - return "Project has no active vector layer to convert: " + layername + return "Project has no active vector layer to convert: " if decimals < 0: return "Invalid number of decimals: " + unicode(decimals) @@ -929,7 +929,7 @@ def mmqgisx_float_to_text(qgis, layername, attributes, separator, for index, field in layer.dataProvider().fields().iteritems(): destfields[index] = QgsField (field.name(), field.type(), field.typeName(), \ field.length(), field.precision(), field.comment()) - + if field.name() in attributes: if (field.type() != QVariant.Int) and (field.type() != QVariant.Double): return "Cannot convert non-numeric field " + unicode(field.name()) @@ -979,7 +979,7 @@ def mmqgisx_float_to_text(qgis, layername, attributes, separator, if addlayer: vlayer = qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage(unicode(changecount) + " numeric converted to text") return None @@ -1051,8 +1051,8 @@ def mmqgisx_geocode_google(qgis, csvname, shapefilename, notfoundfile, keys, add for row in reader: time.sleep(0.5) # to avoid Google rate quota limits - recordcount += 1 - qgis.mainWindow().statusBar().showMessage("Geocoding " + unicode(recordcount) + + recordcount += 1 + qgis.mainWindow().statusBar().showMessage("Geocoding " + unicode(recordcount) + " (" + unicode(notfoundcount) + " not found)") address = "" @@ -1067,7 +1067,7 @@ def mmqgisx_geocode_google(qgis, csvname, shapefilename, notfoundfile, keys, add if len(address) <= 0: notfoundcount += 1 notwriter.writerow(row) - + else: url = "http://maps.googleapis.com/maps/api/geocode/xml?sensor=false&address=" + address xml = urllib.urlopen(url).read() @@ -1089,7 +1089,7 @@ def mmqgisx_geocode_google(qgis, csvname, shapefilename, notfoundfile, keys, add attributes[z] = QVariant(row[z].strip()) #y = 40.714353 - #x = -74.005973 + #x = -74.005973 newfeature = QgsFeature() newfeature.setAttributeMap(attributes) geometry = QgsGeometry.fromPoint(QgsPoint(x, y)) @@ -1106,7 +1106,7 @@ def mmqgisx_geocode_google(qgis, csvname, shapefilename, notfoundfile, keys, add if addlayer and (recordcount > notfoundcount) and (recordcount > 0): vlayer = qgis.addVectorLayer(shapefilename, os.path.basename(shapefilename), "ogr") - + qgis.mainWindow().statusBar().showMessage(unicode(recordcount - notfoundcount) + " of " + unicode(recordcount) + " addresses geocoded with Google") @@ -1117,11 +1117,11 @@ def mmqgisx_geocode_google(qgis, csvname, shapefilename, notfoundfile, keys, add # simpler types # -------------------------------------------------------- -def mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, addlayer): - layer = mmqgisx_find_layer(layername) +def mmqgisx_geometry_convert(qgis, layer, newtype, splitnodes, savename, addlayer): + #layer = mmqgisx_find_layer(layername) if (layer == None) and (layer.type() != QgsMapLayer.VectorLayer): - return "Invalid Vector Layer " + layername + return "Invalid Vector Layer" # Create output file if len(savename) <= 0: @@ -1131,7 +1131,7 @@ def mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, add if not QgsVectorFileWriter.deleteShapeFile(QString(savename)): return "Failure deleting existing shapefile: " + savename - outfile = QgsVectorFileWriter(QString(savename), QString("System"), + outfile = QgsVectorFileWriter(QString(savename), QString("System"), layer.dataProvider().fields(), newtype, layer.dataProvider().crs()) if (outfile.hasError() != QgsVectorFileWriter.NoError): @@ -1183,7 +1183,7 @@ def mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, add newfeature.setAttributeMap(feature.attributeMap()) newfeature.setGeometry(feature.geometry()) outfile.addFeature(newfeature) - + else: return "Invalid Conversion: " + mmqgisx_wkbtype_to_text(feature.geometry().wkbType()) + \ " to " + mmqgisx_wkbtype_to_text(newtype) @@ -1222,7 +1222,7 @@ def mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, add newfeature.setAttributeMap(feature.attributeMap()) newfeature.setGeometry(feature.geometry()) outfile.addFeature(newfeature) - + else: return "Invalid Conversion: " + mmqgisx_wkbtype_to_text(feature.geometry().wkbType()) + \ " to " + mmqgisx_wkbtype_to_text(newtype) @@ -1298,7 +1298,7 @@ def mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, add newfeature.setAttributeMap(feature.attributeMap()) newfeature.setGeometry(QgsGeometry.fromPoint(point)) outfile.addFeature(newfeature) - + elif (newtype == QGis.WKBPoint): newfeature = QgsFeature() newfeature.setAttributeMap(feature.attributeMap()) @@ -1332,7 +1332,7 @@ def mmqgisx_geometry_convert(qgis, layername, newtype, splitnodes, savename, add else: return "Invalid Conversion: " + mmqgisx_wkbtype_to_text(feature.geometry().wkbType()) + \ " to " + mmqgisx_wkbtype_to_text(newtype) - + del outfile if addlayer: @@ -1424,7 +1424,7 @@ def mmqgisx_geometry_export_to_csv(qgis, layername, node_filename, attribute_fil for attindex, attribute in feature.attributeMap().iteritems(): row.append(unicode(attribute.toString()).encode("iso-8859-1")) attribute_writer.writerow(row) - + del nodefile if (layer.geometryType() != QGis.Point): del attributefile @@ -1438,13 +1438,13 @@ def mmqgisx_geometry_export_to_csv(qgis, layername, node_filename, attribute_fil # mmqgisx_geometry_import_from_csv - Shape node import from CSV # -------------------------------------------------------- -def mmqgisx_geometry_import_from_csv(qgis, node_filename, long_colname, lat_colname, +def mmqgisx_geometry_import_from_csv(qgis, node_filename, long_colname, lat_colname, shapeid_colname, geometry_type, shapefile_name, addlayer): try: infile = open(node_filename, 'r') except: return "Failure opening " + node_filename - + try: dialect = csv.Sniffer().sniff(infile.read(2048)) except: @@ -1571,7 +1571,7 @@ def mmqgisx_geometry_import_from_csv(qgis, node_filename, long_colname, lat_coln newfeature.setGeometry(geometry) outfile.addFeature(newfeature) shape_count += 1 - + polyline = [] if reading and point: current_shape_id = row[shapeid_col] @@ -1582,7 +1582,7 @@ def mmqgisx_geometry_import_from_csv(qgis, node_filename, long_colname, lat_coln if addlayer: qgis.addVectorLayer(shapefile_name, os.path.basename(shapefile_name), "ogr") - + qgis.mainWindow().statusBar().showMessage("Loaded " + unicode(shape_count) + " shapes (" + unicode(node_count) + " nodes") return None @@ -1597,10 +1597,10 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori if (hspacing <= 0) or (vspacing <= 0): return "Invalid grid spacing: " + unicode(hspacing) + " / " + unicode(vspacing) - - if (width <= hspacing) or (width < vspacing): + + if (width < hspacing) or (height < vspacing): return "Invalid width / height: " + unicode(width) + " / " + unicode(height) - + fields = { 0 : QgsField("longitude", QVariant.Double, "real", 24, 16, "Longitude"), 1 : QgsField("latitude", QVariant.Double, "real", 24, 16, "Latitude") } @@ -1616,8 +1616,8 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori shapetype = QGis.WKBLineString # print gridtype + "," + str(shapetype) - - outfile = QgsVectorFileWriter(QString(savename), QString("System"), fields, + + outfile = QgsVectorFileWriter(QString(savename), QString("System"), fields, shapetype, QgsCoordinateReferenceSystem()); if (outfile.hasError() != QgsVectorFileWriter.NoError): @@ -1630,7 +1630,7 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori polyline = [] geometry = QgsGeometry() feature = QgsFeature() - + y = originy while y <= (originy + height): polyline.append(QgsPoint(x, y)) @@ -1649,7 +1649,7 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori polyline = [] geometry = QgsGeometry() feature = QgsFeature() - + x = originx while x <= (originx + width): polyline.append(QgsPoint(x, y)) @@ -1681,9 +1681,9 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori feature.addAttribute(1, QVariant(y + (vspacing / 2.0))) outfile.addFeature(feature) linecount = linecount + 1 - y = y + hspacing; + y = y + vspacing; - x = x + vspacing + x = x + hspacing elif gridtype == "Diamond (polygon)": x = originx @@ -1756,7 +1756,7 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori if addlayer: qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage(unicode(linecount) + " feature grid shapefile created") return None @@ -1765,11 +1765,11 @@ def mmqgisx_grid(qgis, savename, hspacing, vspacing, width, height, originx, ori # mmqgisx_gridify - Snap shape verticies to grid # -------------------------------------------------------- -def mmqgisx_gridify_layer(qgis, layername, hspacing, vspacing, savename, addlayer): - layer = mmqgisx_find_layer(layername) +def mmqgisx_gridify_layer(qgis, layer, hspacing, vspacing, savename, addlayer): + #layer = mmqgisx_find_layer(layername) if not layer: return "Project has no active vector layer to gridify" - + if (hspacing <= 0) or (vspacing <= 0): return "Invalid grid spacing: " + unicode(hspacing) + "/" + unicode(vspacing) @@ -1880,7 +1880,7 @@ def mmqgisx_gridify_layer(qgis, layername, hspacing, vspacing, savename, addlaye " on feature " + unicode(feature_number + 1) # print "Closing feature" - + if geometry != None: out_feature = QgsFeature() out_feature.setGeometry(geometry) @@ -1893,7 +1893,7 @@ def mmqgisx_gridify_layer(qgis, layername, hspacing, vspacing, savename, addlaye if addlayer: vlayer = qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage("Gridified shapefile created (" + \ unicode(deleted_points) + " of " + unicode(point_count) + " points deleted)") @@ -1911,18 +1911,18 @@ def __init__(self, point, newname): self.name = newname -def mmqgisx_hub_distance(qgis, sourcename, destname, nameattributename, units, addlines, savename, addlayer): +def mmqgisx_hub_distance(qgis, sourcelayer, hubslayer, nameattributename, units, addlines, savename, addlayer): # Error checks - sourcelayer = mmqgisx_find_layer(sourcename) + #sourcelayer = mmqgisx_find_layer(sourcename) if (sourcelayer == None) or (sourcelayer.featureCount() <= 0): - return "Origin Layer " + sourcename + " not found" + return "Origin Layer not found" - hubslayer = mmqgisx_find_layer(destname) + #hubslayer = mmqgisx_find_layer(destname) if (hubslayer == None) or (hubslayer.featureCount() <= 0): - return "Hub layer " + destname + " not found" + return "Hub layer not found" - if sourcename == destname: + if sourcelayer == hubslayer: return "Same layer given for both hubs and spokes" nameindex = hubslayer.dataProvider().fieldNameIndex(nameattributename) @@ -2024,7 +2024,7 @@ def mmqgisx_hub_distance(qgis, sourcename, destname, nameattributename, units, a if addlayer: vlayer = qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage("Hub distance file created from " + sourcename) return None @@ -2035,19 +2035,18 @@ def mmqgisx_hub_distance(qgis, sourcename, destname, nameattributename, units, a # -------------------------------------------------------- -def mmqgisx_hub_lines(qgis, hubname, hubattr, spokename, spokeattr, savename, addlayer): +def mmqgisx_hub_lines(qgis, hublayer, hubattr, spokelayer, spokeattr, savename, addlayer): - # Find layers - if hubname == spokename: + if hublayer == spokelayer: return "Same layer given for both hubs and spokes" - hublayer = mmqgisx_find_layer(hubname) + #hublayer = mmqgisx_find_layer(hubname) if (hublayer == None) or (hublayer.featureCount() <= 0): - return "Hub layer " + destname + " not found" + return "Hub layer not found" - spokelayer = mmqgisx_find_layer(spokename) + #spokelayer = mmqgisx_find_layer(spokename) if spokelayer == None: - return "Spoke Point Layer " + sourcename + " not found" + return "Spoke Point Layer not found" # Find Hub ID attribute indices hubindex = hublayer.dataProvider().fieldNameIndex(hubattr) @@ -2135,10 +2134,10 @@ def __init__(self, name, attributemap): self.feature_count = 0 self.attributes = attributemap -def mmqgisx_label_point(qgis, layername, labelattributename, savename, addlayer): - layer = mmqgisx_find_layer(layername) +def mmqgisx_label_point(qgis, layer, labelattributename, savename, addlayer): + #layer = mmqgisx_find_layer(layername) if layer == None: - return "Invalid layer name " . layername + return "Invalid layer name " labelindex = layer.dataProvider().fieldNameIndex(labelattributename) if labelindex < 0: @@ -2193,7 +2192,7 @@ def mmqgisx_label_point(qgis, layername, labelattributename, savename, addlayer) writecount = 0 for key in keys: label_point = features[key] - point = QgsPoint(label_point.xsum / label_point.feature_count, + point = QgsPoint(label_point.xsum / label_point.feature_count, label_point.ysum / label_point.feature_count) feature = QgsFeature() @@ -2213,8 +2212,8 @@ def mmqgisx_label_point(qgis, layername, labelattributename, savename, addlayer) if addlayer: qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - - qgis.mainWindow().statusBar().showMessage(unicode(writecount) + " label shapefile created from " + layername) + + qgis.mainWindow().statusBar().showMessage(unicode(writecount) + " label shapefile created from " + layer.name()) return None @@ -2222,16 +2221,16 @@ def mmqgisx_label_point(qgis, layername, labelattributename, savename, addlayer) # mmqgisx_merge - Merge layers to single shapefile # -------------------------------------------------------- -def mmqgisx_merge(qgis, layernames, savename, addlayer): +def mmqgisx_merge(qgis, layers, savename, addlayer): fields = {} - layers = [] + #layers = [] totalfeaturecount = 0 - for x in range(0, len(layernames)): - layername = layernames[x] - layer = mmqgisx_find_layer(layername) + for x in range(0, len(layers)): + layer = layers[x] + #layer = mmqgisx_find_layer(layername) if layer == None: - return "Layer " + layername + " not found" + return "Layer not found" # Verify that all layers are the same type (point, polygon, etc) if (len(layers) > 0): @@ -2241,10 +2240,10 @@ def mmqgisx_merge(qgis, layernames, savename, addlayer): mmqgisx_wkbtype_to_text(layers[0].dataProvider().geometryType()) + ")" #if (layer.dataProvider().crs() != layers[0].dataProvider().crs()): - # QMessageBox.critical(qgis.mainWindow(), + # QMessageBox.critical(qgis.mainWindow(), # "Merge Layers", "Merged layers must all have same coordinate system") # return None - + layers.append(layer) totalfeaturecount += layer.featureCount() @@ -2257,10 +2256,10 @@ def mmqgisx_merge(qgis, layernames, savename, addlayer): if not found: fields[len(fields)] = sfield - + if (len(layers) <= 0): return "No layers given to merge" - + # Create the output shapefile if len(savename) <= 0: return "No output filename given" @@ -2314,8 +2313,8 @@ def mmqgisx_merge(qgis, layernames, savename, addlayer): # mmqgisx_select - Select features by attribute # ---------------------------------------------------------- -def mmqgisx_select(qgis, layername, selectattributename, comparisonvalue, comparisonname, savename, addlayer): - layer = mmqgisx_find_layer(layername) +def mmqgisx_select(qgis, layer, selectattributename, comparisonvalue, comparisonname, savename, addlayer): + #layer = mmqgisx_find_layer(layername) if layer == None: return "Project has no active vector layer to select from" @@ -2374,7 +2373,7 @@ def mmqgisx_select(qgis, layername, selectattributename, comparisonvalue, compar match = x.startswith(y) elif (comparisonname == 'contains'): match = (x.find(y) >= 0) - + readcount += 1 if (match): outfile.addFeature(feature) @@ -2388,7 +2387,7 @@ def mmqgisx_select(qgis, layername, selectattributename, comparisonvalue, compar if addlayer: vlayer = qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage("Selected " + unicode(writecount) + " features to " + savename) return None @@ -2397,8 +2396,8 @@ def mmqgisx_select(qgis, layername, selectattributename, comparisonvalue, compar # mmqgisx_sort - Sort shapefile by attribute # -------------------------------------------------------- -def mmqgisx_sort(qgis, layername, sortattributename, savename, direction, addlayer): - layer = mmqgisx_find_layer(layername) +def mmqgisx_sort(qgis, layer, sortattributename, savename, direction, addlayer): + #layer = mmqgisx_find_layer(layername) if layer == None: return "Project has no active vector layer to sort" @@ -2411,7 +2410,7 @@ def mmqgisx_sort(qgis, layername, sortattributename, savename, direction, addlay sortindex = layer.dataProvider().fieldNameIndex(sortattributename) if sortindex < 0: return "Invalid sort field name: " + sortattributename - + # print "sortindex = " + str(sortindex) if len(savename) <= 0: @@ -2461,17 +2460,17 @@ def mmqgisx_sort(qgis, layername, sortattributename, savename, direction, addlay if addlayer: vlayer = qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage("Sorted shapefile created from " + layername) return None # -------------------------------------------------------- -# mmqgisx_geocode_street_layer - Geocode addresses from street +# mmqgisx_geocode_street_layer - Geocode addresses from street # address finder shapefile # -------------------------------------------------------- -def mmqgisx_geocode_street_layer(qgis, layername, csvname, addressfield, shapefilename, streetname, +def mmqgisx_geocode_street_layer(qgis, layername, csvname, addressfield, shapefilename, streetname, fromx, fromy, tox, toy, leftfrom, rightfrom, leftto, rightto, setback, notfoundfile, addlayer): layer = mmqgisx_find_layer(layername) @@ -2533,7 +2532,7 @@ def mmqgisx_geocode_street_layer(qgis, layername, csvname, addressfield, shapefi attributes = {} for field in row: attributes[len(attributes)] = QVariant(field) - + csv_attributes.append(attributes) csv_found.append(0) @@ -2604,7 +2603,7 @@ def mmqgisx_geocode_street_layer(qgis, layername, csvname, addressfield, shapefi else: ratio = float(csv_streetnumber[row] - rightfrom) \ / float(rightto - rightfrom) - + (tox, test) = attributes[tox_attribute].toDouble() (toy, test) = attributes[toy_attribute].toDouble() (fromx, test) = attributes[fromx_attribute].toDouble() @@ -2659,7 +2658,7 @@ def mmqgisx_geocode_street_layer(qgis, layername, csvname, addressfield, shapefi if matched_count and addlayer: vlayer = qgis.addVectorLayer(shapefilename, os.path.basename(shapefilename), "ogr") - + qgis.mainWindow().statusBar().showMessage(unicode(matched_count) + " of " + unicode(len(csv_attributes)) \ + " addresses geocoded from " + unicode(feature_count) + " street records") @@ -2702,10 +2701,10 @@ def mmqgisx_searchable_streetname(name): # mmqgisx_text_to_float - Change text fields to numbers # --------------------------------------------------------- -def mmqgisx_text_to_float(qgis, layername, attributes, savename, addlayer): - layer = mmqgisx_find_layer(layername) +def mmqgisx_text_to_float(qgis, layer, attributes, savename, addlayer): + #layer = mmqgisx_find_layer(layername) if layer == None: - return "Project has no active vector layer to convert: " + layername + return "Project has no active vector layer to convert" if len(savename) <= 0: return "No output filename given" @@ -2716,7 +2715,7 @@ def mmqgisx_text_to_float(qgis, layername, attributes, savename, addlayer): for index, field in layer.dataProvider().fields().iteritems(): destfields[index] = QgsField (field.name(), field.type(), field.typeName(), \ field.length(), field.precision(), field.comment()) - + #print "Scan " + str(destfields[index].name()) if field.name() in attributes: #print "Change " + str(destfields[index].name()) @@ -2767,11 +2766,11 @@ def mmqgisx_text_to_float(qgis, layername, attributes, savename, addlayer): if string.find(",") >= 0: string = string.replace(",", "") - try: + try: value = float(string) * multiplier except: value = 0 - + attributes[index] = QVariant(value) #for index, field in attributes.iteritems(): @@ -2784,7 +2783,7 @@ def mmqgisx_text_to_float(qgis, layername, attributes, savename, addlayer): if addlayer: vlayer = qgis.addVectorLayer(savename, os.path.basename(savename), "ogr") - + qgis.mainWindow().statusBar().showMessage(unicode(changecount) + " text converted to numeric") return None @@ -2794,11 +2793,11 @@ def mmqgisx_text_to_float(qgis, layername, attributes, savename, addlayer): # mmqgisx_voronoi - Voronoi diagram creation # -------------------------------------------------------- -def mmqgisx_voronoi_diagram(qgis, sourcelayer, savename, addlayer): - layer = mmqgisx_find_layer(sourcelayer) +def mmqgisx_voronoi_diagram(qgis, layer, savename, addlayer): + #layer = mmqgisx_find_layer(sourcelayer) if layer == None: - return "Layer " + sourcename + " not found" - + return "Layer not found" + if len(savename) <= 0: return "No output filename given" @@ -2920,7 +2919,7 @@ def mmqgisx_voronoi_diagram(qgis, sourcelayer, savename, addlayer): # If border intersects to the left if (anglebetween < pi) and (anglebetween > 0): # A typo here with a reversed slash cost 8/13/2009 debugging - tangents[scan].iangle = atan2( (tangents[scan].distance / + tangents[scan].iangle = atan2( (tangents[scan].distance / borders[len(borders) - 1].distance) \ - cos(anglebetween), sin(anglebetween)) tangents[scan].idistance = borders[len(borders) - 1].distance \ @@ -2981,7 +2980,7 @@ def mmqgisx_voronoi_diagram(qgis, sourcelayer, savename, addlayer): feature.setGeometry(geometry) feature.setAttributeMap(center[2]) outfile.addFeature(feature) - + del outfile if addlayer: diff --git a/python/plugins/sextante/modeler/CMakeLists.txt b/python/plugins/sextante/modeler/CMakeLists.txt index 0c1467940868..f9e700041423 100644 --- a/python/plugins/sextante/modeler/CMakeLists.txt +++ b/python/plugins/sextante/modeler/CMakeLists.txt @@ -1,3 +1,5 @@ FILE(GLOB PY_FILES *.py) +FILE(GLOB MODEL_FILES models/*.model) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/modeler) +PLUGIN_INSTALL(sextante modeler ${PY_FILES}) +PLUGIN_INSTALL(sextante modeler/models ${MODEL_FILES}) diff --git a/python/plugins/sextante/modeler/ModelerAlgorithm.py b/python/plugins/sextante/modeler/ModelerAlgorithm.py index b8d36d11c97a..8c6c490ab0a3 100644 --- a/python/plugins/sextante/modeler/ModelerAlgorithm.py +++ b/python/plugins/sextante/modeler/ModelerAlgorithm.py @@ -16,6 +16,7 @@ * * *************************************************************************** """ +from sextante.outputs.OutputString import OutputString __author__ = 'Victor Olaya' __date__ = 'August 2012' @@ -116,7 +117,7 @@ def openModel(self, filename): elif line.startswith("VALUE:"): valueLine = line[len("VALUE:"):] tokens = valueLine.split("===") - + self.paramValues[tokens[0]] = tokens[1].replace(ModelerAlgorithm.LINE_BREAK_STRING, '\n') elif line.startswith("NAME:"): self.name = line[len("NAME:"):] @@ -436,6 +437,8 @@ def getOutputType(self, i, outname): return "output html" elif isinstance(out, OutputNumber): return "output number" + elif isinstance(out, OutputString): + return "output string" def getAsPythonCode(self): diff --git a/python/plugins/sextante/modeler/ModelerAlgorithmProvider.py b/python/plugins/sextante/modeler/ModelerAlgorithmProvider.py index 7cd32bc3bf04..c736eaa84547 100644 --- a/python/plugins/sextante/modeler/ModelerAlgorithmProvider.py +++ b/python/plugins/sextante/modeler/ModelerAlgorithmProvider.py @@ -65,11 +65,18 @@ def getIcon(self): def _loadAlgorithms(self): folder = ModelerUtils.modelsFolder() + self.loadFromFolder(folder) + folder = os.path.join(os.path.dirname(__file__), "models") + self.loadFromFolder(folder) + + def loadFromFolder(self,folder): + if not os.path.exists(folder): + return for descriptionFile in os.listdir(folder): if descriptionFile.endswith("model"): try: alg = ModelerAlgorithm() - fullpath = os.path.join(ModelerUtils.modelsFolder(),descriptionFile) + fullpath = os.path.join(folder ,descriptionFile) alg.openModel(fullpath) if alg.name.strip() != "": alg.provider = self diff --git a/python/plugins/sextante/modeler/ModelerArrowItem.py b/python/plugins/sextante/modeler/ModelerArrowItem.py index ca537c2b83e4..784e1b7171f2 100644 --- a/python/plugins/sextante/modeler/ModelerArrowItem.py +++ b/python/plugins/sextante/modeler/ModelerArrowItem.py @@ -64,10 +64,14 @@ def endItem(self): return self.myEndItem def boundingRect(self): - extra = (self.pen().width() + 20) / 2.0 - p1 = self.line().p1() - p2 = self.line().p2() - return QtCore.QRectF(p1, QtCore.QSizeF(p2.x() - p1.x(), p2.y() - p1.y())).normalized().adjusted(-extra, -extra, extra, extra) + #this is a quick fix to avoid arrows not being drawn + return QtCore.QRectF(0, 0, 4000,4000) + #======================================================================= + # extra = (self.pen().width() + 20) / 2.0 + # p1 = self.line().p1() + # p2 = self.line().p2() + # return QtCore.QRectF(p1, QtCore.QSizeF(p2.x() - p1.x(), p2.y() - p1.y())).normalized().adjusted(-extra, -extra, extra, extra) + #======================================================================= def shape(self): path = super(ModelerArrowItem, self).shape() @@ -123,3 +127,4 @@ def paint(self, painter, option, widget=None): painter.drawLine(line) painter.drawPolygon(self.arrowHead) + diff --git a/python/plugins/sextante/modeler/ModelerDialog.py b/python/plugins/sextante/modeler/ModelerDialog.py index d1e4d982949a..506794fdbd29 100644 --- a/python/plugins/sextante/modeler/ModelerDialog.py +++ b/python/plugins/sextante/modeler/ModelerDialog.py @@ -16,6 +16,9 @@ * * *************************************************************************** """ +from sextante.core.SextanteConfig import SextanteConfig +from sextante.core.GeoAlgorithm import GeoAlgorithm +from sextante.core.AlgorithmClassification import AlgorithmDecorator __author__ = 'Victor Olaya' __date__ = 'August 2012' @@ -25,7 +28,15 @@ from PyQt4.QtCore import * from PyQt4.QtGui import * -from PyQt4 import QtCore, QtGui + +import codecs +import pickle + +from sextante.core.SextanteUtils import SextanteUtils + +from sextante.gui.HelpEditionDialog import HelpEditionDialog +from sextante.gui.ParametersDialog import ParametersDialog + from sextante.modeler.ModelerParameterDefinitionDialog import ModelerParameterDefinitionDialog from sextante.modeler.ModelerAlgorithm import ModelerAlgorithm from sextante.modeler.ModelerParametersDialog import ModelerParametersDialog @@ -33,154 +44,190 @@ from sextante.modeler.WrongModelException import WrongModelException from sextante.modeler.ModelerScene import ModelerScene from sextante.modeler.Providers import Providers -from sextante.gui.HelpEditionDialog import HelpEditionDialog -import pickle -from sextante.gui.ParametersDialog import ParametersDialog -from sextante.core.SextanteUtils import SextanteUtils -import codecs -class ModelerDialog(QtGui.QDialog): +from sextante.ui.ui_DlgModeler import Ui_DlgModeler + +class ModelerDialog(QDialog, Ui_DlgModeler): def __init__(self, alg=None): - QtGui.QDialog.__init__(self) - self.setupUi() - self.setWindowFlags(self.windowFlags() | QtCore.Qt.WindowSystemMenuHint | - QtCore.Qt.WindowMinMaxButtonsHint) - if alg is not None: - self.alg = alg - self.textGroup.setText(alg.group) - self.textName.setText(alg.name) - self.repaintModel() - last = self.scene.getLastAlgorithmItem() - if last is not None: - self.view.ensureVisible(last) - else: - self.view.ensureVisible(0,0,10,10) - else: - self.alg = ModelerAlgorithm() - self.alg.setModelerView(self) - self.help = None - self.update = False #indicates whether to update or not the toolbox after closing this dialog + QDialog.__init__(self) - def setupUi(self): - self.resize(1000, 600) - self.setWindowTitle("SEXTANTE Modeler") - self.tabWidget = QtGui.QTabWidget() - self.tabWidget.setMaximumSize(QtCore.QSize(350, 10000)) - self.tabWidget.setMinimumWidth(300) - - #left hand side part - #================================== - self.inputsTree = QtGui.QTreeWidget() - self.inputsTree.setHeaderHidden(True) - self.fillInputsTree() - self.inputsTree.doubleClicked.connect(self.addInput) - self.tabWidget.addTab(self.inputsTree, "Inputs") + self.setupUi(self) - self.verticalLayout = QtGui.QVBoxLayout() - self.verticalLayout.setSpacing(2) - self.verticalLayout.setMargin(0) - self.searchBox = QtGui.QLineEdit() - self.searchBox.textChanged.connect(self.fillAlgorithmTree) - self.verticalLayout.addWidget(self.searchBox) - self.algorithmTree = QtGui.QTreeWidget() - self.algorithmTree.setHeaderHidden(True) - self.fillAlgorithmTree() - self.verticalLayout.addWidget(self.algorithmTree) - self.algorithmTree.doubleClicked.connect(self.addAlgorithm) + self.setWindowFlags(self.windowFlags() | Qt.WindowSystemMenuHint | + Qt.WindowMinMaxButtonsHint) - self.algorithmsTab = QtGui.QWidget() - self.algorithmsTab.setLayout(self.verticalLayout) - self.tabWidget.addTab(self.algorithmsTab, "Algorithms") + self.tabWidget.setCurrentIndex(0) - #right hand side part - #================================== - self.textName = QtGui.QLineEdit() + self.scene = ModelerScene(self) + self.scene.setSceneRect(QRectF(0, 0, 4000, 4000)) + self.view.setScene(self.scene) + self.view.ensureVisible(0, 0, 10, 10) + + # additional buttons + self.editHelpButton = QPushButton(self.tr("Edit model help")) + self.buttonBox.addButton(self.editHelpButton, QDialogButtonBox.ActionRole) + self.runButton = QPushButton(self.tr("Run")) + self.runButton.setToolTip(self.tr("Execute current model")) + self.buttonBox.addButton(self.runButton, QDialogButtonBox.ActionRole) + self.openButton = QPushButton(self.tr("Open")) + self.openButton.setToolTip(self.tr("Open existing model")) + self.buttonBox.addButton(self.openButton, QDialogButtonBox.ActionRole) + self.saveButton = QPushButton(self.tr("Save")) + self.saveButton.setToolTip(self.tr("Save current model")) + self.buttonBox.addButton(self.saveButton, QDialogButtonBox.ActionRole) + + # fill trees with inputs and algorithms + self.fillInputsTree() + self.fillAlgorithmTree() + + if hasattr(self.searchBox, 'setPlaceholderText'): + self.searchBox.setPlaceholderText(self.tr("Search...")) if hasattr(self.textName, 'setPlaceholderText'): self.textName.setPlaceholderText("[Enter model name here]") - self.textGroup = QtGui.QLineEdit() if hasattr(self.textGroup, 'setPlaceholderText'): self.textGroup.setPlaceholderText("[Enter group name here]") - self.horizontalLayoutNames = QtGui.QHBoxLayout() - self.horizontalLayoutNames.setSpacing(2) - self.horizontalLayoutNames.setMargin(0) - self.horizontalLayoutNames.addWidget(self.textName) - self.horizontalLayoutNames.addWidget(self.textGroup) - self.scene = ModelerScene(self) - self.scene.setSceneRect(QtCore.QRectF(0, 0, 4000, 4000)) - - self.canvasTabWidget = QtGui.QTabWidget() - self.canvasTabWidget.setMinimumWidth(300) - self.view = QtGui.QGraphicsView(self.scene) - - #======================================================================= - # self.canvasTabWidget.addTab(self.view, "Design") - # self.pythonText = QtGui.QTextEdit() - # self.createScriptButton = QtGui.QPushButton() - # self.createScriptButton.setText("Create script from model code") - # self.createScriptButton.clicked.connect(self.createScript) - # self.verticalLayoutPython = QtGui.QVBoxLayout() - # self.verticalLayoutPython.setSpacing(2) - # self.verticalLayoutPython.setMargin(0) - # self.verticalLayoutPython.addWidget(self.pythonText) - # self.verticalLayoutPython.addWidget(self.createScriptButton) - # self.pythonWidget = QtGui.QWidget() - # self.pythonWidget.setLayout(self.verticalLayoutPython) - # self.canvasTabWidget.addTab(self.pythonWidget, "Python code") - #======================================================================= - - self.canvasLayout = QtGui.QVBoxLayout() - self.canvasLayout.setSpacing(2) - self.canvasLayout.setMargin(0) - self.canvasLayout.addLayout(self.horizontalLayoutNames) - self.canvasLayout.addWidget(self.view)#canvasTabWidget) - - #upper part, putting the two previous parts together - #=================================================== - self.horizontalLayout = QtGui.QHBoxLayout() - self.horizontalLayout.setSpacing(2) - self.horizontalLayout.setMargin(0) - self.horizontalLayout.addWidget(self.tabWidget) - self.horizontalLayout.addLayout(self.canvasLayout) - - #And the whole layout - #========================== - - self.buttonBox = QtGui.QDialogButtonBox() - self.buttonBox.setOrientation(QtCore.Qt.Horizontal) - self.editHelpButton = QtGui.QPushButton() - self.editHelpButton.setText("Edit model help") - self.buttonBox.addButton(self.editHelpButton, QtGui.QDialogButtonBox.ActionRole) - self.runButton = QtGui.QPushButton() - self.runButton.setText("Run") - self.buttonBox.addButton(self.runButton, QtGui.QDialogButtonBox.ActionRole) - self.openButton = QtGui.QPushButton() - self.openButton.setText("Open") - self.buttonBox.addButton(self.openButton, QtGui.QDialogButtonBox.ActionRole) - self.saveButton = QtGui.QPushButton() - self.saveButton.setText("Save") - self.buttonBox.addButton(self.saveButton, QtGui.QDialogButtonBox.ActionRole) - self.closeButton = QtGui.QPushButton() - self.closeButton.setText("Close") - self.buttonBox.addButton(self.closeButton, QtGui.QDialogButtonBox.ActionRole) - QObject.connect(self.openButton, QtCore.SIGNAL("clicked()"), self.openModel) - QObject.connect(self.saveButton, QtCore.SIGNAL("clicked()"), self.saveModel) - QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), self.closeWindow) - QObject.connect(self.runButton, QtCore.SIGNAL("clicked()"), self.runModel) - QObject.connect(self.editHelpButton, QtCore.SIGNAL("clicked()"), self.editHelp) - - self.globalLayout = QtGui.QVBoxLayout() - self.globalLayout.setSpacing(2) - self.globalLayout.setMargin(0) - self.globalLayout.addLayout(self.horizontalLayout) - self.globalLayout.addWidget(self.buttonBox) - self.setLayout(self.globalLayout) - QtCore.QMetaObject.connectSlotsByName(self) + # connect signals and slots + self.inputsTree.doubleClicked.connect(self.addInput) - self.view.ensureVisible(0, 0, 10, 10) + self.searchBox.textChanged.connect(self.fillAlgorithmTree) + self.algorithmTree.doubleClicked.connect(self.addAlgorithm) - def closeWindow(self): - self.close() + self.openButton.clicked.connect(self.openModel) + self.saveButton.clicked.connect(self.saveModel) + self.runButton.clicked.connect(self.runModel) + self.editHelpButton.clicked.connect(self.editHelp) + + if alg is not None: + self.alg = alg + self.textGroup.setText(alg.group) + self.textName.setText(alg.name) + self.repaintModel() + else: + self.alg = ModelerAlgorithm() + + self.view.centerOn(0, 0) + self.alg.setModelerView(self) + self.help = None + self.update = False #indicates whether to update or not the toolbox after closing this dialog + + #~ def setupUi(self): + #~ self.resize(1000, 600) + #~ self.setWindowTitle("SEXTANTE Modeler") + #~ self.tabWidget = QtGui.QTabWidget() + #~ self.tabWidget.setMaximumSize(QtCore.QSize(350, 10000)) + #~ self.tabWidget.setMinimumWidth(300) +#~ + #~ #left hand side part + #~ #================================== + #~ self.inputsTree = QtGui.QTreeWidget() + #~ self.inputsTree.setHeaderHidden(True) + #~ self.fillInputsTree() + #~ self.inputsTree.doubleClicked.connect(self.addInput) + #~ self.tabWidget.addTab(self.inputsTree, "Inputs") +#~ + #~ self.verticalLayout = QtGui.QVBoxLayout() + #~ self.verticalLayout.setSpacing(2) + #~ self.verticalLayout.setMargin(0) + #~ self.searchBox = QtGui.QLineEdit() + #~ self.searchBox.textChanged.connect(self.fillAlgorithmTree) + #~ self.verticalLayout.addWidget(self.searchBox) + #~ self.algorithmTree = QtGui.QTreeWidget() + #~ self.algorithmTree.setHeaderHidden(True) + #~ self.fillAlgorithmTree() + #~ self.verticalLayout.addWidget(self.algorithmTree) + #~ self.algorithmTree.doubleClicked.connect(self.addAlgorithm) +#~ + #~ self.algorithmsTab = QtGui.QWidget() + #~ self.algorithmsTab.setLayout(self.verticalLayout) + #~ self.tabWidget.addTab(self.algorithmsTab, "Algorithms") +#~ + #~ #right hand side part + #~ #================================== + #~ self.textName = QtGui.QLineEdit() + #~ if hasattr(self.textName, 'setPlaceholderText'): + #~ self.textName.setPlaceholderText("[Enter model name here]") + #~ self.textGroup = QtGui.QLineEdit() + #~ if hasattr(self.textGroup, 'setPlaceholderText'): + #~ self.textGroup.setPlaceholderText("[Enter group name here]") + #~ self.horizontalLayoutNames = QtGui.QHBoxLayout() + #~ self.horizontalLayoutNames.setSpacing(2) + #~ self.horizontalLayoutNames.setMargin(0) + #~ self.horizontalLayoutNames.addWidget(self.textName) + #~ self.horizontalLayoutNames.addWidget(self.textGroup) +#~ + #~ self.scene = ModelerScene(self) + #~ self.scene.setSceneRect(QtCore.QRectF(0, 0, 4000, 4000)) +#~ + #~ self.canvasTabWidget = QtGui.QTabWidget() + #~ self.canvasTabWidget.setMinimumWidth(300) + #~ self.view = QtGui.QGraphicsView(self.scene) +#~ + #~ #======================================================================= + #~ # self.canvasTabWidget.addTab(self.view, "Design") + #~ # self.pythonText = QtGui.QTextEdit() + #~ # self.createScriptButton = QtGui.QPushButton() + #~ # self.createScriptButton.setText("Create script from model code") + #~ # self.createScriptButton.clicked.connect(self.createScript) + #~ # self.verticalLayoutPython = QtGui.QVBoxLayout() + #~ # self.verticalLayoutPython.setSpacing(2) + #~ # self.verticalLayoutPython.setMargin(0) + #~ # self.verticalLayoutPython.addWidget(self.pythonText) + #~ # self.verticalLayoutPython.addWidget(self.createScriptButton) + #~ # self.pythonWidget = QtGui.QWidget() + #~ # self.pythonWidget.setLayout(self.verticalLayoutPython) + #~ # self.canvasTabWidget.addTab(self.pythonWidget, "Python code") + #~ #======================================================================= +#~ + #~ self.canvasLayout = QtGui.QVBoxLayout() + #~ self.canvasLayout.setSpacing(2) + #~ self.canvasLayout.setMargin(0) + #~ self.canvasLayout.addLayout(self.horizontalLayoutNames) + #~ self.canvasLayout.addWidget(self.view)#canvasTabWidget) +#~ + #~ #upper part, putting the two previous parts together + #~ #=================================================== + #~ self.horizontalLayout = QtGui.QHBoxLayout() + #~ self.horizontalLayout.setSpacing(2) + #~ self.horizontalLayout.setMargin(0) + #~ self.horizontalLayout.addWidget(self.tabWidget) + #~ self.horizontalLayout.addLayout(self.canvasLayout) +#~ + #~ #And the whole layout + #~ #========================== +#~ + #~ self.buttonBox = QtGui.QDialogButtonBox() + #~ self.buttonBox.setOrientation(QtCore.Qt.Horizontal) + #~ self.editHelpButton = QtGui.QPushButton() + #~ self.editHelpButton.setText("Edit model help") + #~ self.buttonBox.addButton(self.editHelpButton, QtGui.QDialogButtonBox.ActionRole) + #~ self.runButton = QtGui.QPushButton() + #~ self.runButton.setText("Run") + #~ self.buttonBox.addButton(self.runButton, QtGui.QDialogButtonBox.ActionRole) + #~ self.openButton = QtGui.QPushButton() + #~ self.openButton.setText("Open") + #~ self.buttonBox.addButton(self.openButton, QtGui.QDialogButtonBox.ActionRole) + #~ self.saveButton = QtGui.QPushButton() + #~ self.saveButton.setText("Save") + #~ self.buttonBox.addButton(self.saveButton, QtGui.QDialogButtonBox.ActionRole) + #~ self.closeButton = QtGui.QPushButton() + #~ self.closeButton.setText("Close") + #~ self.buttonBox.addButton(self.closeButton, QtGui.QDialogButtonBox.ActionRole) + #~ QObject.connect(self.openButton, QtCore.SIGNAL("clicked()"), self.openModel) + #~ QObject.connect(self.saveButton, QtCore.SIGNAL("clicked()"), self.saveModel) + #~ QObject.connect(self.closeButton, QtCore.SIGNAL("clicked()"), self.closeWindow) + #~ QObject.connect(self.runButton, QtCore.SIGNAL("clicked()"), self.runModel) + #~ QObject.connect(self.editHelpButton, QtCore.SIGNAL("clicked()"), self.editHelp) +#~ + #~ self.globalLayout = QtGui.QVBoxLayout() + #~ self.globalLayout.setSpacing(2) + #~ self.globalLayout.setMargin(0) + #~ self.globalLayout.addLayout(self.horizontalLayout) + #~ self.globalLayout.addWidget(self.buttonBox) + #~ self.setLayout(self.globalLayout) + #~ QtCore.QMetaObject.connectSlotsByName(self) +#~ + #~ self.view.ensureVisible(0, 0, 10, 10) def editHelp(self): dlg = HelpEditionDialog(self.alg) @@ -227,7 +274,10 @@ def runModel(self): def saveModel(self): if unicode(self.textGroup.text()).strip() == "" or unicode(self.textName.text()).strip() == "": - QMessageBox.warning(self, "Warning", "Please enter group and model names before saving") + QMessageBox.warning(self, + self.tr("Warning"), + self.tr("Please enter group and model names before saving") + ) return self.alg.setPositions(self.scene.getParameterPositions(), self.scene.getAlgorithmPositions()) self.alg.name = unicode(self.textName.text()) @@ -235,7 +285,7 @@ def saveModel(self): if self.alg.descriptionFile != None: filename = self.alg.descriptionFile else: - filename = str(QtGui.QFileDialog.getSaveFileName(self, "Save Model", ModelerUtils.modelsFolder(), "SEXTANTE models (*.model)")) + filename = unicode(QFileDialog.getSaveFileName(self, self.tr("Save Model"), ModelerUtils.modelsFolder(), self.tr("SEXTANTE models (*.model)"))) if filename: if not filename.endswith(".model"): filename += ".model" @@ -253,10 +303,13 @@ def saveModel(self): pickle.dump(self.help, f) f.close() self.help = None - QtGui.QMessageBox.information(self, "Model saving", "Model was correctly saved.") + QMessageBox.information(self, + self.tr("Model saved"), + self.tr("Model was correctly saved.") + ) def openModel(self): - filename = unicode(QtGui.QFileDialog.getOpenFileName(self, "Open Model", ModelerUtils.modelsFolder(), "SEXTANTE models (*.model)")) + filename = unicode(QFileDialog.getOpenFileName(self, self.tr("Open Model"), ModelerUtils.modelsFolder(), self.tr("SEXTANTE models (*.model)"))) if filename: try: alg = ModelerAlgorithm() @@ -267,18 +320,20 @@ def openModel(self): self.textName.setText(alg.name) self.repaintModel() self.view.ensureVisible(self.scene.getLastAlgorithmItem()) + self.view.centerOn(0,0) except WrongModelException, e: - QMessageBox.critical(self, "Could not open model", "The selected model could not be loaded\nWrong line:" + e.msg) - + QMessageBox.critical(self, + self.tr("Could not open model"), + self.tr("The selected model could not be loaded.\nWrong line: %1").arg(e.msg) + ) def repaintModel(self): self.scene = ModelerScene() - self.scene.setSceneRect(QtCore.QRectF(0, 0, ModelerAlgorithm.CANVAS_SIZE, ModelerAlgorithm.CANVAS_SIZE)) + self.scene.setSceneRect(QRectF(0, 0, ModelerAlgorithm.CANVAS_SIZE, ModelerAlgorithm.CANVAS_SIZE)) self.scene.paintModel(self.alg) self.view.setScene(self.scene) #self.pythonText.setText(self.alg.getAsPythonCode()) - def addInput(self): item = self.inputsTree.currentItem() paramType = str(item.text(0)) @@ -291,18 +346,16 @@ def addInput(self): self.repaintModel() self.view.ensureVisible(self.scene.getLastParameterItem()) - def fillInputsTree(self): - parametersItem = QtGui.QTreeWidgetItem() - parametersItem.setText(0, "Parameters") + parametersItem = QTreeWidgetItem() + parametersItem.setText(0, self.tr("Parameters")) for paramType in ModelerParameterDefinitionDialog.paramTypes: - paramItem = QtGui.QTreeWidgetItem() + paramItem = QTreeWidgetItem() paramItem.setText(0, paramType) parametersItem.addChild(paramItem) self.inputsTree.addTopLevelItem(parametersItem) parametersItem.setExpanded(True) - def addAlgorithm(self): item = self.algorithmTree.currentItem() if isinstance(item, TreeAlgorithmItem): @@ -319,6 +372,106 @@ def addAlgorithm(self): self.view.ensureVisible(self.scene.getLastAlgorithmItem()) def fillAlgorithmTree(self): + useCategories = SextanteConfig.getSetting(SextanteConfig.USE_CATEGORIES) + if useCategories: + self.fillAlgorithmTreeUsingCategories() + else: + self.fillAlgorithmTreeUsingProviders() + + self.algorithmTree.sortItems(0, Qt.AscendingOrder) + + def fillAlgorithmTreeUsingCategories(self): + providersToExclude = ["model", "script"] + self.algorithmTree.clear() + text = unicode(self.searchBox.text()) + groups = {} + allAlgs = ModelerUtils.getAlgorithms() + for providerName in allAlgs.keys(): + provider = allAlgs[providerName] + name = "ACTIVATE_" + providerName.upper().replace(" ", "_") + if not SextanteConfig.getSetting(name): + continue + if providerName in providersToExclude or len(Providers.providers[providerName].actions) != 0: + continue + algs = provider.values() + #add algorithms + for alg in algs: + if not alg.showInModeler: + continue + altgroup, altsubgroup, altname = AlgorithmDecorator.getGroupsAndName(alg) + if text =="" or text.lower() in altname.lower(): + if altgroup not in groups: + groups[altgroup] = {} + group = groups[altgroup] + if altsubgroup not in group: + groups[altgroup][altsubgroup] = [] + subgroup = groups[altgroup][altsubgroup] + subgroup.append(alg) + + if len(groups) > 0: + mainItem = QTreeWidgetItem() + mainItem.setText(0, "Geoalgorithms") + mainItem.setIcon(0, GeoAlgorithm.getDefaultIcon()) + mainItem.setToolTip(0, mainItem.text(0)) + for groupname, group in groups.items(): + groupItem = QTreeWidgetItem() + groupItem.setText(0, groupname) + groupItem.setIcon(0, GeoAlgorithm.getDefaultIcon()) + groupItem.setToolTip(0, groupItem.text(0)) + mainItem.addChild(groupItem) + for subgroupname, subgroup in group.items(): + subgroupItem = QTreeWidgetItem() + subgroupItem.setText(0, subgroupname) + subgroupItem.setIcon(0, GeoAlgorithm.getDefaultIcon()) + subgroupItem.setToolTip(0, subgroupItem.text(0)) + groupItem.addChild(subgroupItem) + for alg in subgroup: + algItem = TreeAlgorithmItem(alg) + subgroupItem.addChild(algItem) + subgroupItem.setExpanded(text!="") + groupItem.setExpanded(text!="") + self.algorithmTree.addTopLevelItem(mainItem) + mainItem.setExpanded(text!="") + + for providerName in allAlgs.keys(): + groups = {} + provider = allAlgs[providerName] + name = "ACTIVATE_" + providerName.upper().replace(" ", "_") + if not SextanteConfig.getSetting(name): + continue + if providerName not in providersToExclude: + continue + algs = provider.values() + #add algorithms + for alg in algs: + if not alg.showInModeler: + continue + if text =="" or text.lower() in alg.name.lower(): + if alg.group in groups: + groupItem = groups[alg.group] + else: + groupItem = QTreeWidgetItem() + groupItem.setText(0, alg.group) + groupItem.setToolTip(0, alg.group) + groups[alg.group] = groupItem + algItem = TreeAlgorithmItem(alg) + groupItem.addChild(algItem) + + if len(groups) > 0: + providerItem = QTreeWidgetItem() + providerItem.setText(0, Providers.providers[providerName].getDescription()) + providerItem.setIcon(0, Providers.providers[providerName].getIcon()) + providerItem.setToolTip(0, providerItem.text(0)) + for groupItem in groups.values(): + providerItem.addChild(groupItem) + self.algorithmTree.addTopLevelItem(providerItem) + providerItem.setExpanded(text!="") + for groupItem in groups.values(): + if text != "": + groupItem.setExpanded(True) + + + def fillAlgorithmTreeUsingProviders(self): self.algorithmTree.clear() text = str(self.searchBox.text()) allAlgs = ModelerUtils.getAlgorithms() @@ -334,33 +487,33 @@ def fillAlgorithmTree(self): if alg.group in groups: groupItem = groups[alg.group] else: - groupItem = QtGui.QTreeWidgetItem() + groupItem = QTreeWidgetItem() groupItem.setText(0, alg.group) + groupItem.setToolTip(0, alg.group) groups[alg.group] = groupItem algItem = TreeAlgorithmItem(alg) groupItem.addChild(algItem) if len(groups) > 0: - providerItem = QtGui.QTreeWidgetItem() + providerItem = QTreeWidgetItem() providerItem.setText(0, Providers.providers[providerName].getDescription()) + providerItem.setToolTip(0, Providers.providers[providerName].getDescription()) providerItem.setIcon(0, Providers.providers[providerName].getIcon()) for groupItem in groups.values(): providerItem.addChild(groupItem) self.algorithmTree.addTopLevelItem(providerItem) - providerItem.setExpanded(True) + providerItem.setExpanded(text!="") for groupItem in groups.values(): if text != "": groupItem.setExpanded(True) self.algorithmTree.sortItems(0, Qt.AscendingOrder) - -class TreeAlgorithmItem(QtGui.QTreeWidgetItem): +class TreeAlgorithmItem(QTreeWidgetItem): def __init__(self, alg): QTreeWidgetItem.__init__(self) self.alg = alg self.setText(0, alg.name) + self.setToolTip(0, alg.name) self.setIcon(0, alg.getIcon()) - - diff --git a/python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py b/python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py index 344670eaefbe..5af40cb6d928 100644 --- a/python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py +++ b/python/plugins/sextante/modeler/ModelerParameterDefinitionDialog.py @@ -16,6 +16,7 @@ * * *************************************************************************** """ +from sextante.parameters.Parameter import Parameter __author__ = 'Victor Olaya' __date__ = 'August 2012' @@ -85,6 +86,9 @@ def setupUi(self): self.horizontalLayout3.setSpacing(2) self.horizontalLayout3.setMargin(0) + if isinstance(self.param, Parameter): + self.nameTextBox.setText(self.param.description) + if self.paramType == ModelerParameterDefinitionDialog.PARAMETER_BOOLEAN or \ isinstance(self.param, ParameterBoolean): self.horizontalLayout2.addWidget(QtGui.QLabel("Default value")) diff --git a/python/plugins/sextante/modeler/ModelerParametersDialog.py b/python/plugins/sextante/modeler/ModelerParametersDialog.py index 468f49547ff9..f47e19334e53 100644 --- a/python/plugins/sextante/modeler/ModelerParametersDialog.py +++ b/python/plugins/sextante/modeler/ModelerParametersDialog.py @@ -16,6 +16,8 @@ * * *************************************************************************** """ +from sextante.parameters.ParameterCrs import ParameterCrs +from sextante.outputs.OutputString import OutputString __author__ = 'Victor Olaya' __date__ = 'August 2012' @@ -137,10 +139,10 @@ def setupUi(self): self.verticalLayout2.setSpacing(2) self.verticalLayout2.setMargin(0) self.tabWidget = QtGui.QTabWidget() - self.tabWidget.setMinimumWidth(300) + self.tabWidget.setMinimumWidth(300) self.paramPanel = QtGui.QWidget() self.paramPanel.setLayout(self.verticalLayout) - self.scrollArea = QtGui.QScrollArea() + self.scrollArea = QtGui.QScrollArea() self.scrollArea.setWidget(self.paramPanel) self.scrollArea.setWidgetResizable(True) self.tabWidget.addTab(self.scrollArea, "Parameters") @@ -180,7 +182,7 @@ def showAdvancedParametersClicked(self): if param.isAdvanced: self.labels[param.name].setVisible(self.showAdvanced) self.widgets[param.name].setVisible(self.showAdvanced) - + def getRasterLayers(self): layers = [] params = self.model.parameters @@ -316,6 +318,20 @@ def getStrings(self): for param in params: if isinstance(param, ParameterString): strings.append(AlgorithmAndParameter(AlgorithmAndParameter.PARENT_MODEL_ALGORITHM, param.name, "", param.description)) + + if self.algIndex is None: + dependent = [] + else: + dependent = self.model.getDependentAlgorithms(self.algIndex) + dependent.append(self.algIndex) + + i=0 + for alg in self.model.algs: + if i not in dependent: + for out in alg.outputs: + if isinstance(out, OutputString): + strings.append(AlgorithmAndParameter(i, out.name, alg.name, out.description)) + i+=1 return strings def getTableFields(self): @@ -329,7 +345,7 @@ def getTableFields(self): def getWidgetFromParameter(self, param): if isinstance(param, ParameterRaster): item = QtGui.QComboBox() - item.setEditable(True) + #item.setEditable(True) layers = self.getRasterLayers() if (param.optional): item.addItem(self.NOT_SELECTED, None) @@ -337,7 +353,7 @@ def getWidgetFromParameter(self, param): item.addItem(layer.name(), layer) elif isinstance(param, ParameterVector): item = QtGui.QComboBox() - item.setEditable(True) + #item.setEditable(True) layers = self.getVectorLayers() if (param.optional): item.addItem(self.NOT_SELECTED, None) @@ -486,12 +502,27 @@ def setPreviousValues(self): if isinstance(param, (ParameterRaster, ParameterVector, ParameterTable, ParameterTableField, ParameterSelection, ParameterNumber, - ParameterString,ParameterBoolean)): + ParameterString,ParameterBoolean, ParameterExtent)): self.setComboBoxValue(widget, value, param) + elif isinstance(param, ParameterCrs): + value = self.model.getValueFromAlgorithmAndParameter(value) + widget.setText(unicode(value)) elif isinstance(param, ParameterFixedTable): pass elif isinstance(param, ParameterMultipleInput): - pass + value = self.model.getValueFromAlgorithmAndParameter(value) + values = value.split(";") + selectedoptions = [] + if param.datatype == ParameterMultipleInput.TYPE_VECTOR_ANY: + options = self.getVectorLayers() + else: + options = self.getRasterLayers() + for i in range(len(options)): + option = options[i] + for aap in (values): + if str(option) == aap: + selectedoptions.append(i) + widget.setSelectedItems(selectedoptions) else: pass @@ -541,8 +572,6 @@ def setParamValueLayerOrTable(self, param, widget): self.params[param.name] = value return True - - if widget.currentIndex() < 0: return False value = widget.itemData(widget.currentIndex()).toPyObject() @@ -578,6 +607,8 @@ def setParamTableFieldValue(self, param, widget): return True def setParamStringValue(self, param, widget): + if widget.currentText() == "": + return False idx = widget.findText(widget.currentText()) if idx < 0: name = self.getSafeNameForHarcodedParameter(param) diff --git a/python/plugins/sextante/modeler/ModelerScene.py b/python/plugins/sextante/modeler/ModelerScene.py index d83b22a8b6cb..7c6177bfe89c 100644 --- a/python/plugins/sextante/modeler/ModelerScene.py +++ b/python/plugins/sextante/modeler/ModelerScene.py @@ -37,6 +37,7 @@ def __init__(self, parent=None): super(ModelerScene, self).__init__(parent) self.paramItems = [] self.algItems = [] + self.setItemIndexMethod(QtGui.QGraphicsScene.NoIndex); def getParameterPositions(self): pos = [] @@ -118,7 +119,6 @@ def paintModel(self, model): self.addItem(arrow) iAlg+=1 - def mousePressEvent(self, mouseEvent): if (mouseEvent.button() != QtCore.Qt.LeftButton): return diff --git a/python/plugins/sextante/modeler/ModelerUtils.py b/python/plugins/sextante/modeler/ModelerUtils.py index ababbc5e8034..3902b812d07d 100644 --- a/python/plugins/sextante/modeler/ModelerUtils.py +++ b/python/plugins/sextante/modeler/ModelerUtils.py @@ -24,8 +24,7 @@ __revision__ = '$Format:%H$' import os -from sextante.core.SextanteUtils import SextanteUtils -from sextante.core.SextanteUtils import mkdir +from sextante.core.SextanteUtils import mkdir, SextanteUtils from sextante.core.SextanteConfig import SextanteConfig class ModelerUtils: @@ -37,7 +36,6 @@ class ModelerUtils: def modelsFolder(): folder = SextanteConfig.getSetting(ModelerUtils.MODELS_FOLDER) if folder == None: - #folder = os.path.join(os.path.dirname(__file__), "models") folder = SextanteUtils.userFolder() + os.sep + "models" mkdir(folder) @@ -50,12 +48,6 @@ def getAlgorithm(name): return provider[name] return None - @staticmethod def getAlgorithms(): return ModelerUtils.allAlgs - - - - - diff --git a/python/plugins/sextante/modeler/models/watersheds.model b/python/plugins/sextante/modeler/models/watersheds.model new file mode 100644 index 000000000000..0390107047b7 --- /dev/null +++ b/python/plugins/sextante/modeler/models/watersheds.model @@ -0,0 +1,75 @@ +NAME:Watersheds from DEM +GROUP:[Sample models] +PARAMETER:ParameterRaster|RASTERLAYER_DEM|DEM|False +458.0,50.0 +PARAMETER:ParameterNumber|NUMBER_INITIATIONTHRESHOLD|Initiation Threshold|None|None|10000000.0 +257.0,403.0 +VALUE:HARDCODEDPARAMVALUE_INIT_VALUE_1===10000000 +VALUE:HARDCODEDPARAMVALUE_SPLIT_3===0 +VALUE:HARDCODEDPARAMVALUE_Method_0===0 +VALUE:HARDCODEDPARAMVALUE_INIT_METHOD_1===2 +VALUE:HARDCODEDPARAMVALUE_CALC_METHOD_4===0 +VALUE:HARDCODEDPARAMVALUE_CLASS_ID_3===0 +VALUE:HARDCODEDPARAMVALUE_STEP_0===1 +VALUE:HARDCODEDPARAMVALUE_MINLEN_1===10 +VALUE:HARDCODEDPARAMVALUE_DOLINEAR _0===True +VALUE:HARDCODEDPARAMVALUE_MINSIZE_2===0 +VALUE:HARDCODEDPARAMVALUE_CLASS_ALL_3===1 +VALUE:HARDCODEDPARAMVALUE_LINEARTHRS_0===500.0 +VALUE:HARDCODEDPARAMVALUE_CONVERGENCE_0===1.0 +VALUE:HARDCODEDPARAMVALUE_DIV_CELLS_1===10 +ALGORITHM:saga:catchmentarea(parallel) +260.0,172.0 +-1|RASTERLAYER_DEM +None +None +None +None +-1|HARDCODEDPARAMVALUE_STEP_0 +-1|HARDCODEDPARAMVALUE_Method_0 +-1|HARDCODEDPARAMVALUE_DOLINEAR _0 +-1|HARDCODEDPARAMVALUE_LINEARTHRS_0 +None +None +-1|HARDCODEDPARAMVALUE_CONVERGENCE_0 +None +None +None +None +None +None +None +None +ALGORITHM:saga:channelnetwork +447.0,291.0 +-1|RASTERLAYER_DEM +None +0|CAREA +-1|HARDCODEDPARAMVALUE_INIT_METHOD_1 +-1|NUMBER_INITIATIONTHRESHOLD +None +-1|HARDCODEDPARAMVALUE_DIV_CELLS_1 +None +-1|HARDCODEDPARAMVALUE_MINLEN_1 +None +None +None +ALGORITHM:saga:watershedbasins +730.0,182.0 +-1|RASTERLAYER_DEM +1|CHNLNTWRK +None +-1|HARDCODEDPARAMVALUE_MINSIZE_2 +None +ALGORITHM:saga:vectorisinggridclasses +864.0,330.0 +2|BASINS +-1|HARDCODEDPARAMVALUE_CLASS_ALL_3 +-1|HARDCODEDPARAMVALUE_CLASS_ID_3 +-1|HARDCODEDPARAMVALUE_SPLIT_3 +None +ALGORITHM:ftools:export/addgeometrycolumns +655.0,442.0 +3|POLYGONS +-1|HARDCODEDPARAMVALUE_CALC_METHOD_4 +Watersheds diff --git a/python/plugins/sextante/otb/CMakeLists.txt b/python/plugins/sextante/otb/CMakeLists.txt index 9077667ebbb1..00ad4089fb6c 100644 --- a/python/plugins/sextante/otb/CMakeLists.txt +++ b/python/plugins/sextante/otb/CMakeLists.txt @@ -2,6 +2,6 @@ FILE(GLOB PY_FILES *.py) FILE(GLOB DESCR_FILES description/*.txt) FILE(GLOB HELPER_FILES helper/*.py) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/otb) -INSTALL(FILES ${DESCR_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/otb/description) -INSTALL(FILES ${HELPER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/otb/helper) +PLUGIN_INSTALL(sextante ./otb ${PY_FILES}) +PLUGIN_INSTALL(sextante ./otb/description ${DESCR_FILES}) +PLUGIN_INSTALL(sextante ./otb/helper ${HELPER_FILES}) diff --git a/python/plugins/sextante/otb/OTBAlgorithm.py b/python/plugins/sextante/otb/OTBAlgorithm.py index d1c3c023c6c6..e4fe64484cd6 100644 --- a/python/plugins/sextante/otb/OTBAlgorithm.py +++ b/python/plugins/sextante/otb/OTBAlgorithm.py @@ -192,5 +192,5 @@ def processAlgorithm(self, progress): progress.setCommand(line) SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines) - + OTBUtils.executeOtb(commands, progress) diff --git a/python/plugins/sextante/otb/OTBUtils.py b/python/plugins/sextante/otb/OTBUtils.py index 6b9c8416940f..ed0ea4aa9fe2 100644 --- a/python/plugins/sextante/otb/OTBUtils.py +++ b/python/plugins/sextante/otb/OTBUtils.py @@ -41,7 +41,7 @@ def otbPath(): folder = SextanteConfig.getSetting(OTBUtils.OTB_FOLDER) if folder == None: folder = "" - + if os.path.exists("/usr/bin/otbcli"): folder = "/usr/bin" return folder @@ -51,7 +51,7 @@ def otbLibPath(): folder = SextanteConfig.getSetting(OTBUtils.OTB_LIB_FOLDER) if folder == None: folder ="" - + linuxstandardpath = "/usr/lib/otb/applications" if os.path.exists(linuxstandardpath): folder = linuxstandardpath diff --git a/python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation.txt b/python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation.txt new file mode 100644 index 000000000000..fc6d1696a095 --- /dev/null +++ b/python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation.txt @@ -0,0 +1,11 @@ +EdisonMeanShiftSegmentation +otbcli_Segmentation +Edison Mean Shift segmentation (labeled raster output) +Segmentation +ParameterRaster|-filter edison -in|Input Image|False +ParameterNumber|-filter.edison.spatialr|Spatial radius|None|None|5 +ParameterNumber|-filter.edison.ranger|Range radius|None|None|15.0 +ParameterNumber|-filter.edison.minsize|Min region size|0|None|100 +ParameterNumber|-filter.edison.scale|Scale Factor|0|None|1.0 +OutputRaster|-mode raster -mode.raster.out|Output labeled image + diff --git a/python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation_vector.txt b/python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation_vector.txt new file mode 100644 index 000000000000..fb3b67e19cd1 --- /dev/null +++ b/python/plugins/sextante/otb/description/EdisonMeanShiftSegmentation_vector.txt @@ -0,0 +1,21 @@ +EdisonMeanShiftSegmentationVector +otbcli_Segmentation +Edison Mean Shift segmentation (large-scale, vector output) +Segmentation +ParameterRaster|-filter edison -in|Input Image|False +ParameterNumber|-filter.edison.spatialr|Spatial radius|None|None|5 +ParameterNumber|-filter.edison.ranger|Range radius|None|None|15.0 +ParameterNumber|-filter.edison.minsize|Min region size|0|None|100 +ParameterNumber|-filter.edison.scale|Scale Factor|0|None|1.0 +OutputVector|-mode vector -mode.vector.out|Output vector file +ParameterVector|-mode.vector.inmask|Mask Image|-1|True +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 +ParameterString|-mode.vector.layername|Layer name |layer +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| diff --git a/python/plugins/sextante/otb/description/MeanShiftSegmentation.txt b/python/plugins/sextante/otb/description/MeanShiftSegmentation.txt index 333299ebaef2..a8ad1cdcc95d 100644 --- a/python/plugins/sextante/otb/description/MeanShiftSegmentation.txt +++ b/python/plugins/sextante/otb/description/MeanShiftSegmentation.txt @@ -1,13 +1,12 @@ MeanShiftSegmentation -otbcli_MeanShiftSegmentation -Mean Shift segmentation +otbcli_Segmentation +Mean Shift segmentation (labeled raster output) Segmentation -ParameterRaster|-in|Input Image|False -OutputRaster|-fout|Filtered output -OutputRaster|-cout|Clustered output -OutputRaster|-lout|Label output -OutputRaster|-cbout|Cluster Boundaries output -ParameterNumber|-spatialr|Spatial radius|None|None|5 -ParameterNumber|-ranger|Range radius|None|None|15.0 -ParameterNumber|-minsize|Min region size|None|None|100 -ParameterNumber|-scale|Scale|None|None|100000.0 +ParameterRaster|-filter meanshift -in|Input Image|False +ParameterNumber|-filter.meanshift.spatialr|Spatial radius|None|None|5 +ParameterNumber|-filter.meanshift.thres|Mode convergence threshold|None|None|0.1 +ParameterNumber|-filter.meanshift.ranger|Range radius|None|None|15.0 +ParameterNumber|-filter.meanshift.minsize|Min region size|0|None|100 +ParameterNumber|-filter.meanshift.maxiter|Maximum number of iterations|0|None|100 +OutputRaster|-mode raster -mode.raster.out|Output labeled image + diff --git a/python/plugins/sextante/otb/description/MeanShiftSegmentation_vector.txt b/python/plugins/sextante/otb/description/MeanShiftSegmentation_vector.txt new file mode 100644 index 000000000000..575c74741518 --- /dev/null +++ b/python/plugins/sextante/otb/description/MeanShiftSegmentation_vector.txt @@ -0,0 +1,22 @@ +MeanShiftSegmentationVector +otbcli_Segmentation +Mean Shift segmentation (large-scale, vector output) +Segmentation +ParameterRaster|-filter meanshift -in|Input Image|False +ParameterNumber|-filter.meanshift.spatialr|Spatial radius|None|None|5 +ParameterNumber|-filter.meanshift.thres|Mode convergence threshold|None|None|0.1 +ParameterNumber|-filter.meanshift.ranger|Range radius|None|None|15.0 +ParameterNumber|-filter.meanshift.minsize|Min region size|0|None|100 +ParameterNumber|-filter.meanshift.maxiter|Maximum number of iterations|0|None|100 +OutputVector|-mode vector -mode.vector.out|Output vector file +ParameterVector|-mode.vector.inmask|Mask Image|-1|True +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 +ParameterString|-mode.vector.layername|Layer name |layer +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| diff --git a/python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation.txt b/python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation.txt new file mode 100644 index 000000000000..63f40c8137ce --- /dev/null +++ b/python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation.txt @@ -0,0 +1,8 @@ +SimpleConnectedComponentsSegmentation +otbcli_Segmentation +Simple Connected Components segmentation (labeled raster output) +Segmentation +ParameterRaster|-filter cc -in|Input Image|False +ParameterString|-filter.cc.expr|Condition| +OutputRaster|-mode raster -mode.raster.out|Output labeled image + diff --git a/python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation_vector.txt b/python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation_vector.txt new file mode 100644 index 000000000000..658d2efba648 --- /dev/null +++ b/python/plugins/sextante/otb/description/SimpleConnectedComponentsSegmentation_vector.txt @@ -0,0 +1,18 @@ +SimpleConnectedComponentsSegmentationVector +otbcli_Segmentation +Simple Connected Components segmentation (large-scale, vector output) +Segmentation +ParameterRaster|-filter cc -in|Input Image|False +ParameterString|-filter.cc.expr|Condition| +OutputVector|-mode vector -mode.vector.out|Output vector file +ParameterVector|-mode.vector.inmask|Mask Image|-1|True +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 +ParameterString|-mode.vector.layername|Layer name |layer +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| diff --git a/python/plugins/sextante/otb/description/WatershedSegmentation.txt b/python/plugins/sextante/otb/description/WatershedSegmentation.txt new file mode 100644 index 000000000000..2f3279fbfa40 --- /dev/null +++ b/python/plugins/sextante/otb/description/WatershedSegmentation.txt @@ -0,0 +1,9 @@ +WatershedSegmentation +otbcli_Segmentation +Watershed segmentation (labeled raster output) +Segmentation +ParameterRaster|-filter watershed -in|Input Image|False +ParameterNumber|-filter.watershed.threshold|Depth Threshold|0|None|0.01 +ParameterNumber|-filter.watershed.level|Flood level|0|None|0.1 +OutputRaster|-mode raster -mode.raster.out|Output labeled image + diff --git a/python/plugins/sextante/otb/description/WatershedSegmentation_vector.txt b/python/plugins/sextante/otb/description/WatershedSegmentation_vector.txt new file mode 100644 index 000000000000..7445e63839a8 --- /dev/null +++ b/python/plugins/sextante/otb/description/WatershedSegmentation_vector.txt @@ -0,0 +1,19 @@ +WatershedSegmentationVector +otbcli_Segmentation +Watershed segmentation (large-scale, vector output) +Segmentation +ParameterRaster|-filter watershed -in|Input Image|False +ParameterNumber|-filter.watershed.threshold|Depth Threshold|0|None|0.01 +ParameterNumber|-filter.watershed.level|Flood level|0|None|0.1 +OutputVector|-mode vector -mode.vector.out|Output vector file +ParameterVector|-mode.vector.inmask|Mask Image|-1|True +ParameterBoolean|-mode.vector.neighbor|8-neighbor connectivity|False +ParameterBoolean|-mode.vector.stitch|Stitch polygons|True +ParameterNumber|-mode.vector.minsize|Minimum object size|1|None|1 +ParameterNumber|-mode.vector.simplify|Simplify polygons|None|None|0.0 +ParameterString|-mode.vector.layername|Layer name |layer +ParemeterString|-mode.vector.fieldname|Geometry index field name|DN +ParameterNumber|-mode.vector.tilesize|Tile size|0|None|1024 +ParameterNumber|-mode.vector.startlabel|Starting geometry index|1|None|1 +ParameterSelection|-mode.vector.outmode|Writing mode (update file/overwrite file/overwrite layer/update layer)|ulco;ovw;ulovw;ulu|0 +ParameterString|-mode.vector.ogroptions|OGR options for layer creation| diff --git a/python/plugins/sextante/otb/helper/generate_application_descriptors.py b/python/plugins/sextante/otb/helper/generate_application_descriptors.py index 6abda8e43776..24ede233e88a 100644 --- a/python/plugins/sextante/otb/helper/generate_application_descriptors.py +++ b/python/plugins/sextante/otb/helper/generate_application_descriptors.py @@ -39,8 +39,8 @@ def get_app_list(): blackList = ["TestApplication"] appNames = [app for app in otbApplication.Registry.GetAvailableApplications() if app not in blackList] return appNames - - + + def generate_all_app_descriptors( ) : appliIdx = 0 for appliname in get_app_list(): @@ -50,12 +50,12 @@ def generate_all_app_descriptors( ) : def generate_app_descriptor( appliname ) : print appliname - + appInstance = otbApplication.Registry.CreateApplication(appliname) appInstance.UpdateParameters() # TODO need this ? - + out = "" - + # the application key out += appliname + endl @@ -64,15 +64,15 @@ def generate_app_descriptor( appliname ) : # long name out += convertendl(appInstance.GetDocName()) + endl - + # group out += get_group(appInstance) + endl for paramKey in appInstance.GetParametersKeys(): - pdesc = generate_param_descriptor(appInstance, paramKey) + pdesc = generate_param_descriptor(appInstance, paramKey) if len(pdesc) > 0: out += pdesc + endl - + with open( os.path.join(outputpath, appliname + '.txt'), 'w' ) as outfile: outfile.write(out) @@ -80,11 +80,11 @@ def generate_app_doc( appliname ) : appInstance = otbApplication.Registry.CreateApplication(appliname) appInstance.UpdateParameters() # TODO need this ? html = appInstance.GetHtmlExample() - + docpath= os.path.join(outputpath, 'doc') if not os.path.exists(docpath): os.makedirs(docpath) - + with open( os.path.join(docpath, appliname + '.html'), 'w' ) as outfile: outfile.write(html) @@ -134,22 +134,22 @@ def generate_parameter_Empty( appInstance, paramKey ): out += "True" return out - + def generate_parameter_Int( appInstance, paramKey ): out = "ParameterNumber" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + out += "None" out += "|" out += "None" out += "|" - + defaultVal = "0" try: defaultVal = str(appInstance.GetParameterInt(paramKey)) @@ -158,22 +158,22 @@ def generate_parameter_Int( appInstance, paramKey ): out += defaultVal return out - + def generate_parameter_Float( appInstance, paramKey ): out = "ParameterNumber" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + out += "None" out += "|" out += "None" out += "|" - + defaultVal = "0.0" try: defaultVal = str(appInstance.GetParameterFloat(paramKey)) @@ -185,13 +185,13 @@ def generate_parameter_Float( appInstance, paramKey ): def generate_parameter_String( appInstance, paramKey ): out = "ParameterString" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + defaultVal = "" try: defaultVal = str(appInstance.GetParameterString(paramKey)) @@ -204,148 +204,148 @@ def generate_parameter_String( appInstance, paramKey ): def generate_parameter_InputFilename( appInstance, paramKey ): out = "ParameterFile" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + try: defaultVal = str(appInstance.GetParameterString(paramKey)) out += "|" + defaultVal except: pass - + return out def generate_parameter_OutputFilename( appInstance, paramKey ): out = "OutputFile" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) - + return out def generate_parameter_Directory( appInstance, paramKey ): out = "ParameterFile" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) - + try: defaultVal = str(appInstance.GetParameterString(paramKey)) out += "|" + defaultVal except: pass - + return out def generate_parameter_Choice( appInstance, paramKey ): out = "ParameterSelection" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + choices = "" for choice in appInstance.GetChoiceKeys(paramKey): choices += choice choices += ";" out += choices[:-1] - + out += "|" out += str(appInstance.GetParameterInt(paramKey)) - + return out def generate_parameter_InputImage( appInstance, paramKey ): out = "ParameterRaster" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + out += str(not appInstance.IsMandatory(paramKey)) - + return out def generate_parameter_InputImageList( appInstance, paramKey ): out = "ParameterMultipleInput" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + out += "3" out += "|" - + out += str(not appInstance.IsMandatory(paramKey)) - + return out def generate_parameter_InputVectorData( appInstance, paramKey ): out = "ParameterVector" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + out += "-1" out += "|" - + out += str(not appInstance.IsMandatory(paramKey)) - + return out def generate_parameter_InputVectorDataList( appInstance, paramKey ): out = "ParameterMultipleInput" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) out += "|" - + out += "-1" out += "|" - + out += str(not appInstance.IsMandatory(paramKey)) - + return out def generate_parameter_OutputImage( appInstance, paramKey ): out = "OutputRaster" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) - + return out @@ -356,22 +356,22 @@ def generate_parameter_NOTHANDLED( appInstance, paramKey ): def generate_parameter_OutputVectorData( appInstance, paramKey ): out = "OutputVector" out += "|" - + out += "-" + paramKey out += "|" - + out += convertendl(appInstance.GetParameterName(paramKey)) - + return out def generate_parameter_Radius( appInstance, paramKey ): return generate_parameter_Int(appInstance, paramKey) - + def generate_parameter_ComplexInputImage( appInstance, paramKey ): return generate_parameter_InputImage(appInstance, paramKey) - + def generate_parameter_ComplexOutputImage( appInstance, paramKey ): return generate_parameter_OutputImage(appInstance, paramKey) diff --git a/python/plugins/sextante/outputs/CMakeLists.txt b/python/plugins/sextante/outputs/CMakeLists.txt index 5660f7193171..555005baacb4 100644 --- a/python/plugins/sextante/outputs/CMakeLists.txt +++ b/python/plugins/sextante/outputs/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB PY_FILES *.py) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/outputs) +PLUGIN_INSTALL(sextante ./outputs ${PY_FILES}) diff --git a/python/plugins/sextante/outputs/Output.py b/python/plugins/sextante/outputs/Output.py index b6795d496782..1936a69d739f 100644 --- a/python/plugins/sextante/outputs/Output.py +++ b/python/plugins/sextante/outputs/Output.py @@ -58,7 +58,7 @@ def serialize(self): def setValue(self, value): try: - if value != None: + if value != None and isinstance(value, basestring): value = value.strip() self.value = value return True diff --git a/python/plugins/sextante/outputs/OutputFactory.py b/python/plugins/sextante/outputs/OutputFactory.py index d1d9431fe2df..5971a393199f 100644 --- a/python/plugins/sextante/outputs/OutputFactory.py +++ b/python/plugins/sextante/outputs/OutputFactory.py @@ -16,7 +16,6 @@ * * *************************************************************************** """ - __author__ = 'Victor Olaya' __date__ = 'August 2012' __copyright__ = '(C) 2012, Victor Olaya' @@ -29,12 +28,13 @@ from sextante.outputs.OutputVector import OutputVector from sextante.outputs.OutputNumber import OutputNumber from sextante.outputs.OutputFile import OutputFile +from sextante.outputs.OutputString import OutputString class OutputFactory(): @staticmethod def getFromString(s): - classes = [OutputRaster, OutputVector, OutputTable, OutputHTML, OutputNumber, OutputFile] + classes = [OutputRaster, OutputVector, OutputTable, OutputHTML, OutputNumber, OutputFile, OutputString] for clazz in classes: if s.startswith(clazz().outputTypeName()): tokens = s[len(clazz().outputTypeName())+1:].split("|") diff --git a/python/plugins/sextante/pymorph/__init__.py b/python/plugins/sextante/outputs/OutputString.py similarity index 77% rename from python/plugins/sextante/pymorph/__init__.py rename to python/plugins/sextante/outputs/OutputString.py index a0007c00c40f..99f10835a2fc 100644 --- a/python/plugins/sextante/pymorph/__init__.py +++ b/python/plugins/sextante/outputs/OutputString.py @@ -2,9 +2,9 @@ """ *************************************************************************** - __init__.py + OutputString.py --------------------- - Date : August 2012 + Date : October 2012 Copyright : (C) 2012 by Victor Olaya Email : volayaf at gmail dot com *************************************************************************** @@ -23,11 +23,12 @@ # This will get replaced with a git SHA1 when you do a git archive __revision__ = '$Format:%H$' -import mmorph -import text -from mmorph import * -from text import * -from pymorph_version import __version__ +from sextante.outputs.Output import Output -__doc__ = mmorph.__doc__ -__all__ = mmorph.__all__ + ['text'] +class OutputString(Output): + + def __init__(self, name="", description=""): + self.name = name + self.description = description + self.value = None + self.hidden = True diff --git a/python/plugins/sextante/parameters/CMakeLists.txt b/python/plugins/sextante/parameters/CMakeLists.txt index fe237f804c14..c3cf640a2252 100644 --- a/python/plugins/sextante/parameters/CMakeLists.txt +++ b/python/plugins/sextante/parameters/CMakeLists.txt @@ -1,3 +1,3 @@ FILE(GLOB PY_FILES *.py) -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/parameters) +PLUGIN_INSTALL(sextante ./parameters ${PY_FILES}) diff --git a/python/plugins/sextante/parameters/ParameterFile.py b/python/plugins/sextante/parameters/ParameterFile.py index c5557a73b15c..aeeb9f52636b 100644 --- a/python/plugins/sextante/parameters/ParameterFile.py +++ b/python/plugins/sextante/parameters/ParameterFile.py @@ -39,6 +39,12 @@ def serialize(self): return self.__module__.split(".")[-1] + "|" + self.name + "|" + self.description +\ "|" + str(self.isFolder) + def setValue(self, obj): + self.value = str(obj) + if self.value.strip() == "": + return False + return True + def deserialize(self, s): tokens = s.split("|") return ParameterFile(tokens[0], tokens[1], tokens[2] == str(True)) diff --git a/python/plugins/sextante/parameters/ParameterFixedTable.py b/python/plugins/sextante/parameters/ParameterFixedTable.py index 0a92b6643317..ddd0198daf66 100644 --- a/python/plugins/sextante/parameters/ParameterFixedTable.py +++ b/python/plugins/sextante/parameters/ParameterFixedTable.py @@ -34,8 +34,8 @@ def __init__(self, name="", description="", cols=["value"], numRows=3, fixedNumO self.fixedNumOfRows = fixedNumOfRows self.value = None - def setValue(self, obj): - ##TODO: check that it contains a correct number of elements + def setValue(self, obj): + ##TODO: check that it contains a correct number of elements if isinstance(obj, (str,unicode)): self.value = obj else: @@ -46,7 +46,7 @@ def getValueAsCommandLineParameter(self): return "\"" + str(self.value) + "\"" @staticmethod - def tableToString(table): + def tableToString(table): tablestring = "" for i in range(len(table)): for j in range(len(table[0])): diff --git a/python/plugins/sextante/pymorph/CMakeLists.txt b/python/plugins/sextante/pymorph/CMakeLists.txt deleted file mode 100644 index e0c9a6bbc37d..000000000000 --- a/python/plugins/sextante/pymorph/CMakeLists.txt +++ /dev/null @@ -1,8 +0,0 @@ -FILE(GLOB PY_FILES *.py) -FILE(GLOB OTHER_FILES algnames.txt) - -ADD_SUBDIRECTORY(html) -ADD_SUBDIRECTORY(scripts) - -INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph) -INSTALL(FILES ${OTHER_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph) diff --git a/python/plugins/sextante/pymorph/PymorphAlgorithm.py b/python/plugins/sextante/pymorph/PymorphAlgorithm.py deleted file mode 100644 index 8fb8e5ef13f8..000000000000 --- a/python/plugins/sextante/pymorph/PymorphAlgorithm.py +++ /dev/null @@ -1,79 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -*************************************************************************** - PymorphAlgorithm.py - --------------------- - Date : August 2012 - Copyright : (C) 2012 by Victor Olaya - Email : volayaf at gmail dot com -*************************************************************************** -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -*************************************************************************** -""" - -__author__ = 'Victor Olaya' -__date__ = 'August 2012' -__copyright__ = '(C) 2012, Victor Olaya' -# This will get replaced with a git SHA1 when you do a git archive -__revision__ = '$Format:%H$' - -from sextante.script.ScriptAlgorithm import ScriptAlgorithm -from sextante.parameters.ParameterRaster import ParameterRaster -from sextante.outputs.OutputRaster import OutputRaster -from sextante.core.GeoAlgorithm import GeoAlgorithm -from sextante.pymorph.AlgNames import AlgNames -import os - -class PymorphAlgorithm(ScriptAlgorithm): - - LOAD_LAYER_SCRIPT = "from sextante.gdal.GdalUtils import GdalUtils\n" \ - +"from sextante.pymorph.mmorph import datatype\n" \ - + "import numpy\n" \ - +"gdal_datatypes={'binary':'Byte','uint8':'Byte','uint16':'UInt16','int32':'Int32'}\n" \ - + "try:\n" \ - + "\tfrom osgeo import gdal\n" \ - + "except ImportError:\n" \ - + "\timport gdal\n" \ - + "gdal.AllRegister()\n" \ - + "img = gdal.Open(input_filename)\n"\ - + "input_array = img.ReadAsArray()\n" \ - + "if isinstance(input_array[0][0], (numpy.float32, numpy.float64)):\n" \ - + "\tinput_array = input_array.astype(numpy.int32)\n" - - SAVE_LAYER_SCRIPT = "\ndrv = gdal.GetDriverByName(GdalUtils.getFormatShortNameFromFilename(output_filename))\n" \ - + "out = drv.Create(output_filename, img.RasterXSize, img.RasterYSize, 1, gdal.GetDataTypeByName('UInt16'))\n"\ - + "out.SetGeoTransform( img.GetGeoTransform())\n"\ - + "out.SetProjection( img.GetProjectionRef())\n"\ - + "out.GetRasterBand(1).WriteArray(output_array)" - #gdal_datatypes[datatype(output_array)] - - def getCopy(self): - newone = PymorphAlgorithm(self.descriptionFile) - newone.provider = self.provider - return newone - - def getIcon(self): - return GeoAlgorithm.getIcon(self) - - def defineCharacteristicsFromFile(self): - ScriptAlgorithm.defineCharacteristicsFromFile(self) - self.parameters.insert(0, ParameterRaster("input_filename", "Input image", False)) - self.outputs.append(OutputRaster("output_filename", "Output image")) - self.script = self.LOAD_LAYER_SCRIPT + self.script + self.SAVE_LAYER_SCRIPT - self.cmdname = self.name - self.name = AlgNames.getName(self.name) - - def helpFile(self): - command = os.path.basename(self.descriptionFile) - command = command[:command.rfind(".")].replace("_", "") - filename = os.path.dirname(__file__) + "/html/morph/morph/mm" + command + ".html" - return filename - - def commandLineName(self): - return "pymorph:" + ":" + self.cmdname diff --git a/python/plugins/sextante/pymorph/PymorphAlgorithmProvider.py b/python/plugins/sextante/pymorph/PymorphAlgorithmProvider.py deleted file mode 100644 index 34998b7db3a7..000000000000 --- a/python/plugins/sextante/pymorph/PymorphAlgorithmProvider.py +++ /dev/null @@ -1,68 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -*************************************************************************** - PymorphAlgorithmProvider.py - --------------------- - Date : August 2012 - Copyright : (C) 2012 by Victor Olaya - Email : volayaf at gmail dot com -*************************************************************************** -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -*************************************************************************** -""" - -__author__ = 'Victor Olaya' -__date__ = 'August 2012' -__copyright__ = '(C) 2012, Victor Olaya' -# This will get replaced with a git SHA1 when you do a git archive -__revision__ = '$Format:%H$' - -import os -from PyQt4.QtCore import * -from PyQt4.QtGui import * -from sextante.core.AlgorithmProvider import AlgorithmProvider -from sextante.script.WrongScriptException import WrongScriptException -from sextante.core.SextanteLog import SextanteLog -from sextante.gdal.GdalUtils import GdalUtils -from sextante.pymorph.PymorphAlgorithm import PymorphAlgorithm - -class PymorphAlgorithmProvider(AlgorithmProvider): - - def __init__(self): - AlgorithmProvider.__init__(self) - #self.readAlgNames() - self.createAlgsList() - - def scriptsFolder(self): - return os.path.dirname(__file__) + "/scripts" - - def getDescription(self): - return "Pymorph (Morphological image processing tools)" - - def getName(self): - return "pymorph" - - def _loadAlgorithms(self): - self.algs = self.preloadedAlgs - - def createAlgsList(self): - self.preloadedAlgs = [] - folder = self.scriptsFolder() - for descriptionFile in os.listdir(folder): - if descriptionFile.endswith("py"): - try: - fullpath = os.path.join(self.scriptsFolder(), descriptionFile) - alg = PymorphAlgorithm(fullpath) - alg.group = "Algorithms" - self.preloadedAlgs.append(alg) - except WrongScriptException,e: - SextanteLog.addToLog(SextanteLog.LOG_ERROR,e.msg) - - def getSupportedOutputRasterLayerExtensions(self): - return GdalUtils.getSupportedRasterExtensions() \ No newline at end of file diff --git a/python/plugins/sextante/pymorph/algnames.txt b/python/plugins/sextante/pymorph/algnames.txt deleted file mode 100644 index 74f7c2a90ff7..000000000000 --- a/python/plugins/sextante/pymorph/algnames.txt +++ /dev/null @@ -1,66 +0,0 @@ -add4dilate : Addition for dilation -addm : Addition of two images, with saturation. -areaclose : Area closing -areaopen : Area opening -asf : Alternating Sequential Filtering -asfrec : Reconstructive Alternating Sequential Filtering -binary : Convert a gray-scale image into a binary image -cbisector : N-Conditional bisector. -cdilate : Dilate an image conditionally. -center : Center filter. -cerode : Erode an image conditionally. -closeholes : Close holes of binary and gray-scale images. -close : Morphological closing. -closerec : Closing by reconstruction. -closerecth : Close-by-Reconstruction Top-Hat. -closeth : Closing Top Hat. -cthick : Image transformation by conditional thickening. -cthin : Image transformation by conditional thinning. -cwatershed : Detection of watershed from markers. -datatype : Return the image datatype string -dilate : Dilate an image by a structuring element. -dist : Distance transform. -endpoints : Interval to detect end-points. -erode : Erode an image by a structuring element. -flood : Flooding filter- h,v,a-basin and dynamics (depth, area, volume) -gdist : Geodesic Distance Transform. -gradm : Morphological gradient. -hmax : Remove peaks with contrast less than h. -hmin : Remove basins with contrast less than h. -homothick : Interval for homotopic thickening. -homothin : Interval for homotopic thinning. -infcanon : Intersection of inf-generating operators. -infgen : Inf-generating. -infrec : Inf-reconstruction. -inpos : Minima imposition. -interot : Rotate an interval -intersec : Intersection of images. -isolines : Apply an iso-line color table to a gray-scale image. -label : Label a binary image. -labelflat : Label the flat zones of gray-scale images. -lastero : Last erosion. -neg : Negate an image. -open : Morphological opening. -openrec : Opening by reconstruction. -openrecth : Open-by-Reconstruction Top-Hat. -openth : Opening Top Hat. -opentransf : Open transform. -patspec : Pattern spectrum (also known as granulometric size density). -randomcolor : Apply a random color table to a gray-scale image. -regmax : Regional Maximum. -regmin : Regional Minimum (with generalized dynamics). -skelm : Morphological skeleton (Medial Axis Transform). -skelmrec : Morphological skeleton reconstruction (Inverse Medial Axis Transform). -skiz : Skeleton of Influence Zone - also know as Generalized Voronoi Diagram -subm : Subtraction of two images, with saturation. -supcanon : Union of sup-generating or hit-miss operators. -supgen : Sup-generating (hit-miss). -suprec : Sup-reconstruction. -symdiff : Symmetric difference between two images -text : Create a binary image of a text. -thick : Image transformation by thickening. -thin : Image transformation by thinning. -threshad : Threshold (adaptive) -toggle : Image contrast enhancement or classification by the toggle operator. -union : Union of images. -watershed : Watershed detection. \ No newline at end of file diff --git a/python/plugins/sextante/pymorph/compat.py b/python/plugins/sextante/pymorph/compat.py deleted file mode 100644 index ba5dee250312..000000000000 --- a/python/plugins/sextante/pymorph/compat.py +++ /dev/null @@ -1,703 +0,0 @@ -# -*- coding: utf-8 -*- - -""" -*************************************************************************** - compat.py - --------------------- - Date : August 2012 - Copyright : (C) 2012 by Victor Olaya - Email : volayaf at gmail dot com -*************************************************************************** -* * -* This program is free software; you can redistribute it and/or modify * -* it under the terms of the GNU General Public License as published by * -* the Free Software Foundation; either version 2 of the License, or * -* (at your option) any later version. * -* * -*************************************************************************** -""" - -__author__ = 'Victor Olaya' -__date__ = 'August 2012' -__copyright__ = '(C) 2012, Victor Olaya' -# This will get replaced with a git SHA1 when you do a git archive -__revision__ = '$Format:%H$' - -import warnings -warnings.warn('pymorph.compat should be replaced with pymorph', DeprecationWarning) - -from notimplemented import * -from mmorph import * -from text import * - -# old abbreviations: - -clohole=close_holes -ero=erode -cero=cerode -dil=dilate -cdil=cdilate -sedil=sedilate -add4dil=add4dilate -uint8=to_uint8 -uint16=to_uint16 -int32=to_int32 -glblshow=randomcolor -randomcolour=randomcolor - -# mmnames: - -def _not_implemented(msg): - def f(*args, **kwargs): - raise NotImplementedError, msg - f.__doc__ = '''\ -This function is not implemented anymore. - -%s''' % msg - return f - -mmadd4dil=add4dil -mmaddm=addm -mmareaclose=areaclose -mmareaopen=areaopen -mmasf=asf -mmasfrec=asfrec -mmbinary=binary -mmblob=blob -mmbshow=bshow -mmcbisector=cbisector -mmcdil=cdil -mmcenter=center -mmcero=cero -mmclohole=clohole -mmclose=close -mmcloserec=closerec -mmcloserecth=closerecth -mmcloseth=closeth -mmconcat=concat -mmcthick=cthick -mmcthin=cthin -mmcwatershed=cwatershed -mmdatatype=datatype -mmdil=dil -mmdist=dist -mmdrawv=drawv -mmdtshow=_not_implemented('dtshow: use matplotlib') -mmedgeoff=edgeoff -mmero=ero -mmflood=flood -mmframe=frame -mmgdist=gdist -mmgdtshow=_not_implemented('gdtshow: use matplotlib') -mmgradm=gradm -mmgrain=grain -mmgray=gray -mmhistogram=histogram -mmhmax=hmax -mmhmin=hmin -mmhomothick=homothick -mmhomothin=homothin -mmimg2se=img2se -mminfcanon=infcanon -mminfgen=infgen -mminfrec=infrec -mminpos=inpos -mminterot=interot -mmintersec=intersec -mmintershow=intershow -mmisbinary=isbinary -mmisequal=isequal -mmlabel=label -mmlabelflat=labelflat -mmlastero=lastero -mmlblshow=_not_implemented('lblshow: use matplotlib') -mmlimits=limits -mmmat2set=mat2set -mmmaxleveltype=maxleveltype -mmneg=neg -mmopen=open -mmopenrec=openrec -mmopenrecth=openrecth -mmopenth=openth -mmopentransf=opentransf -mmpad4n=pad4n -mmpatspec=patspec -mmreadgray=_not_implemented('readgray: use PIL or readmagick') -mmregmax=regmax -mmregmin=regmin -mmse2hmt=se2hmt -mmse2interval=se2interval -mmsebox=sebox -mmsecross=secross -mmsedil=sedil -mmsedisk=sedisk -mmseline=seline -mmsereflect=sereflect -mmserot=serot -mmseshow=seshow -mmsesum=sesum -mmset2mat=set2mat -mmsetrans=setrans -mmseunion=seunion -mmskelm=skelm -mmskelmrec=skelmrec -mmskiz=skiz -mmsubm=subm -mmsupcanon=supcanon -mmsupgen=supgen -mmsuprec=suprec -mmswatershed=swatershed -mmsymdif=symdiff -mmtext=text -mmthick=thick -mmthin=thin -mmthreshad=threshad -mmtoggle=toggle -mmunion=union -mmvmax=vmax -mmwatershed=watershed - -gshow=overlay -gdtshow=isolines - -# Functions which were removed: - -def mminstall(*args): - pass -def mmversion(*args): - pass -def mmregister(*args): - pass - - -def mmcmp(f1, oper, f2, oper1=None, f3=None): - """ - - Alternative: - Consider using array operations directly, i.e., instead of - mmcmp(f1, '>', f2) - simply use - f1 > f2 - - Purpose - Compare two images pixelwisely. - - Synopsis - y = mmcmp(f1, oper, f2, oper1=None, f3=None) - - Input - f1: Gray-scale (uint8 or uint16) or binary image. - oper: String Default: "". relationship from: '==', '~=', - '<','<=', '>', '>='. - f2: Gray-scale (uint8 or uint16) or binary image. - oper1: String Default: None. relationship from: '==', '~=', - '<','<=', '>', '>='. - f3: Gray-scale (uint8 or uint16) or binary image. Default: - None. - - Output - y: Binary image. - - Description - Apply the relation oper to each pixel of images f1 and f2 , the - result is a binary image with the same size. Optionally, it is - possible to make the comparison among three image. It is - possible to use a constant value in place of any image, in this - case the constant is treated as an image of the same size as the - others with all pixels with the value of the constant. - - Examples - # - # example 1 - # - print cmp(to_uint8([1, 2, 3]),'<', to_uint8(2)) - print cmp(to_uint8([1, 2, 3]),'<', to_uint8([0, 2, 4])) - print cmp(to_uint8([1, 2, 3]),'==', to_uint8([1, 1, 3])) - # - # example 2 - # - f=readgray('keyb.tif') - fbin=cmp(to_uint8(10), '<', f, '<', to_uint8(50)) - show(f) - show(fbin) - """ - - if oper == '==': y = (f1==f2) - elif oper == '~=': y = (f1!=f2) - elif oper == '<=': y = (f1<=f2) - elif oper == '>=': y = (f1>=f2) - elif oper == '>': y = (f1> f2) - elif oper == '<': y = (f1< f2) - else: - assert 0, 'oper must be one of: ==, ~=, >, >=, <, <=, it was:'+oper - if oper1 != None: - if oper1 == '==': y = intersec(y, f2==f3) - elif oper1 == '~=': y = intersec(y, f2!=f3) - elif oper1 == '<=': y = intersec(y, f2<=f3) - elif oper1 == '>=': y = intersec(y, f2>=f3) - elif oper1 == '>': y = intersec(y, f2> f3) - elif oper1 == '<': y = intersec(y, f2< f3) - else: - assert 0, 'oper1 must be one of: ==, ~=, >, >=, <, <=, it was:'+oper1 - - y = binary(y) - return y - - -def mmvdome(f, v=1, Bc=None): - """ - - Purpose - Obsolete, use vmax. - - Synopsis - y = mmvdome(f, v=1, Bc=None) - - Input - f: Gray-scale (uint8 or uint16) image. - v: Default: 1. Volume parameter. - Bc: Structuring Element Default: None (3x3 elementary cross). - Structuring element (connectivity). - - Output - y: Gray-scale (uint8 or uint16) or binary image. - - Description - The correct name for this operator mmvdome is vmax. - - """ - - if Bc is None: Bc = secross() - y = hmax(f,v,Bc); - return y - -def mmis(f1, oper, f2=None, oper1=None, f3=None): - """ - - Alternative - Consider using array operations or isbinary() - - Purpose - Verify if a relationship among images is true or false. - - Synopsis - y = mmis(f1, oper, f2=None, oper1=None, f3=None) - - Input - f1: Gray-scale (uint8 or uint16) or binary image. - oper: String relationship from: '==', '~=', '<','<=', '>', - '>=', 'binary', 'gray'. - f2: Gray-scale (uint8 or uint16) or binary image. Default: - None. - oper1: String Default: None. relationship from: '==', '~=', - '<','<=', '>', '>='. - f3: Gray-scale (uint8 or uint16) or binary image. Default: - None. - - Output - y: Bool value: 0 or 1 - - Description - Verify if the property or relatioship between images is true or - false. The result is true if the relationship is true for all - the pixels in the image, and false otherwise. (Obs: This - function replaces is equal, is lesseq, is binary ). - - Examples - # - fbin=binary([0, 1]) - f1=to_uint8([1, 2, 3]) - f2=to_uint8([2, 2, 3]) - f3=to_uint8([2, 3, 4]) - mmis(fbin,'binary') - mmis(f1,'gray') - mmis(f1,'==',f2) - mmis(f1,'<',f3) - mmis(f1,'<=',f2) - mmis(f1,'<=',f2,'<=',f3) - """ - from string import upper - - if f2 == None: - oper=upper(oper); - if oper == 'BINARY': return isbinary(f1) - elif oper == 'GRAY' : return not isbinary(f1) - else: - assert 0,'oper should be BINARY or GRAY, was'+oper - elif oper == '==': y = isequal(f1, f2) - elif oper == '~=': y = not isequal(f1,f2) - elif oper == '<=': y = mmislesseq(f1,f2) - elif oper == '>=': y = mmislesseq(f2,f1) - elif oper == '>': y = isequal(neg(threshad(f2,f1)),binary(1)) - elif oper == '<': y = isequal(neg(threshad(f1,f2)),binary(1)) - else: - assert 0,'oper must be one of: ==, ~=, >, >=, <, <=, it was:'+oper - if oper1 != None: - if oper1 == '==': y = y and isequal(f2,f3) - elif oper1 == '~=': y = y and (not isequal(f2,f3)) - elif oper1 == '<=': y = y and mmislesseq(f2,f3) - elif oper1 == '>=': y = y and mmislesseq(f3,f2) - elif oper1 == '>': y = y and isequal(neg(threshad(f3,f2)),binary(1)) - elif oper1 == '<': y = y and isequal(neg(threshad(f2,f3)),binary(1)) - else: - assert 0,'oper1 must be one of: ==, ~=, >, >=, <, <=, it was:'+oper1 - return y - - -def mmislesseq(f1, f2, MSG=None): - """ - - Alternative - Consider using f1 <= f2 - - Purpose - Verify if one image is less or equal another (is beneath) - - Synopsis - bool = mmislesseq(f1, f2) - - Input - f1: Gray-scale (uint8 or uint16) or binary image. - f2: Gray-scale (uint8 or uint16) or binary image. - - Output - bool: Boolean - - Description - mmislesseq compares the images f1 and f2 and returns true (1), - if f1(x) <= f2(x) , for every pixel x, and false (0), otherwise. - - Examples - # - f1 = to_uint8([0, 1, 2, 3]) - f2 = to_uint8([9, 5, 3, 3]) - print mmislesseq(f1,f2) - print mmislesseq(f2,f1) - print mmislesseq(f1,f1) - """ - from numpy import ravel - - bool = min(ravel(f1<=f2)) - return bool - -def mmstats(f, measurement): - """ - - Purpose - Find global image statistics. - - Synopsis - y = mmstats(f, measurement) - - Input - f: - measurement: String Default: "". Choose the measure to compute: - 'max', 'min', 'median', 'mean', 'sum', 'std', - 'std1'. - - Output - y: - - Description - Compute global image statistics: 'max' - maximum gray-scale - value in image; 'min' - minimum gray-scale value in image; 'sum' - - sum of all pixel values; 'median' - median value of all pixels - in image; 'mean' - mean value of all pixels in image; 'std' - - standard deviation of all pixels (normalized by N-1); 'std1' - - idem, normalized by N. - - """ - from string import upper - from numpy import ravel - from numpy.oldnumeric.mlab import mean, median, std - - measurement = upper(measurement) - if measurement == 'MAX': return f.max() - elif measurement == 'MIN': return f.min() - elif measurement == 'MEAN': return f.mean() - elif measurement == 'MEDIAN': return f.median() - elif measurement == 'STD': return f.std() - else: - assert 0,'pymorph.compat.mmstats: Not a valid measurement' - -def mmsurf(f,options = None): - return f - -_figs = [None] - -def plot(plotitems=[], options=[], outfig=-1, filename=None): - """ - - Purpose - Plot a function. - - Synopsis - fig = plot(plotitems=[], options=[], outfig=-1, filename=None) - - Input - plotitems: Default: []. List of plotitems. - options: Default: []. List of options. - outfig: Default: -1. Integer. Figure number. 0 creates a new - figure. - filename: Default: None. String. Name of the PNG output file. - - Output - fig: Figure number. - - - Examples - # - import numpy - # - x = numpy.arange(0, 2*numpy.pi, 0.1) - plot([[x]]) - y1 = numpy.sin(x) - y2 = numpy.cos(x) - opts = [['title', 'Example Plot'],\ - ['grid'],\ - ['style', 'linespoints'],\ - ['xlabel', '"X values"'],\ - ['ylabel', '"Y Values"']] - y1_plt = [x, y1, None, 'sin(X)'] - y2_plt = [x, y2, 'lines', 'cos(X)'] - # - # plotting two graphs using one step - fig1 = plot([y1_plt, y2_plt], opts, 0) - # - # plotting the same graphs using two steps - fig2 = plot([y1_plt], opts, 0) - fig2 = plot([y2_plt], opts, fig2) - # - # first function has been lost, lets recover it - opts.append(['replot']) - fig2 = plot([y1_plt], opts, fig2) - """ - import Gnuplot - import numpy - - newfig = 0 - if (plotitems == 'reset'): - _figs[0] = None - _figs[1:] = [] - return 0 - if len(plotitems) == 0: - # no plotitems specified: replot current figure - if _figs[0]: - outfig = _figs[0] - g = _figs[outfig] - g.replot() - return outfig - else: - #assert 0, "plot error: There is no current figure\n" - print "plot error: There is no current figure\n" - return 0 - # figure to be plotted - if ((outfig < 0) and _figs[0]): - # current figure - outfig = _figs[0] - elif ( (outfig == 0) or ( (outfig == -1) and not _figs[0] ) ): - # new figure - newfig = 1 - outfig = len(_figs) - elif outfig >= len(_figs): - #assert 0, 'plot error: Figure ' + str(outfig) + 'does not exist\n' - print 'plot error: Figure ' + str(outfig) + 'does not exist\n' - return 0 - #current figure - _figs[0] = outfig - # Gnuplot pointer - if newfig: - if len(_figs) > 20: - print '''plot error: could not create figure. Too many PlotItems in memory (20). Use - plot('reset') to clear table''' - return 0 - - g = Gnuplot.Gnuplot() - _figs.append(g) - else: - g = _figs[outfig] - - # options - try: - options.remove(['replot']) - except: - g.reset() - try: - #default style - g('set data style lines') - for option in options: - if option[0] == 'grid': - g('set grid') - elif option[0] == 'title': - g('set title "' + option[1] + '"') - elif option[0] == 'xlabel': - g('set xlabel ' + option[1]) - elif option[0] == 'ylabel': - g('set ylabel ' + option[1]) - elif option[0] == 'style': - g('set data style ' + option[1]) - else: - print "plot warning: Unknown option: " + option[0] - except: - print "plot warning: Bad usage in options! Using default values. Please, use help.\n" - # Plot items: item[0]=x, item[1]=y, item[2]=style - for item in plotitems: - try: - title = None - style = None - x = numpy.ravel(item[0]) - if len(item) > 1: - # y axis specified - y = numpy.ravel(item[1]) - if len(item) > 2: - # style specified - style = item[2] - if len(item) > 3: - title = item[3] - else: - # no y axis specified - y = x - x = numpy.arange(len(y)) - g.replot(Gnuplot.Data(x, y, title=title, with_=style)) - except: - g.reset() - if newfig: - _figs.pop() - #assert 0, "plot error: Bad usage in plotitems! Impossible to plot graph. Please, use help.\n" - print "plot error: Bad usage in plotitems! Impossible to plot graph. Please, use help.\n" - return 0 - # PNG file - if filename: - g.hardcopy(filename, terminal='png', color=1) - fig = outfig - return fig -mmplot=plot - - -def mmwatershed(f,Bc=None,linereg='LINES'): - return watershed(f,Bc,(linereg == 'LINES')) - -def mmcwatershed(f,Bc=None,linereg='LINES'): - return cwatershed(f,Bc,(linereg == 'LINES')) - -def mmskiz(f,Bc=None,LINEREG='LINES',METRIC=None): - return skiz(f,Bc,(LINEREG=='LINES'),METRIC) - -def mmdist(f,Bc=None,METRIC=None): - return dist(f,Bc,metric=METRIC) - -def mmendpoints(OPTION='LOOP'): - return endpoints(option=OPTION) - - - -def mmgshow(X, X1=None, X2=None, X3=None, X4=None, X5=None, X6=None): - """ - - Purpose - Apply binary overlays as color layers on a binary or gray-scale - image - - Synopsis - Y = gshow(X, X1=None, X2=None, X3=None, X4=None, X5=None, - X6=None) - - Input - X: Gray-scale (uint8 or uint16) or binary image. - X1: Binary image. Default: None. Red overlay. - X2: Binary image. Default: None. Green overlay. - X3: Binary image. Default: None. Blue overlay. - X4: Binary image. Default: None. Magenta overlay. - X5: Binary image. Default: None. Yellow overlay. - X6: Binary image. Default: None. Cyan overlay. - - Output - Y: Gray-scale (uint8 or uint16) or binary image. - - """ - - if isbinary(X): X = gray(X,'uint8') - r = X - g = X - b = X - if X1 is not None: # red 1 0 0 - assert isbinary(X1),'X1 must be binary overlay' - x1 = gray(X1,'uint8') - r = union(r,x1) - g = intersec(g,neg(x1)) - b = intersec(b,neg(x1)) - if X2 is not None: # green 0 1 0 - assert isbinary(X2),'X2 must be binary overlay' - x2 = gray(X2,'uint8') - r = intersec(r,neg(x2)) - g = union(g,x2) - b = intersec(b,neg(x2)) - if X3 is not None: # blue 0 0 1 - assert isbinary(X3),'X3 must be binary overlay' - x3 = gray(X3,'uint8') - r = intersec(r,neg(x3)) - g = intersec(g,neg(x3)) - b = union(b,x3) - if X4 is not None: # magenta 1 0 1 - assert isbinary(X4),'X4 must be binary overlay' - x4 = gray(X4,'uint8') - r = union(r,x4) - g = intersec(g,neg(x4)) - b = union(b,x4) - if X5 is not None: # yellow 1 1 0 - assert isbinary(X5),'X5 must be binary overlay' - x5 = gray(X5,'uint8') - r = union(r,x5) - g = union(g,x5) - b = intersec(b,neg(x5)) - if X6 is not None: # cyan 0 1 1 - assert isbinary(X6),'X6 must be binary overlay' - x6 = gray(X6,'uint8') - r = intersec(r,neg(x6)) - g = union(g,x6) - b = union(b,x6) - return concat('d',r,g,b) - -def mmglblshow(X, border=0.0): - """ - - Purpose - Apply a random color table to a gray-scale image. - - Synopsis - Y = glblshow(X, border=0.0) - - Input - X: Gray-scale (uint8 or uint16) image. Labeled image. - border: Boolean Default: 0.0. Labeled image. - - Output - Y: Gray-scale (uint8 or uint16) or binary image. - - """ - from numpy import take, resize, shape - from numpy.random import rand - - mmin = X.min() - mmax = X.max() - ncolors = mmax - mmin + 1 - R = to_int32(rand(ncolors)*255) - G = to_int32(rand(ncolors)*255) - B = to_int32(rand(ncolors)*255) - if mmin == 0: - R[0],G[0],B[0] = 0,0,0 - r=resize(take(R, X.ravel() - mmin),X.shape) - g=resize(take(G, X.ravel() - mmin),X.shape) - b=resize(take(B, X.ravel() - mmin),X.shape) - Y=concat('d',r,g,b) - return Y - - - -def readgray(filename): - """ - - Purpose - Read an image from a coercial file format and stores it as a - gray-scale image. - - Synopsis - y = readgray(filename) - - Input - filename: String Name of file to read. - - Output - y: Gray-scale (uint8 or uint16) or binary image. - - Description - readgray reads the image in filename and stores it in y , an - uint8 gray-scale image (without colormap). If the input file is - a color RGB image, it is converted to gray-scale using the - equation: y = 0.2989 R + 0.587 G + 0.114 B. This functions uses - de PIL module. - - Examples - # - a=readgray('cookies.tif') - show(a) - """ - import pylab - import numpy - - y = pylab.imread(filename) - if (len(y.shape) == 3) and (y.shape[0] == 3): - if numpy.alltrue(numpy.alltrue(y[0,:,:] == y[1,:,:] and - y[0,:,:] == y[2,:,:])): - y = y[0,:,:] - else: - print 'Warning: converting true-color RGB image to gray' - y = ubyte(0.2989 * y[0,:,:] + - 0.5870 * y[1,:,:] + - 0.1140 * y[2,:,:]) - elif (len(y.shape) == 2): - pass - else: - raise ValueError, 'Error, it is not 2D image' - return y - - - -def freedom(L=5): - """ - DOES NOT DO ANYTHING - """ - return -1 - -mmfreedom=freedom - diff --git a/python/plugins/sextante/pymorph/html/CMakeLists.txt b/python/plugins/sextante/pymorph/html/CMakeLists.txt deleted file mode 100644 index cfa6f3ffbd11..000000000000 --- a/python/plugins/sextante/pymorph/html/CMakeLists.txt +++ /dev/null @@ -1,5 +0,0 @@ -FILE(GLOB HTML_FILES *.html) - -ADD_SUBDIRECTORY(morph) - -INSTALL(FILES ${HTML_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html) diff --git a/python/plugins/sextante/pymorph/html/Install.html b/python/plugins/sextante/pymorph/html/Install.html deleted file mode 100644 index 456c1ddd48c6..000000000000 --- a/python/plugins/sextante/pymorph/html/Install.html +++ /dev/null @@ -1,107 +0,0 @@ - - - - Install - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] - pymorph Morphology Toolbox V0.8 01Aug03
        -

        Install -
        -

        -
        -

        -

        -

        Installation instructions for the pymorph Morphology Toolbox V0.8.

        -
        -
        -

        Requirements

        -
        -

        Before installing the pymorph Morphology Toolbox for Python, make sure the following packages are correctly - installed: - -

        -
          -
        1. Python 2.2 or higher.
          2. -
        2. Numeric 22.0 or higher. Available at Numerical Python Home Page, http://numpy.sourceforge.net/
          3. -
        3. PIL, the Python Imaging Library, available at http://www.pythonware.com/products/pil/
          4. -
        -

        Future releases are supposed to include Numeric and PIL in the pymorph package. - -

        -
        -
        -
        -

        Installation in Any platform

        -
        -
          -
        1. Unzip the file morph08pybase.zip. A new directory called morph08pybase will be created.
          2. -
        2. Enter the morph08pybase directory.
          3. -
        3. Type "python setup.py install". You may need admin permissions to perform this action.
          4. -
        -
        -
        -
        -

        Uninstallation

        -
        pymorph Morphology Toolbox for PYTHON package files are installed at the - - $PYTHON_HOME/site-packages/adtools/morph08pybase. Where - $PYTHON_HOME is the Python installation directory. You can uninstall the pymorph Morphology Toolbox for PYTHON by deleting everything under this directory. - -
        -
        -
        -
        -

        -
        -
        - - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] -
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/pymorph/html/License.html b/python/plugins/sextante/pymorph/html/License.html deleted file mode 100644 index 1a2b120f298d..000000000000 --- a/python/plugins/sextante/pymorph/html/License.html +++ /dev/null @@ -1,77 +0,0 @@ - - - - License - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] - pymorph Morphology Toolbox V0.8 01Aug03
        -

        License -
        -

        -
        -

        - The pymorph Morphology Toolbox for Python is ruled by the BSD License Terms. - -

        The BSD Licence
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center. - All rights reserved. - Redistribution and use in source and binary forms, with or without modification, are permitted - provided that the following conditions are met: - Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - Redistributions in binary form must reproduce the above copyright notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - Neither the name of UNICAMP, CenPRA nor the names of its contributors may be used to endorse or promote products derived from this software without specific prior written permission. - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -

        -
        -
        - - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] -
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/pymorph/html/Readme.html b/python/plugins/sextante/pymorph/html/Readme.html deleted file mode 100644 index b328aa24df89..000000000000 --- a/python/plugins/sextante/pymorph/html/Readme.html +++ /dev/null @@ -1,98 +0,0 @@ - - - - Readme - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] - pymorph Morphology Toolbox V0.8 01Aug03
        -

        Readme -
        -

        -
        -

        -

        -

        README

        -
        -

        The pymorph Morphology Toolbox for Python is a software for Image Analysis and Signal Processing. It is composed by a family of discrete non linear filters based on lattice operations. These filters, called morphological operators, are quite useful for restoration, segmentation and quantitative analysis of Images and Signals. - -

        -

        The pymorph Morphology Toolbox contains state-of-the-art morphological operators, implemented by simple algorithms. The available operators go from the classical morphological filters, used for restoration and shape description, to the modern connected filters and watersheds, so powerful for image segmentation. - -

        -

        The potential of the pymorph Morphology Toolbox is illustrated by several demos, that show the morphological solution of many real-life image processing problems. Some of the application areas covered are machine vision, medical imaging, desktop publishing, document processing, food industry and agriculture. - -

        -

        The reference manual has a page of documentation for each function of the toolbox. These pages present the respective command syntax, a detailed explanation of the necessary parameters, a short description, an application example and the formal definition. - -

        -

        The pymorph Morphology Toolbox deals with gray-scale and binary images (or signals) and is data type oriented. Thus, most operators perform both gray-scale and binary image (or signal) processing and the choice of the appropriate (binary or gray-scale) algorithm is automatic. - -

        -

        The images (or signals) may be represented by the formats: binary, 8-bit gray-scale and 16-bit gray-scale, where each pixel is represented, respectively, by a logical uint8, a uint8 and uint16 data type. - -

        -

        Morphological operators may be written hierarchically from two elementary operators, called dilation and erosion. pymorph Morphology Toolbox has simple implementations for dilation and erosion and permits the realization of any morphological operator by this constructive approach.

        -

        Dilations and erosions are parameterized by particular images (or signals), called structuring elements. These structuring elements may be flat (binary images or signals) or non flat (gray-scale images or signals). The pymorph Morphology Toolbox supports both kinds of structuring elements. - -

        -

        The pymorph Morphology Toolbox is supported in any python environment. - -

        -

        -

        -
        -
        -

        -
        -
        - - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] -
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/pymorph/html/index.html b/python/plugins/sextante/pymorph/html/index.html deleted file mode 100644 index c018c6984905..000000000000 --- a/python/plugins/sextante/pymorph/html/index.html +++ /dev/null @@ -1,141 +0,0 @@ - - - - pymorph Morphology Toolbox V0.8 01Aug03 - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] - pymorph Morphology Toolbox V0.8 01Aug03
        -

        pymorph Morphology Toolbox -
        - Morphological image processing tools for Python. - -

        -

        Description

        -
        -
        -

        The pymorph Morphology Toolbox - for Python - is a powerful collection of latest state-of-the-art gray-scale morphological tools that can be applied to image segmentation, non-linear filtering, pattern recognition and image analysis. -

        -

        The pymorph Morphology Toolbox - is an open source software for Morphological - Image Analysis and Signal Processing written in Python. It is a - companion resource for the book: - Hands-on - Morphological Image Processing - , by Edward Dougherty and Roberto - Lotufo, published by SPIE, Aug 2003, ISBN=0-8194-4720-X. -

        -

        From its preface: -

        "The book is hands-on in a very - real sense. Most of the techniques used in the book are available in - the Morphology Toolbox, and a great majority of the images shown in - the text have been processed by the toolbox. These images, along with - a demonstration version of the toolbox are downloadable free from the - web ( - http://sourceforge.net/projects/pymorph - ), so that - the reader can actually process the images according to the examples - and demonstrations in the text. There is a brief discussion in the - first chapter as to how the toolbox correlates to the text, but we do - not emphasize this relation throughout the text since we do not want - to digress from the imaging essentials. Detailed use of the toolbox - can be learned from the downloadable version. To assist the user, each - chapter concludes with a list of the toolbox operations used in the - chapter, and the detailed demonstration sections include corresponding - toolbox implementations". -
        -

        -

        As the functions are written in pure Python, some functions are - not very efficient and may take very long to process. In this case, it - is possible to use a professional version available at - http://www.mmorph.com/pymorphpro - . This version is a superset - of the pymorph project. -

        -

        The images used in the book - together with the python scripts to build most of the figures that - illustrate the book will be available in mid-August 2003. - -

        -
        -

        On-line Documentation

        -
        - - - - - - - - - - - - - - - - - - - - - - - - -
        General Description
        Installation Instructions
        License Terms
        Documentation
        Downloads
        Project Page
        Contact Info
        -
        -
        - - - - - - - - - -
        - [Home] - - [General Description] - - [Installation Instructions] - - [License Terms] - - [Documentation] - - [Downloads] - - [Project Page] - - [Contact Info] -
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        -
        - - diff --git a/python/plugins/sextante/pymorph/html/morph/CMakeLists.txt b/python/plugins/sextante/pymorph/html/morph/CMakeLists.txt deleted file mode 100644 index 56888f75430a..000000000000 --- a/python/plugins/sextante/pymorph/html/morph/CMakeLists.txt +++ /dev/null @@ -1,15 +0,0 @@ -FILE(GLOB HTML_FILES *.html *.css) -FILE(GLOB GIF_FILES *.gif) -FILE(GLOB IMAGES_FILES images/*.*) -FILE(GLOB MMDEMOS_FILES mmdemos/*.*) -FILE(GLOB MMINFO_FILES mminfo/*.*) -FILE(GLOB MMTYPES_FILES mmtype/*.*) -FILE(GLOB MORPH_FILES morph/*.*) - -INSTALL(FILES ${HTML_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph) -INSTALL(FILES ${GIF_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph) -INSTALL(FILES ${IMAGES_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/images) -INSTALL(FILES ${MMDEMOS_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/mmdemos) -INSTALL(FILES ${MMINFO_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/mminfo) -INSTALL(FILES ${MMTYPES_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/mmtypes) -INSTALL(FILES ${MORPH_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/html/morph/morph) diff --git a/python/plugins/sextante/pymorph/html/morph/PythonPoweredSmall.gif b/python/plugins/sextante/pymorph/html/morph/PythonPoweredSmall.gif deleted file mode 100644 index 268980706ab4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/PythonPoweredSmall.gif and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmaddm001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmaddm001.png deleted file mode 100644 index a55ae16f206d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmaddm001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmareaclose001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmareaclose001.png deleted file mode 100644 index f1f29af72d49..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmareaclose001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmareaopen001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmareaopen001.png deleted file mode 100644 index 361065e53d9f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmareaopen001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf001.png deleted file mode 100644 index 049261eeecc9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf002.png deleted file mode 100644 index 905fffe7afc7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf003.png deleted file mode 100644 index a3accbea0ea6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf004.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf004.png deleted file mode 100644 index bb55785d0fdd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasf004.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasfrec001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmasfrec001.png deleted file mode 100644 index 879d343226fb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasfrec001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasfrec002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmasfrec002.png deleted file mode 100644 index 659aea334ba4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmasfrec002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmbinary001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmbinary001.png deleted file mode 100644 index 85213b414374..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmbinary001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcbisector001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcbisector001.png deleted file mode 100644 index 68b3e15c51ed..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcbisector001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcdil001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcdil001.png deleted file mode 100644 index c370615f3a8f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcdil001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcdil002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcdil002.png deleted file mode 100644 index ff87dd3c63e7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcdil002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcenter001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcenter001.png deleted file mode 100644 index 3fc3877f1cf8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcenter001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcenter002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcenter002.png deleted file mode 100644 index 71d0f92d7c17..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcenter002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcero001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcero001.png deleted file mode 100644 index ed93917bd730..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcero001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcero002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcero002.png deleted file mode 100644 index 12234c1d9a2d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcero002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmclohole001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmclohole001.png deleted file mode 100644 index ff6113978178..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmclohole001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmclose001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmclose001.png deleted file mode 100644 index 37f850e4daf7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmclose001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloserec001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloserec001.png deleted file mode 100644 index 805384b1fa93..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloserec001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloserecth001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloserecth001.png deleted file mode 100644 index 24a82c37937e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloserecth001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloseth001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloseth001.png deleted file mode 100644 index 426e1c913e45..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcloseth001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcthick001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcthick001.png deleted file mode 100644 index 6cb97637ea74..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcthick001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcthin001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcthin001.png deleted file mode 100644 index 8af0543b4fe5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcthin001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed001.png deleted file mode 100644 index 468822b243b5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed002.png deleted file mode 100644 index c9ca979ef508..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed003.png deleted file mode 100644 index 1df8023a8370..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed004.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed004.png deleted file mode 100644 index ffb7b3bf8449..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmcwatershed004.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil001.png deleted file mode 100644 index 0047a6031062..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil002.png deleted file mode 100644 index 82a94ace4c3e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil003.png deleted file mode 100644 index 66c680027dfe..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdil003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist001.png deleted file mode 100644 index e0d9729decab..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist002.png deleted file mode 100644 index d397f1ef4974..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist003.png deleted file mode 100644 index a445835c87c6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist004.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist004.png deleted file mode 100644 index 4e71c234be7a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmdist004.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmedgeoff001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmedgeoff001.png deleted file mode 100644 index 4d764a3e3b0e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmedgeoff001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmendpoints001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmendpoints001.png deleted file mode 100644 index a0d4afd2bcb8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmendpoints001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmero001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmero001.png deleted file mode 100644 index 73f4e59f20fa..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmero001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmero002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmero002.png deleted file mode 100644 index 61aeff87c90d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmero002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmero003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmero003.png deleted file mode 100644 index e31d504117f6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmero003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmframe001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmframe001.png deleted file mode 100644 index c3c11c64d0fc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmframe001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmframe002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmframe002.png deleted file mode 100644 index 8a5d45f28dba..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmframe002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmgdist001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmgdist001.png deleted file mode 100644 index c17007800f4b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmgdist001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmgradm001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmgradm001.png deleted file mode 100644 index 411938805df0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmgradm001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmgray001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmgray001.png deleted file mode 100644 index e0f6930361ac..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmgray001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhistogram001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmhistogram001.png deleted file mode 100644 index 82ce8de5597c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhistogram001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhmax001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmhmax001.png deleted file mode 100644 index 26b7933622b1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhmax001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhmin001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmhmin001.png deleted file mode 100644 index 0ab5344c5c09..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhmin001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhomothick001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmhomothick001.png deleted file mode 100644 index cb8956e2012a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhomothick001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhomothin001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmhomothin001.png deleted file mode 100644 index b9d49046bce8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmhomothin001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmimg2se001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmimg2se001.png deleted file mode 100644 index b7a9570ed0ec..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmimg2se001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmimg2se002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmimg2se002.png deleted file mode 100644 index 6d9791a3290c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmimg2se002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mminfcanon001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mminfcanon001.png deleted file mode 100644 index 3b568475f90e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mminfcanon001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mminfgen001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mminfgen001.png deleted file mode 100644 index 82b12181a279..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mminfgen001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mminfrec001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mminfrec001.png deleted file mode 100644 index 11eee1a69ee9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mminfrec001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mminpos001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mminpos001.png deleted file mode 100644 index 18e01e05ed35..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mminpos001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mminterot001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mminterot001.png deleted file mode 100644 index e11a63f26f2b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mminterot001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmintersec001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmintersec001.png deleted file mode 100644 index c4e209cd0a06..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmintersec001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmintersec002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmintersec002.png deleted file mode 100644 index cfabb7eb4e56..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmintersec002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmisequal001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmisequal001.png deleted file mode 100644 index 0cd3e29339ef..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmisequal001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmislesseq001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmislesseq001.png deleted file mode 100644 index 7e5a7ac90ced..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmislesseq001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmlabel001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmlabel001.png deleted file mode 100644 index 1d22921b7153..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmlabel001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmlabelflat001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmlabelflat001.png deleted file mode 100644 index 033811cd46d5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmlabelflat001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmneg001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmneg001.png deleted file mode 100644 index a9c225457a37..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmneg001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopen001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmopen001.png deleted file mode 100644 index e8173a8a1d45..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopen001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenrec001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenrec001.png deleted file mode 100644 index 51cfdcc14d90..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenrec001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenrecth001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenrecth001.png deleted file mode 100644 index 68dd949cadcb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenrecth001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenth001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenth001.png deleted file mode 100644 index 926a2a0c2d93..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopenth001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf001.png deleted file mode 100644 index bbdd30f4dbde..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf002.png deleted file mode 100644 index 64156f22c008..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf003.png deleted file mode 100644 index e0e39d54db67..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmopentransf003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmpatspec001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmpatspec001.png deleted file mode 100644 index ffbe9fec9267..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmpatspec001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmregmax001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmregmax001.png deleted file mode 100644 index 268670814d96..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmregmax001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmregmin001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmregmin001.png deleted file mode 100644 index 11bfddf23d5e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmregmin001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2hmt001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2hmt001.png deleted file mode 100644 index 5974067f48be..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2hmt001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2interval001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2interval001.png deleted file mode 100644 index c244b597a812..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2interval001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2interval002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2interval002.png deleted file mode 100644 index 2c63c7baf35f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmse2interval002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsebox001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsebox001.png deleted file mode 100644 index 107396712b68..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsebox001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsecross001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsecross001.png deleted file mode 100644 index 502e3a55b1f3..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsecross001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedil001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedil001.png deleted file mode 100644 index 4dcf455d5c30..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedil001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk001.png deleted file mode 100644 index de0e13fab8dd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk002.png deleted file mode 100644 index 502e3a55b1f3..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk003.png deleted file mode 100644 index 107396712b68..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk004.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk004.png deleted file mode 100644 index fe22ea25a0bb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk004.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk005.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk005.png deleted file mode 100644 index 8312ad980105..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk005.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk006.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk006.png deleted file mode 100644 index 11e1339ab9fd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk006.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk007.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk007.png deleted file mode 100644 index ba9aa515892e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsedisk007.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmseline001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmseline001.png deleted file mode 100644 index 2d003afcd62f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmseline001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsereflect001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsereflect001.png deleted file mode 100644 index 100b4bf71bbd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsereflect001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot001.png deleted file mode 100644 index a055b2c60ea4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot002.png deleted file mode 100644 index ae2d4a4efc36..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot003.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot003.png deleted file mode 100644 index f1ba5bffdf77..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmserot003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsesum001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsesum001.png deleted file mode 100644 index e9bcd694d8d6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsesum001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsesum002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsesum002.png deleted file mode 100644 index 6edc8b97a31b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsesum002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsetrans001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsetrans001.png deleted file mode 100644 index 05667846be83..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsetrans001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmseunion001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmseunion001.png deleted file mode 100644 index f28064733b1e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmseunion001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmseunion002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmseunion002.png deleted file mode 100644 index 1a93825246a5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmseunion002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmskelm001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmskelm001.png deleted file mode 100644 index f9a932ef62bc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmskelm001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmstats001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmstats001.png deleted file mode 100644 index 49c634c5b8f5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmstats001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsubm001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsubm001.png deleted file mode 100644 index fe865bbbbe62..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsubm001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsupcanon001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsupcanon001.png deleted file mode 100644 index 9dba03081518..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsupcanon001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsupgen001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsupgen001.png deleted file mode 100644 index d41542e5ebbc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsupgen001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsuprec001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsuprec001.png deleted file mode 100644 index fc6a727f1a12..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsuprec001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsymdif001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmsymdif001.png deleted file mode 100644 index 9ed71c4d0ba8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmsymdif001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmthick001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmthick001.png deleted file mode 100644 index a193c95fb08f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmthick001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmthin001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmthin001.png deleted file mode 100644 index 9eb9cccc000c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmthin001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmthreshad001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmthreshad001.png deleted file mode 100644 index 9b0e0fc426a2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmthreshad001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmtoggle001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmtoggle001.png deleted file mode 100644 index d09494d0c7d6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmtoggle001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmtoggle002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmtoggle002.png deleted file mode 100644 index 3a247ca1cf43..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmtoggle002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmunion001.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmunion001.png deleted file mode 100644 index fbc2ee5e2a3d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmunion001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/eq_mmunion002.png b/python/plugins/sextante/pymorph/html/morph/images/eq_mmunion002.png deleted file mode 100644 index 34a8f62430de..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/eq_mmunion002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmSe_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmSe_001.jpg deleted file mode 100644 index 9629e4ef8c81..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmSe_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmaddm_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmaddm_001.jpg deleted file mode 100644 index 9f789f1012da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmaddm_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmaddm_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmaddm_002.jpg deleted file mode 100644 index d3f23a3ae91b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmaddm_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_001.jpg deleted file mode 100644 index a3ac12b2fe1d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_002.jpg deleted file mode 100644 index ac6c0b2a23de..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_003.jpg deleted file mode 100644 index 4b0047c1063f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_004.jpg deleted file mode 100644 index 5d68047c7211..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaclose_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_001.jpg deleted file mode 100644 index a3ac12b2fe1d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_002.jpg deleted file mode 100644 index 929daac8a268..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_003.jpg deleted file mode 100644 index 2287df37bc4e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_004.jpg deleted file mode 100644 index 5dc5ca8017ff..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmareaopen_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_001.jpg deleted file mode 100644 index bdb26fa0fa4a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_002.jpg deleted file mode 100644 index 0e98e48a7b62..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_003.jpg deleted file mode 100644 index a442a2a83a4d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_004.jpg deleted file mode 100644 index 363b69f5d314..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmasf_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmasfrec_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmasfrec_001.jpg deleted file mode 100644 index a442a2a83a4d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmasfrec_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmasfrec_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmasfrec_002.jpg deleted file mode 100644 index 93a9214ba1e6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmasfrec_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmbinary_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmbinary_001.jpg deleted file mode 100644 index e1188822755e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmbinary_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmbinary_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmbinary_002.jpg deleted file mode 100644 index b01b58525be9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmbinary_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_001.jpg deleted file mode 100644 index ebf0b0b3c7c7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_002.jpg deleted file mode 100644 index b6802230baf7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_003.jpg deleted file mode 100644 index 688a33efb2d5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_004.jpg deleted file mode 100644 index c6b1d19a275c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmblob_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmbshow_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmbshow_001.jpg deleted file mode 100644 index 03ea5570da62..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmbshow_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmbshow_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmbshow_002.jpg deleted file mode 100644 index fb759a2ff56e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmbshow_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_001.jpg deleted file mode 100644 index 9f64ca39b866..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_002.jpg deleted file mode 100644 index fda261dc5646..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_003.jpg deleted file mode 100644 index ccc44071def1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcbisector_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_001.jpg deleted file mode 100644 index f8cefe1f30c2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_002.jpg deleted file mode 100644 index 0f7bd59341ee..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_003.jpg deleted file mode 100644 index 258d4f66fedf..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_004.jpg deleted file mode 100644 index 68b9a9299b6d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_005.jpg deleted file mode 100644 index 12711b6704f8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_006.jpg deleted file mode 100644 index d730bdd1bc6e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_007.jpg deleted file mode 100644 index 1e0308d4c2be..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_008.jpg deleted file mode 100644 index 698933b12ba9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcdil_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcenter_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcenter_001.jpg deleted file mode 100644 index bdb26fa0fa4a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcenter_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcenter_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcenter_002.jpg deleted file mode 100644 index 1525ccb87f23..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcenter_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_001.jpg deleted file mode 100644 index 5a8a9aa13313..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_002.jpg deleted file mode 100644 index f2360c854d25..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_003.jpg deleted file mode 100644 index 7dedfe1239da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_004.jpg deleted file mode 100644 index 8732d269462c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcero_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_001.jpg deleted file mode 100644 index f8cefe1f30c2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_002.jpg deleted file mode 100644 index d752f3eae565..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_003.jpg deleted file mode 100644 index 8ea7a9e547e9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_004.jpg deleted file mode 100644 index ddc82f5d4f17..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclohole_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_001.jpg deleted file mode 100644 index f0f291806ca4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_002.jpg deleted file mode 100644 index 580a12a943c9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_003.jpg deleted file mode 100644 index 78b92996bdd6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_004.jpg deleted file mode 100644 index a3ac12b2fe1d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_005.jpg deleted file mode 100644 index 6e986f98e3d8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_006.jpg deleted file mode 100644 index 4b0047c1063f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_007.jpg deleted file mode 100644 index 6bdd00fc07df..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmclose_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserec_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserec_001.jpg deleted file mode 100644 index 97f37eda57a2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserec_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserec_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserec_002.jpg deleted file mode 100644 index 190420dff121..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserec_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserecth_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserecth_001.jpg deleted file mode 100644 index 97f37eda57a2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserecth_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserecth_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserecth_002.jpg deleted file mode 100644 index 377f242ea062..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloserecth_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloseth_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcloseth_001.jpg deleted file mode 100644 index 97f37eda57a2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloseth_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloseth_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcloseth_002.jpg deleted file mode 100644 index e241effbe7d0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcloseth_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcmp_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcmp_001.jpg deleted file mode 100644 index 9f789f1012da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcmp_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcmp_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcmp_002.jpg deleted file mode 100644 index 8ed7b610f3be..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcmp_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmconcat_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmconcat_001.jpg deleted file mode 100644 index 1dde514b1e37..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmconcat_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_001.jpg deleted file mode 100644 index 7871f0247c0f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_002.jpg deleted file mode 100644 index d98c188fe4e7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_003.jpg deleted file mode 100644 index 62a3878737a9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_004.jpg deleted file mode 100644 index 92d35a442c6f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcthick_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_001.jpg deleted file mode 100644 index 5c1b4d80cbfe..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_002.jpg deleted file mode 100644 index e5e8c49b40a4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_003.jpg deleted file mode 100644 index 5e65b74e50cf..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmcwatershed_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_001.jpg deleted file mode 100644 index d584e5af2e7f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_002.jpg deleted file mode 100644 index b30b103d1c37..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_003.jpg deleted file mode 100644 index 75cf10a983c0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_004.jpg deleted file mode 100644 index 6815f2278ef9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_005.jpg deleted file mode 100644 index 9d76e8ee6940..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_006.jpg deleted file mode 100644 index be6bbf3101f4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdairport_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_001.jpg deleted file mode 100644 index fdefbfed4c92..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_002.jpg deleted file mode 100644 index 6fb1550effe9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_003.jpg deleted file mode 100644 index c89f2f9cb954..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdarea_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_001.jpg deleted file mode 100644 index b48d74defd28..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_002.jpg deleted file mode 100644 index 08d43b23a501..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_003.jpg deleted file mode 100644 index 804c37fe62b7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_004.jpg deleted file mode 100644 index 6d25eb6d699c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_005.jpg deleted file mode 100644 index 1b57c2a4a629..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_006.jpg deleted file mode 100644 index b48d74defd28..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_007.jpg deleted file mode 100644 index 9bd973b9f35e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdasp_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_001.jpg deleted file mode 100644 index 83ae7b956b95..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_002.jpg deleted file mode 100644 index e64386116cf0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_003.jpg deleted file mode 100644 index bb75f6ab65aa..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_004.jpg deleted file mode 100644 index 73398c751d24..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_005.jpg deleted file mode 100644 index fa592f10e952..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_006.jpg deleted file mode 100644 index d84d371b888f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_007.jpg deleted file mode 100644 index e489a74086ec..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbeef_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_001.jpg deleted file mode 100644 index ebf0b0b3c7c7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_002.jpg deleted file mode 100644 index d7824f57d909..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_003.jpg deleted file mode 100644 index 8cbc98afaceb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_004.jpg deleted file mode 100644 index 39a57fcac65f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_005.jpg deleted file mode 100644 index 9ff809de1671..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_006.jpg deleted file mode 100644 index 8c3dc3e1cbb1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_007.jpg deleted file mode 100644 index 09566610a8ef..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdblob_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_001.jpg deleted file mode 100644 index b47ec5bd7653..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_002.jpg deleted file mode 100644 index 7b3ec572967c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_003.jpg deleted file mode 100644 index 3a74322c7114..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_004.jpg deleted file mode 100644 index 9df66cd8871f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_005.jpg deleted file mode 100644 index 1d2cff0752c5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_006.jpg deleted file mode 100644 index 3bdd75a0c08b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_007.jpg deleted file mode 100644 index bbb9ce5b74d4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdbrain_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_001.jpg deleted file mode 100644 index 9f789f1012da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_002.jpg deleted file mode 100644 index 3723ac76affd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_003.jpg deleted file mode 100644 index 61572b9b9171..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_004.jpg deleted file mode 100644 index 1997ec15af75..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_005.jpg deleted file mode 100644 index 157e536909fb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_006.jpg deleted file mode 100644 index 4d40473f9eb0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_007.jpg deleted file mode 100644 index 6eac57f4c8f0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_008.jpg deleted file mode 100644 index 99d8fac233b6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_009.jpg deleted file mode 100644 index 7584a6b3179f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcalc_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_001.jpg deleted file mode 100644 index 2287df37bc4e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_002.jpg deleted file mode 100644 index cdc869dcbc51..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_003.jpg deleted file mode 100644 index 8f24e8365769..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_004.jpg deleted file mode 100644 index 268a6c783837..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_005.jpg deleted file mode 100644 index cace2f4b2fd4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_006.jpg deleted file mode 100644 index 2aaf45f649a9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_007.jpg deleted file mode 100644 index c81ccfdbf6dd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_008.jpg deleted file mode 100644 index 06fc4dba5ef7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_009.jpg deleted file mode 100644 index 973ccbd55d8e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_010.jpg deleted file mode 100644 index 61925d94c902..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_011.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_011.jpg deleted file mode 100644 index 6b985fde0603..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_011.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_012.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_012.jpg deleted file mode 100644 index 3b73638b5204..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcells_012.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_001.jpg deleted file mode 100644 index e763595fc5fc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_002.jpg deleted file mode 100644 index 67c147b7f8c7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_003.jpg deleted file mode 100644 index ae0158122541..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_004.jpg deleted file mode 100644 index 6db57f6d8a83..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_005.jpg deleted file mode 100644 index befb199b9de5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_006.jpg deleted file mode 100644 index b663a2064c6b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_007.jpg deleted file mode 100644 index 1dc32cca7205..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_008.jpg deleted file mode 100644 index 48bf2d3d0a7a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_009.jpg deleted file mode 100644 index 7c43c0ae558c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_010.jpg deleted file mode 100644 index 1de6bf012061..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdchickparts_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_001.jpg deleted file mode 100644 index a2ac9639b55e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_004.jpg deleted file mode 100644 index 3c430576c350..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_005.jpg deleted file mode 100644 index 787e8c4c8ca9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_006.jpg deleted file mode 100644 index bcbc2b5e896d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_007.jpg deleted file mode 100644 index 39363561283b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdconcrete_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_001.jpg deleted file mode 100644 index 73c45c1bd5a7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_002.jpg deleted file mode 100644 index 181687de72f5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_003.jpg deleted file mode 100644 index 5f02804f4a62..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_004.jpg deleted file mode 100644 index 6ae12548f29b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_005.jpg deleted file mode 100644 index db5c6d1de9a4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcookies_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_001.jpg deleted file mode 100644 index 0a95e7c3eb23..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_002.jpg deleted file mode 100644 index aeb57009b1c1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_003.jpg deleted file mode 100644 index d996fc6c5260..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_004.jpg deleted file mode 100644 index 9e4d173341df..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_005.jpg deleted file mode 100644 index e6df73bda02e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_006.jpg deleted file mode 100644 index 2973049e6d1c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_007.jpg deleted file mode 100644 index e46d9b12b76c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_008.jpg deleted file mode 100644 index 0ccb4b5b2286..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_009.jpg deleted file mode 100644 index 85259a9a1e04..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_010.jpg deleted file mode 100644 index 0d8f254157e0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdcornea_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_001.jpg deleted file mode 100644 index a442a2a83a4d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_002.jpg deleted file mode 100644 index 61a01fcfea80..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_003.jpg deleted file mode 100644 index 72e1c8a15442..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_004.jpg deleted file mode 100644 index e7bd264e26e8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_005.jpg deleted file mode 100644 index 362a15efb1c1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_006.jpg deleted file mode 100644 index 9021f99281f1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_007.jpg deleted file mode 100644 index 79270fb1e2dd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_008.jpg deleted file mode 100644 index 38f01902219f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_009.jpg deleted file mode 100644 index 090133585640..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_010.jpg deleted file mode 100644 index 6b8b42ca349c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_011.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_011.jpg deleted file mode 100644 index c86eb1602692..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_011.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_012.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_012.jpg deleted file mode 100644 index a442a2a83a4d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfabric_012.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_001.jpg deleted file mode 100644 index 97f37eda57a2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_002.jpg deleted file mode 100644 index 2ac1adfd857b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_003.jpg deleted file mode 100644 index 4460c85bffd8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_004.jpg deleted file mode 100644 index df89c747a5f3..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_005.jpg deleted file mode 100644 index 3b269d6b1fc9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_006.jpg deleted file mode 100644 index 5de5c43c3b4e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_007.jpg deleted file mode 100644 index cee6351960e3..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_008.jpg deleted file mode 100644 index a00a9e45812f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_009.jpg deleted file mode 100644 index 2aaef963ed50..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdfila_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_001.jpg deleted file mode 100644 index 7c4942dadfca..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_002.jpg deleted file mode 100644 index 7c4942dadfca..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_003.jpg deleted file mode 100644 index 6c2ffbd7b76b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_004.jpg deleted file mode 100644 index d2773abbfd49..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_005.jpg deleted file mode 100644 index f6f9d4d9f36b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_006.jpg deleted file mode 100644 index 9c60951980bc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_007.jpg deleted file mode 100644 index 9e3cf1229a11..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_008.jpg deleted file mode 100644 index ee8dde6293ac..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_009.jpg deleted file mode 100644 index 6d680f382155..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_010.jpg deleted file mode 100644 index 6fa4b6457f63..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflatzone_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_001.jpg deleted file mode 100644 index 9142be95dce9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_002.jpg deleted file mode 100644 index f919a067ba88..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_003.jpg deleted file mode 100644 index 2463d8807264..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_004.jpg deleted file mode 100644 index 93a9b59621fe..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_005.jpg deleted file mode 100644 index 9142be95dce9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_006.jpg deleted file mode 100644 index e0bb0e041940..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdflow_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_001.jpg deleted file mode 100644 index bdb26fa0fa4a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_002.jpg deleted file mode 100644 index 0eb94f152cd7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_003.jpg deleted file mode 100644 index 38f91f262791..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_004.jpg deleted file mode 100644 index 96786c902e0b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdgear_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_001.jpg deleted file mode 100644 index b6b8ba84bbe7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_002.jpg deleted file mode 100644 index 822661eeb266..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_003.jpg deleted file mode 100644 index 528d1cfe8a4c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_004.jpg deleted file mode 100644 index 8291337d1eeb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_005.jpg deleted file mode 100644 index 88e04ba51b5c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_006.jpg deleted file mode 100644 index 2471eeddd995..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_007.jpg deleted file mode 100644 index 1eac9c12d177..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_008.jpg deleted file mode 100644 index 8393f8e2c86b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_009.jpg deleted file mode 100644 index 64c1dcaabcbb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdholecenter_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_001.jpg deleted file mode 100644 index f0f291806ca4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_002.jpg deleted file mode 100644 index 405c0b1d08c0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_003.jpg deleted file mode 100644 index 8cbe2cb4a76d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_004.jpg deleted file mode 100644 index ed9259ff8d54..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_005.jpg deleted file mode 100644 index 3206782b035f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdil_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_001.jpg deleted file mode 100644 index a8385b0ad3ce..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_002.jpg deleted file mode 100644 index d6f60ce4719d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_003.jpg deleted file mode 100644 index 18cba75b8861..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_004.jpg deleted file mode 100644 index 06c30042c86b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdist_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_001.jpg deleted file mode 100644 index 6add74226ab2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_002.jpg deleted file mode 100644 index 1270e3cd0c80..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_003.jpg deleted file mode 100644 index eeffb3401c04..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_004.jpg deleted file mode 100644 index 7a88d2ccd930..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlabeltext_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_001.jpg deleted file mode 100644 index 048951ac5951..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_002.jpg deleted file mode 100644 index a273428be59f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_003.jpg deleted file mode 100644 index cfaec5d24296..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_004.jpg deleted file mode 100644 index dfb84c2dbd71..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_005.jpg deleted file mode 100644 index 63e5e3068b8e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_006.jpg deleted file mode 100644 index fc4d05dbad9d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_007.jpg deleted file mode 100644 index 913b531a9ff1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_008.jpg deleted file mode 100644 index 394cc7b6d9dd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdleaf_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_001.jpg deleted file mode 100644 index 2d2948ae58f9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_002.jpg deleted file mode 100644 index d305c9a1a355..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_003.jpg deleted file mode 100644 index 48d7ebefd516..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_004.jpg deleted file mode 100644 index 632abf8aa170..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_005.jpg deleted file mode 100644 index 71d2ba11ed4e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_006.jpg deleted file mode 100644 index 725d76b9f88f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_007.jpg deleted file mode 100644 index c4900bd29544..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_008.jpg deleted file mode 100644 index 508e196588f4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_009.jpg deleted file mode 100644 index c824a1b223ed..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_010.jpg deleted file mode 100644 index 60080345c171..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdlith_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_001.jpg deleted file mode 100644 index f8cefe1f30c2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_002.jpg deleted file mode 100644 index d752f3eae565..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_003.jpg deleted file mode 100644 index 92c007476d54..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_004.jpg deleted file mode 100644 index 4360bf13e2f6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_005.jpg deleted file mode 100644 index a4390afdd055..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_006.jpg deleted file mode 100644 index d2ea95b40d99..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_007.jpg deleted file mode 100644 index 6d99dba288f9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_008.jpg deleted file mode 100644 index cce77abcc94b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_009.jpg deleted file mode 100644 index c6fc5055143d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_010.jpg deleted file mode 100644 index 2100c1053247..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_011.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_011.jpg deleted file mode 100644 index 7ab700d610c8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_011.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_012.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_012.jpg deleted file mode 100644 index e49f6f15a8a6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_012.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_013.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_013.jpg deleted file mode 100644 index 7a07df82637a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_013.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_014.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_014.jpg deleted file mode 100644 index 7a07df82637a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpcb_014.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_001.jpg deleted file mode 100644 index 41e5a02ccfcd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_002.jpg deleted file mode 100644 index f37c89a671e7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_003.jpg deleted file mode 100644 index 267ad2e6b3f2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_004.jpg deleted file mode 100644 index da0edcba1e68..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_005.jpg deleted file mode 100644 index edb11e56e05a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_006.jpg deleted file mode 100644 index 4efd38c5a6e2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_007.jpg deleted file mode 100644 index 35d05110c3ad..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_008.jpg deleted file mode 100644 index 09677a091159..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_009.jpg deleted file mode 100644 index 86ce5af24236..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_010.jpg deleted file mode 100644 index edf8c5ff3bed..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_011.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_011.jpg deleted file mode 100644 index 5417818e5b81..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_011.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_012.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_012.jpg deleted file mode 100644 index a046d861b17b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_012.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_013.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_013.jpg deleted file mode 100644 index 38cec36da7a2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpieces_013.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_001.jpg deleted file mode 100644 index 4a68580296a5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_002.jpg deleted file mode 100644 index 4ee9b73dbd39..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_003.jpg deleted file mode 100644 index 9f13fc545ba6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_004.jpg deleted file mode 100644 index b044e4fa0d16..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_005.jpg deleted file mode 100644 index 5e4c9eb63002..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_006.jpg deleted file mode 100644 index 4a68580296a5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_007.jpg deleted file mode 100644 index fa40274ea336..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdpotatoes_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrawv_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdrawv_001.jpg deleted file mode 100644 index 39f27de97d58..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrawv_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_001.jpg deleted file mode 100644 index 676480c3d70d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_002.jpg deleted file mode 100644 index 51fa29ab032f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_003.jpg deleted file mode 100644 index afe0d4246377..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_004.jpg deleted file mode 100644 index 79b106236dca..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdrobotop_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_001.jpg deleted file mode 100644 index e1188822755e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_002.jpg deleted file mode 100644 index fe5fba886400..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_003.jpg deleted file mode 100644 index 6bd6f5aa3ca8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_004.jpg deleted file mode 100644 index cdb5788d6419..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_005.jpg deleted file mode 100644 index 9ebfecab4176..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_006.jpg deleted file mode 100644 index 714b947e827b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_007.jpg deleted file mode 100644 index 16ac2678a1ab..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_008.jpg deleted file mode 100644 index df786819a8bf..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_009.jpg deleted file mode 100644 index b3322d2bbd67..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_010.jpg deleted file mode 100644 index 4814f6c1b7a6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdruler_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_001.jpg deleted file mode 100644 index 28e1fbbe03da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_002.jpg deleted file mode 100644 index 335b3ac564d0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_003.jpg deleted file mode 100644 index 1cbc5659523f..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_004.jpg deleted file mode 100644 index 86d6b1ffef8a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_005.jpg deleted file mode 100644 index 184e6e1aa75b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdsoil_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdtshow_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdtshow_001.jpg deleted file mode 100644 index da568992c61e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdtshow_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmdtshow_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmdtshow_002.jpg deleted file mode 100644 index 5069d18b5903..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmdtshow_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmedgeoff_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmedgeoff_001.jpg deleted file mode 100644 index a3ac12b2fe1d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmedgeoff_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmedgeoff_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmedgeoff_002.jpg deleted file mode 100644 index 24ab7be0ae92..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmedgeoff_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_001.jpg deleted file mode 100644 index b6b8ba84bbe7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_002.jpg deleted file mode 100644 index 63a32363f63c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_003.jpg deleted file mode 100644 index 028511626834..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_004.jpg deleted file mode 100644 index ce7188aa16c1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmendpoints_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmero_001.jpg deleted file mode 100644 index f0f291806ca4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmero_002.jpg deleted file mode 100644 index e86288a0a20e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmero_003.jpg deleted file mode 100644 index 4de7ce5b9402..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmero_004.jpg deleted file mode 100644 index ed9259ff8d54..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmero_005.jpg deleted file mode 100644 index 0e2d9fa262a4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmero_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgdist_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgdist_001.jpg deleted file mode 100644 index d34f9eec0ace..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgdist_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgdist_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgdist_002.jpg deleted file mode 100644 index caab6b6d7ad9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgdist_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_001.jpg deleted file mode 100644 index 70e176af387c..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_002.jpg deleted file mode 100644 index 600f9a8bb275..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_003.jpg deleted file mode 100644 index 48295811c09e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_004.jpg deleted file mode 100644 index a4f7b2d80271..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_005.jpg deleted file mode 100644 index 2287df37bc4e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_006.jpg deleted file mode 100644 index cc0a92bc11aa..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgradm_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgrain_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgrain_001.jpg deleted file mode 100644 index b48d74defd28..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgrain_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmgrain_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmgrain_002.jpg deleted file mode 100644 index f2a58c93943b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmgrain_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmhistogram_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmhistogram_001.jpg deleted file mode 100644 index 5e8954951de1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmhistogram_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_001.jpg deleted file mode 100644 index 2d2948ae58f9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_002.jpg deleted file mode 100644 index 3b95333af4cc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_003.jpg deleted file mode 100644 index 423360ea62dd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmax_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_001.jpg deleted file mode 100644 index 2d2948ae58f9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_002.jpg deleted file mode 100644 index 7f537d80bee3..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_003.jpg deleted file mode 100644 index cdeb3acfa048..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmhmin_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_001.jpg deleted file mode 100644 index c2bdb47f31b1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_002.jpg deleted file mode 100644 index 5a8c9b98df31..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_003.jpg deleted file mode 100644 index 63ade440d1df..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_004.jpg deleted file mode 100644 index 12711b6704f8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_005.jpg deleted file mode 100644 index d730bdd1bc6e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_006.jpg deleted file mode 100644 index 698933b12ba9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_007.jpg deleted file mode 100644 index 4f0fc0f2c315..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mminfrec_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_001.jpg deleted file mode 100644 index d7c9148d3c96..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_002.jpg deleted file mode 100644 index a3ac12b2fe1d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_003.jpg deleted file mode 100644 index 0d7f9d4724e6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_004.jpg deleted file mode 100644 index c4e31aa6dc45..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_005.jpg deleted file mode 100644 index 72e90927dfd2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_006.jpg deleted file mode 100644 index a0ab5a245f49..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_007.jpg deleted file mode 100644 index e31a15a0451e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmintersec_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabel_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlabel_001.jpg deleted file mode 100644 index ebf0b0b3c7c7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabel_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabel_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlabel_002.jpg deleted file mode 100644 index 4b9000e600af..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabel_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_001.jpg deleted file mode 100644 index bfe011d09688..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_002.jpg deleted file mode 100644 index bbd7ab10fcea..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_003.jpg deleted file mode 100644 index ed9259ff8d54..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_004.jpg deleted file mode 100644 index 6ddbe6228dd5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlabelflat_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_001.jpg deleted file mode 100644 index 050f00515ee9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_002.jpg deleted file mode 100644 index 4b9000e600af..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_003.jpg deleted file mode 100644 index d7824f57d909..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmlblshow_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_001.jpg deleted file mode 100644 index bdb26fa0fa4a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_002.jpg deleted file mode 100644 index 1863ca61a024..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_003.jpg deleted file mode 100644 index b48d74defd28..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_004.jpg deleted file mode 100644 index 52b573e5c438..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmneg_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_001.jpg deleted file mode 100644 index f0f291806ca4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_002.jpg deleted file mode 100644 index 3d43006e1f59..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_003.jpg deleted file mode 100644 index 2cd4f477a807..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_004.jpg deleted file mode 100644 index f8cefe1f30c2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_005.jpg deleted file mode 100644 index 345ce5a286e3..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_006.jpg deleted file mode 100644 index 64308ad4e78e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_007.jpg deleted file mode 100644 index b48d74defd28..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_008.jpg deleted file mode 100644 index 0a7654547520..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopen_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopenth_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopenth_001.jpg deleted file mode 100644 index 9f789f1012da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopenth_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopenth_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopenth_002.jpg deleted file mode 100644 index 2c35a9331cb4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopenth_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_001.jpg deleted file mode 100644 index 5aa145af6ec7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_002.jpg deleted file mode 100644 index ac91755ad440..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_003.jpg deleted file mode 100644 index b6cbcde08a76..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmopentransf_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmreadgray_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmreadgray_001.jpg deleted file mode 100644 index 73c45c1bd5a7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmreadgray_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_001.jpg deleted file mode 100644 index a15cb978bcfb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_002.jpg deleted file mode 100644 index b4f539585f6a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_003.jpg deleted file mode 100644 index 99dfa8d5bc54..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_004.jpg deleted file mode 100644 index 43b8bb809b06..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_005.jpg deleted file mode 100644 index 9423f67b316a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmregmin_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_001.jpg deleted file mode 100644 index 60ce159e04a8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_002.jpg deleted file mode 100644 index bb2ca5ba782d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_003.jpg deleted file mode 100644 index 9cafa0562f91..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_004.jpg deleted file mode 100644 index 100ae2d953eb..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_005.jpg deleted file mode 100644 index d05237b317e6..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_006.jpg deleted file mode 100644 index 968c6e18ff67..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsedisk_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmseline_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmseline_001.jpg deleted file mode 100644 index 1f901915a1da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmseline_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmseline_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmseline_002.jpg deleted file mode 100644 index 0bfd16780f92..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmseline_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmseshow_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmseshow_001.jpg deleted file mode 100644 index 9629e4ef8c81..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmseshow_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_001.jpg deleted file mode 100644 index b47ec5bd7653..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_002.jpg deleted file mode 100644 index 13c13e8548fa..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_003.jpg deleted file mode 100644 index de8e8d2e880a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmshow_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_001.jpg deleted file mode 100644 index b6b8ba84bbe7..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_002.jpg deleted file mode 100644 index 1b733639d9ad..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_003.jpg deleted file mode 100644 index e4ae8ffc0e1b..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmskelm_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmskiz_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmskiz_001.jpg deleted file mode 100644 index d41a6bcc095d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmskiz_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmskiz_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmskiz_002.jpg deleted file mode 100644 index ae9ca9cc7b97..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmskiz_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_001.jpg deleted file mode 100644 index f92ada03a9e0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_002.jpg deleted file mode 100644 index 8ea7a9e547e9..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_003.jpg deleted file mode 100644 index c023bd39b6fd..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsubm_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsupgen_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsupgen_001.jpg deleted file mode 100644 index bdb26fa0fa4a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsupgen_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsupgen_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsupgen_002.jpg deleted file mode 100644 index 2c17fd5e691e..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsupgen_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_001.jpg deleted file mode 100644 index c4e31aa6dc45..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_002.jpg deleted file mode 100644 index 72e90927dfd2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_003.jpg deleted file mode 100644 index afb922ae72bc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmsymdif_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmthin_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmthin_001.jpg deleted file mode 100644 index 6505973c7bc0..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmthin_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmthin_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmthin_002.jpg deleted file mode 100644 index f9ffe7449cf8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmthin_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_001.jpg deleted file mode 100644 index 9f789f1012da..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_002.jpg deleted file mode 100644 index dfd8dd3ae830..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_003.jpg deleted file mode 100644 index 278ce5f54119..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmthreshad_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_001.jpg deleted file mode 100644 index 122a9607d1f8..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_002.jpg deleted file mode 100644 index bec835197b2a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_003.jpg deleted file mode 100644 index 5e8954951de1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_004.jpg deleted file mode 100644 index 32de740f4537..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmtoggle_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_001.jpg deleted file mode 100644 index d7c9148d3c96..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_002.jpg deleted file mode 100644 index a3ac12b2fe1d..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_003.jpg deleted file mode 100644 index 4de3d54b21d4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_004.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_004.jpg deleted file mode 100644 index 97f37eda57a2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_004.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_005.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_005.jpg deleted file mode 100644 index 95c3f496c8aa..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_005.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_006.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_006.jpg deleted file mode 100644 index df023b371da5..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_006.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_007.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_007.jpg deleted file mode 100644 index c4e31aa6dc45..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_007.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_008.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_008.jpg deleted file mode 100644 index 72e90927dfd2..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_008.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_009.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_009.jpg deleted file mode 100644 index a0ab5a245f49..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_009.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_010.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_010.jpg deleted file mode 100644 index f543ac18acc1..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmunion_010.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_001.jpg deleted file mode 100644 index b48d74defd28..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_002.jpg deleted file mode 100644 index 8fb5848d89d4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_003.jpg deleted file mode 100644 index dac854c31c96..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmvmax_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_001.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_001.jpg deleted file mode 100644 index 5c1b4d80cbfe..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_001.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_002.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_002.jpg deleted file mode 100644 index 59e1ac038056..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_002.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_003.jpg b/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_003.jpg deleted file mode 100644 index 7bc0fd439cdc..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/img_mmwatershed_003.jpg and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdblob_008.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmdblob_008.png deleted file mode 100644 index e3c922af0b30..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdblob_008.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdconcrete_002.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmdconcrete_002.png deleted file mode 100644 index 7368c277ceef..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdconcrete_002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdconcrete_003.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmdconcrete_003.png deleted file mode 100644 index dafa41cff57a..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdconcrete_003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdfabric_013.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmdfabric_013.png deleted file mode 100644 index 5074feb35896..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmdfabric_013.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmhistogram_002.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmhistogram_002.png deleted file mode 100644 index 2afc065d7f97..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmhistogram_002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_001.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_001.png deleted file mode 100644 index e551633c6547..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_001.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_002.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_002.png deleted file mode 100644 index b0a5f708af30..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_002.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_003.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_003.png deleted file mode 100644 index 0b819914da92..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_003.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_004.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_004.png deleted file mode 100644 index fa7959c7f3e4..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_004.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_005.png b/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_005.png deleted file mode 100644 index 8e069aae9eb3..000000000000 Binary files a/python/plugins/sextante/pymorph/html/morph/images/plt_mmplot_005.png and /dev/null differ diff --git a/python/plugins/sextante/pymorph/html/morph/index.html b/python/plugins/sextante/pymorph/html/morph/index.html deleted file mode 100644 index 4e4ded8640f4..000000000000 --- a/python/plugins/sextante/pymorph/html/morph/index.html +++ /dev/null @@ -1,219 +0,0 @@ - - - - pymorph Morphology Toolbox V0.8 01Aug03 - - - - - - - - -
        - [Up] - - [Demonstrations] - - [Basic Concepts] - - [Functions] - - [Data Types] - pymorph Morphology Toolbox V0.8 01Aug03
        -

        pymorph Morphology Toolbox -
        - Morphological image processing tools for Python. - -

        -

        On-line Documentation

        -
        - - - - - - - - - - - - - - - -
        Demonstrations
        Basic Concepts
        Functions
        Data Types
        -
        -

        All functions in alphabetical order

        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        int32mmadd4dilmmaddmmmareaclosemmareaopen
        mmasfmmasfrecmmbenchmmbinarymmblob
        mmbshowmmcbisectormmcdilmmcentermmcero
        mmcloholemmclosemmcloserecmmcloserecthmmcloseth
        mmcmpmmconcatmmcthickmmcthinmmcwatershed
        mmdairportmmdareammdaspmmdatatypemmdbeef
        mmdblobmmdbrainmmdcalcmmdcellsmmdchickparts
        mmdconcretemmdcookiesmmdcorneammdfabricmmdfila
        mmdflatzonemmdflowmmdgearmmdholecentermmdil
        mmdistmmdlabeltextmmdleafmmdlithmmdpcb
        mmdpiecesmmdpotatoesmmdrawvmmdrobotopmmdruler
        mmdsoilmmdtshowmmedgeoffmmendpointsmmero
        mmframemmfreedommmgdistmmglblshowmmgradm
        mmgrainmmgraymmgshowmmhistogrammmhmax
        mmhminmmhomothickmmhomothinmmimg2semminfcanon
        mminfgenmminfrecmminposmminstallmminterot
        mmintersecmmintershowmmismmisbinarymmisequal
        mmislesseqmmlabelmmlabelflatmmlblshowmmlimits
        mmmat2setmmmaxleveltypemmnegmmopenmmopenrec
        mmopenrecthmmopenthmmopentransfmmpad4nmmpatspec
        mmplotmmreadgraymmregistermmregmaxmmregmin
        mmse2hmtmmse2intervalmmseboxmmsecrossmmsedil
        mmsediskmmselinemmsereflectmmserotmmseshow
        mmsesummmset2matmmsetransmmseunionmmshow
        mmskelmmmskelmrecmmskizmmstatsmmsubm
        mmsupcanonmmsupgenmmsuprecmmswatershedmmsymdif
        mmtextmmthickmmthinmmthreshadmmtoggle
        mmunionmmvdomemmversionmmvmaxmmwatershed
        uint16uint8
        -
        -
        - - - - - - - - -
        - [Up] - - [Demonstrations] - - [Basic Concepts] - - [Functions] - - [Data Types] - Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/index.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/index.html deleted file mode 100644 index e9d889894921..000000000000 --- a/python/plugins/sextante/pymorph/html/morph/mmdemos/index.html +++ /dev/null @@ -1,193 +0,0 @@ - - - - Demonstrations - - - - - - - - -
        - [Up] - - [Demonstrations] - - [Basic Concepts] - - [Functions] - - [Data Types] - pymorph Morphology Toolbox V0.8 01Aug03
        -

        Demonstrations -
        - List of real problems solved by the toolbox - -

        -

        Demonstrations

        -
        - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
        mmdairportDetecting runways in satellite airport imagery. -
        mmdareaRemove objects with small areas in binary images. -
        mmdaspDetect the missing aspirin tablets in a card of aspirin tablets. -
        mmdlabeltextSegmenting letters, words and paragraphs. -
        mmdbeefDetect the lean meat region in a beef steak image. -
        mmdblobDemonstrate blob measurements and display. -
        mmdbrainExtract the lateral ventricle from an MRI image of the brain. -
        mmdcalcExtract the keys of a calculator. -
        mmdcellsExtract blood cells and separate them. -
        mmdchickpartsClassify chicken parts in breast, legs+tights and wings -
        mmdconcreteAggregate and anhydrous phase extraction from a concrete section observed by a SEM image. -
        mmdcookiesDetect broken rounded biscuits. -
        mmdcorneaCornea cells marking. -
        mmdfabricDetection of vertical weave in fabrics. -
        mmdfilaDetect Filarial Worms. -
        mmdflatzoneFlat-zone image simplification by connected filtering. -
        mmdflowDetect water in a static image of an oil-water flow experiment. -
        mmdgearDetect the teeth of a gear -
        mmdholecenterHole center misalignment in PCB. -
        mmdleafSegment a leaf from the background -
        mmdlithDetect defects in a microelectronic circuit. -
        mmdpcbDecompose a printed circuit board in its main parts. -
        mmdpiecesClassify two dimensional pieces. -
        mmdpotatoesGrade potato quality by shape and skin spots. -
        mmdrobotopDetect marks on a robot. -
        mmdrulerDetect defects in a ruler. -
        mmdsoilDetect fractures in soil. -
        -
        -
        - - - - - - - - -
        - [Up] - - [Demonstrations] - - [Basic Concepts] - - [Functions] - - [Data Types] - Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        -
        - - \ No newline at end of file diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdairport.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdairport.html deleted file mode 100644 index 3d3e5e9d6feb..000000000000 --- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdairport.html +++ /dev/null @@ -1,243 +0,0 @@ - - - - mmdairport - - - - - - - - -
        - [Up] - - [mmdarea] - Demonstrations
        -

        mmdairport -
        - Detecting runways in satellite airport imagery. - -

        -
        -

        Description

        -
        -

        - In this example, a satellite image of an airport is processed. The aim is to detect the runways which are characterized by thin, long and straight features. An open top-hat is first used to enhance the runways. A rough thresholding followed by a thinning operator gives most of the thin structures of the image. They can filtered by selecting only closed features with sufficient length. This result is used as a marker to reconstruct the original gray-scale image, giving as output a gray-scale enhanced airport runways, which can be finally thresholded. - -

        -
        -
        -
        -

        Demo Script

        -
        -
        -

        Reading

        -
        -

        -

        - The satellite image of the airport is read. - -

        -
        -
        - 
        >>> f = mmreadgray('galeao.jpg')
        - 
        
-                  
        >>> mmshow(f)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        First, enhance the runways by an open top-hat.
        
-          
        
-            
        
-              
        
-                        The disk of radius 5 (diameter 11) is chosen to detect features  smaller than this size. For visualization, the top-hat image is brightened by 150 gray-levels.
-                    
-              
        
-              
        
-                
        
-                  
        >>> th=mmopenth(f,mmsedisk(5))
        
-                  
        
-                  
        >>> mmshow(mmaddm(th, 150))
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        mmaddm(th, 150)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Followed by a thresholding.
        
-          
        
-            
        
-              
        
-                        A thresholding is applied to detect the features enhanced by the top-hat. This is a standard top-hat sequence.
-                    
-              
        
-              
        
-                
        
-                  
        >>> bin=mmthreshad(th,30)
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(f,bin)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f,bin
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thinning, pruning and area open.
        
-          
        
-            
        
-              
        
-                        The thinning (red) and pruning (green) detect closed structures which characterized the runways structure. The area open (blue) selects only very long features, with more than 1000 pixels.
-                    
-              
        
-              
        
-                
        
-                  
        >>> m1=mmthin(bin)
        
-                  
        
-                  
        >>> m2=mmthin(m1,mmendpoints())
        
-                  
        
-                  
        >>> m=mmareaopen(m2,1000,mmsebox())
        
-                  
        
-                  
        >>> mmshow(f,m1,m2,m)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f,m1,m2,m
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Reconstruction.
        
-          
        
-            
        
-              
        
-                        The previous result is a sample of the runway pixels. It is used as a marker for  gray-scale morphological reconstruction. The runways are enhanced in the reconstructed image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g=mminfrec(mmgray(m), th)
        
-                  
        
-                  
        >>> mmshow(g)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        g
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final thresholding.
        
-          
        
-            
        
-              
        
-                        A thresholding is applied to the reconstructed image, detecting the airport runways.
-                    
-              
        
-              
        
-                
        
-                  
        >>> final=mmthreshad(g, 20)
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(f, final)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f, final
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [Up]
-                    
-                    [mmdarea]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdarea.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdarea.html
deleted file mode 100644
index c3fab6442ec3..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdarea.html
+++ /dev/null
@@ -1,148 +0,0 @@
-
-  
-    
-    mmdarea
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdairport]
-              
-                  [Up]
-                  
-                  [mmdasp]
-              Demonstrations
        
-    
        mmdarea
-      
        
-      Remove objects with small areas in binary images.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      In this example, the image of an electric circuit diagram is processed. The circuit diagram image is composed of two kinds of objects: the circuit itself, that has a large area, and the letters, that have small areas. Eliminating all the objects that have area less than 200, we get the image that contains only the circuit diagram.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading 
        
-          
        
-            
        
-              
        
-                        The binary image to be processed is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('circuit_bw.tif')
        
-                  
        
-                  
        >>> mmshow(a)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Filtering
        
-          
        
-            
        
-              
        
-                        The procedure areaopen removes the objects with area less than the specified parameter (i.e., 200).
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmareaopen(a,200)
        
-                  
        
-                  
        >>> mmshow(b)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        For displaying purposes the filtered image is superposed over the original image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,b)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,b
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdairport]
-                
-                    [Up]
-                    
-                    [mmdasp]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdasp.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdasp.html
deleted file mode 100644
index ca575206a780..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdasp.html
+++ /dev/null
@@ -1,197 +0,0 @@
-
-  
-    
-    mmdasp
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdarea]
-              
-                  [Up]
-                  
-                  [mmdlabeltext]
-              Demonstrations
        
-    
        mmdasp
-      
        
-      Detect the missing aspirin tablets in a card of aspirin tablets.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is the gray-scale image of an aspirin card (figure 1.3.a), with one tablet missing. The objective is detecting this missing tablet by exploring the particular gray-scale characteristics of this region of the image. Note that the tablets are circular large white areas of the image. This procedure explores the gray-scale area open operator. This is a very good illustration of image segmentation without the use of thresholding.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The aspirin tablet binary image is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('astablet.tif')
        
-                  
        
-                  
        >>> mmshow(a)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Gray-scale image as topographical surface
        
-          
        
-            
        
-              
        
-                        The image can be model as a topographical surface where white regions corresponds to high altitude and dark regions to lower altitute. The regional maxima of the image is normally very noisy as can be seen below.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmsurf(a)
        
-                  
        
-                  
        >>> mmshow(b)
        
-                  
        
-                  
        >>> c = mmregmax(a,mmsebox())
        
-                  
        
-                  
        >>> mmshow(b,c)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        bb,c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Open by disk and regional maximum
        
-          
        
-            
        
-              
        
-                        Opening the original image by a disk a little smaller than the tablets removes  all the noisy regional maxima. The only regional maxima in the opened image are the aspirin tablets as they are the only regionally brighter regions of shape larger than the disk of radius 20 pixels.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmopen(a, mmsedisk(20))
        
-                  
        
-                  
        >>> e = mmsurf(d)
        
-                  
        
-                  
        >>> mmshow(e)
        
-                  
        
-                  
        >>> f = mmregmax(d,mmsebox())
        
-                  
        
-                  
        >>> mmshow(e,f)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ee,f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final result
        
-          
        
-            
        
-              
        
-                        Here it is shown the input and output result. Note that the binary image of the aspirin tablets was obtained using just one parameter: the radius of the circular structuring element. The problem was solved as treating the image formed by circular bright regions.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a)
        
-                  
        
-                  
        >>> mmshow(f)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        af
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdarea]
-                
-                    [Up]
-                    
-                    [mmdlabeltext]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdbeef.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdbeef.html
deleted file mode 100644
index 44fca7a53f22..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdbeef.html
+++ /dev/null
@@ -1,278 +0,0 @@
-
-  
-    
-    mmdbeef
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdlabeltext]
-              
-                  [Up]
-                  
-                  [mmdblob]
-              Demonstrations
        
-    
        mmdbeef
-      
        
-      Detect the lean meat region in a beef steak image.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Beucher's paradigm is applied for delineating sharply the lean meat region in the beef steak image. An internal and an external marker are necessary for the filtering step of the paradigm. In this step, small regions that does not have meat are eliminated.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The gray-scale image of the beef steak is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('beef.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Filtering
        
-          
        
-            
        
-              
        
-                        The input image is simplified by the application of a a small closing. The dark area (inner lean part) is closed from the fat white area.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b=mmclose(a,mmsedisk(2));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        External marker 1/2
        
-          
        
-            
        
-              
        
-                        The external marker is built from the detection of the complete beef region and the extraction of its internal edge. As the beef is dark, it is detected by a low value threshold. After this threshold, small residual regions are  eliminated by the binary areaclose operator.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmthreshad(a,uint8(10));
        
-                  
        
-                  
        >>> d = mmareaclose(c,200);
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        External marker 2/2
        
-          
        
-            
        
-              
        
-                        The internal edge generated is 13 points thick. It is created by the residues of an erosion by a large structuring element.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mmgradm(d,mmsecross(1),mmsebox(13));
        
-                  
        
-                  
        >>> mmshow(e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Internal marker
        
-          
        
-            
        
-              
        
-                        The internal marker is a severe erosion of the steak. Both markers are combined by union and displayed as overlay on the gradient image
-                    
-              
        
-              
        
-                
        
-                  
        >>> f= mmero(d,mmsecross(80));
        
-                  
        
-                  
        >>> g = mmunion(e,f);  
        
-                  
        
-                  
        >>> h = mmgradm(b);
        
-                  
        
-                  
        >>> mmshow(h,g);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        h,g
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Watershed
        
-          
        
-            
        
-              
        
-                        Constrained watershed of the gradient of the smoothed image, restricted to the internal and external markers
-                    
-              
        
-              
        
-                
        
-                  
        >>> i=mmcwatershed(h,g); 
        
-                  
        
-                  
        >>> mmshow(i);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        i
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final result
        
-          
        
-            
        
-              
        
-                        Superposition of the dilated detected contour on the original image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,mmdil(i));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,mmdil(i)
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdlabeltext]
-                
-                    [Up]
-                    
-                    [mmdblob]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdblob.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdblob.html
deleted file mode 100644
index dd01e04a0182..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdblob.html
+++ /dev/null
@@ -1,237 +0,0 @@
-
-  
-    
-    mmdblob
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdbeef]
-              
-                  [Up]
-                  
-                  [mmdbrain]
-              Demonstrations
        
-    
        mmdblob
-      
        
-      Demonstrate blob measurements and display.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      In this example, a binary image with many blobs is processed. The objective is to measure the area of each blob. First the blobs are labeled. To display the correspondent label number of each blob, a trick is used to dilate each labeled centroid by a structuring element formed by the number of the blob label. At final, the area of each blob is plotted against its label number.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Image reading and labeling
        
-          
        
-            
        
-              
        
-                        The binary image is read and then labeled. The number of blobs is measured as the maximum label value. Both images are displayed.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f  = mmreadgray('blob3.tif')
        
-                  
        
-                  
        >>> fr = mmlabel(f)
        
-                  
        
-                  
        >>> mmshow(f)
        
-                  
        
-                  
        >>> mmlblshow(fr,'border')
        
-                  
        
-                  
        >>> nblobs=mmstats(fr,'max')
        
-                  
        
-                  
        >>> print nblobs
        
-                  
        18.0
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ffr,'border'
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Centroids
        
-          
        
-            
        
-              
        
-                        The centroids are computed from the labeled image. After, the centroid image is labeled, so that each centroid point has a label value varying from 1 to the maximum number of blobs. For display illustration, the centroids are overlayed on the original blob image on the left and the labeled centroids are enlarged and displayed on the right.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c  = mmblob(fr,'centroid')
        
-                  
        
-                  
        >>> cr = mmlabel(c)
        
-                  
        
-                  
        >>> mmshow(f,c)
        
-                  
        
-                  
        >>> mmlblshow(mmdil(cr))
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        f,cmmdil(cr)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Placing a number on a particular blob
        
-          
        
-            
        
-              
        
-                        To place a particular number on a particular blob, a number image is generated using the 
-                mmtext function and converted to a structuring element. A particular centroid is selected by comparing the image with the labeled number. This output image is a binary image with a single point at that centroid. Dilating this image by the structuring element will "stamp" the structuring element on the centroid.
-                    
-              
        
-              
        
-                
        
-                  
        >>> fbin = mmcmp(cr,'==',uint16(5))
        
-                  
        
-                  
        >>> f5   = mmtext('5')
        
-                  
        
-                  
        >>> print f5
        
-                  
        [[0 0 0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0 0 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 0 0 0 0 0 0 0]
- [0 1 0 0 0 0 0 0 0]
- [0 1 0 1 1 1 1 0 0]
- [0 1 1 0 0 0 0 1 0]
- [0 0 0 0 0 0 0 1 0]
- [0 0 0 0 0 0 0 1 0]
- [0 0 0 0 0 0 0 1 0]
- [0 1 0 0 0 0 0 1 0]
- [0 0 1 1 1 1 1 0 0]
- [0 0 0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0 0 0]]
        
-                  
        >>> b5   = mmimg2se(f5)
        
-                  
        
-                  
        >>> fb5  = mmdil(fbin,b5)
        
-                  
        
-                  
        >>> mmshow(mmdil(fbin))
        
-                  
        
-                  
        >>> mmshow(f,fb5)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        mmdil(fbin)f,fb5
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Placing a label number to each labeled blob
        
-          
        
-            
        
-              
        
-                        To automate the process just described, a loop scans every label value and "stamp" its number in a final image. The stamps are accumulated with the 
-                mmunion function. The area is computed and plotted against each label blob number.
-                    
-              
        
-              
        
-                
        
-                  
        >>> facc=mmsubm(f,f)
        
-                  
        
-                  
        >>> for i in range(1,nblobs+1):
-  fbin = mmcmp(cr,'==',uint16(i))
-  fi   = mmtext(str(i))
-  bi   = mmimg2se(fi)
-  fbi  = mmdil(fbin,bi)
-  facc = mmunion(facc,fbi)
        
-                  
        
-                  
        >>> mmshow(f,facc)
        
-                  
        
-                  
        >>> darea = mmblob(fr,'area','data')
        
-                  
        
-                  
        >>> mmplot([[darea]], [['style','impulses']])
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        f,facc[[darea]], [['style','impulses']]
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdbeef]
-                
-                    [Up]
-                    
-                    [mmdbrain]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdbrain.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdbrain.html
deleted file mode 100644
index 468c2e90a3ae..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdbrain.html
+++ /dev/null
@@ -1,199 +0,0 @@
-
-  
-    
-    mmdbrain
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdblob]
-              
-                  [Up]
-                  
-                  [mmdcalc]
-              Demonstrations
        
-    
        mmdbrain
-      
        
-      Extract the lateral ventricle from an MRI image of the brain.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This procedure extracts the lateral ventricle from an MRI image of the brain.
-          This example was kindly provided by Prof. John Goutsias from The Johns Hopkins University and appears in Goutsias and S. Batman,  Morphological Methods for Biomedical Image Analysis, In the Handbook of Medical Imaging: Volume 3. Progress in Medical Image Processing and Analysis, J. M. Fitzpatrick and M. Sonka (Eds.)(To Appear). SPIE Optical Engineering Press, May 2000.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The MRI image of a brain slice is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('mribrain.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Ventricle detection I
        
-          
        
-            
        
-              
        
-                        The ventricle is enhanced using an opening with a disk of radius 10  followed by a reconstruction.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmopen(a,mmsedisk(10));
        
-                  
        
-                  
        >>> c = mminfrec(b,a);
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        bc
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Ventricle detection II
        
-          
        
-            
        
-              
        
-                        The result of the open by reconstruction is subtracted from the original image.  Note that the three operations: open, reconstruction and the subtraction could be done at once using the 
-                mmopenrecth (open by reconstruction top-hat) function. On the right, the enhanced ventricle is thresholded.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmsubm(a,c);
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                  
        >>> e = mmcmp(d,'>=',uint8(50));
        
-                  
        
-                  
        >>> mmshow(e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        de
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Selecting the ventricle
        
-          
        
-            
        
-              
        
-                        Finally, the ventricle is selected as the connected object with area larger than 70 pixels. For visualization purposes, the result of the segmentation is overlayed on the  original brain image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f= mmareaopen(e,70);
        
-                  
        
-                  
        >>> mmshow(f);
        
-                  
        
-                  
        >>> mmshow(a,f);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        fa,f
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdblob]
-                
-                    [Up]
-                    
-                    [mmdcalc]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcalc.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcalc.html
deleted file mode 100644
index 25a18734ee8b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcalc.html
+++ /dev/null
@@ -1,334 +0,0 @@
-
-  
-    
-    mmdcalc
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdbrain]
-              
-                  [Up]
-                  
-                  [mmdcells]
-              Demonstrations
        
-    
        mmdcalc
-      
        
-      Extract the keys of a calculator.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This procedure detects the keys in a gray-scale image of a calculator. The approach used is watershed Beucher's paradigm. The internal markers are the numbers on the keys and the external markers are obtained by the skiz of the keys background.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The gray-scale image of the calculator is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('keyb.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Gradient image
        
-          
        
-            
        
-              
        
-                        The image edges are enhanced by the gradient operator.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmgradm(a, mmsebox());
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Inside marker: Opening top-hat
        
-          
        
-            
        
-              
        
-                        The opening top-hat procedure enhances the small objects relatively  to its background. In the calculator image, the digits are enhanced.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmopenth(a,mmsebox(5));
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Inside marker: Thresholding 
        
-          
        
-            
        
-              
        
-                        The threshold operator is used to separated the enhanced objects.  This procedure is quite robust, since the background was reduced  to very low levels with the opening top-hat.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmthreshad(c, uint8(150));
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Inside marker: Final
        
-          
        
-            
        
-              
        
-                        In order to have just one object (i.e., connected component) inside  each key, a dilation is applied.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mmdil(d, mmsebox(3));
        
-                  
        
-                  
        >>> mmshow(e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Outside markers
        
-          
        
-            
        
-              
        
-                        The outside markers are built by taking the watershed (skiz) of the  complement of internal markers image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmwatershed(mmneg(e));
        
-                  
        
-                  
        >>> mmshow(f);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Both markers
        
-          
        
-            
        
-              
        
-                        The markers used are the union of the internal and external markers detected. They are displayed as overlay on the gradient image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g = mmunion(e,f);
        
-                  
        
-                  
        >>> mmshow(b,g);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b,g
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Constrained watershed
        
-          
        
-            
        
-              
        
-                        The calculator keys are extracted by applying the watershed operator on the gradient image, constrained by the markers detected.
-                    
-              
        
-              
        
-                
        
-                  
        >>> h = mmcwatershed(b,g,mmsebox());
        
-                  
        
-                  
        >>> mmshow(h);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        h
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Show the result
        
-          
        
-            
        
-              
        
-                        Superposition of the detected contours on the input image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,h);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,h
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdbrain]
-                
-                    [Up]
-                    
-                    [mmdcells]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcells.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcells.html
deleted file mode 100644
index e4974cd4068a..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcells.html
+++ /dev/null
@@ -1,309 +0,0 @@
-
-  
-    
-    mmdcells
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdcalc]
-              
-                  [Up]
-                  
-                  [mmdchickparts]
-              Demonstrations
        
-    
        mmdcells
-      
        
-      Extract blood cells and separate them.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      A microscopic gray-scale image containing blood cells is segmented and further processed for the separation of superposed cells. The segmentation procedure is based on gray-scale connected filtering and threshold, while the separation procedure is based on the classical watershed approach.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading and elimination of white pores
        
-          
        
-            
        
-              
        
-                        First, the blood cells image is read. Then,  the gray-scale area open operator is applied for removing small white pores over the cells.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('bloodcells.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                  
        >>> b = mmareaopen(a, 200);
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ab
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Threshold and shape smoothing
        
-          
        
-            
        
-              
        
-                        The threshold of dark areas produces the segmented image (i.e., the region where there are cells). Then the opening by a small disk performs smoothing of the cells borders.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmcmp( uint8(0), '<=', b, '<=', uint8(140));
        
-                  
        Warning: Converting input image from int32 to uint16.
-Warning: Converting input image from int32 to uint16.
        
-                  
        >>> mmshow(c);
        
-                  
        
-                  
        >>> d = mmopen(c,mmsedisk(2,'2D','OCTAGON'));
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        cd
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Marking
        
-          
        
-            
        
-              
        
-                        A marker for each cell is obtained by dilating the regional maximum of the distance transform. For visualization illustration, the distance transform is viewed as a topographic surface shading on the left and the dilated regional maximum is displayed in read overlayed on the surface view.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e1 = mmdist(d, mmsebox(),'EUCLIDEAN');
        
-                  
        
-                  
        >>> e2 = mmsurf(e1);
        
-                  
        
-                  
        >>> mmshow( e2);
        
-                  
        
-                  
        >>> e3 = mmregmax(e1);
        
-                  
        
-                  
        >>> e  = mmdil(e3);
        
-                  
        
-                  
        >>> mmshow( e2, e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        e2e2, e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Geodesic SKIZ
        
-          
        
-            
        
-              
        
-                        The watershed, constrained by the makers image, is applied to the negation of the distance function. The result of this procedure is also called geodesic SKIZ. For visualization, on the left the negate distance function is displayed as a topographic surface, and on the right this surface is superposed by the markers and the detected watershed lines.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmneg(e1);
        
-                  
        
-                  
        >>> fs = mmsurf(f);
        
-                  
        
-                  
        >>> mmshow(fs);
        
-                  
        
-                  
        >>> g = mmcwatershed( f, e, mmsebox());
        
-                  
        
-                  
        >>> mmshow(fs, g, e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        fsfs, g, e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Cell separation
        
-          
        
-            
        
-              
        
-                        The geodesic SKIZ (i.e., watershed division lines) is subtracted from the segmented image, separating the cells. On the left the detected watershed lines is overlayed on the cells binary image, and on the right, the cells image separated using the watershed lines.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(c,g);
        
-                  
        
-                  
        >>> h = mmintersec(c,mmneg(g));
        
-                  
        
-                  
        >>> mmshow(h);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        c,gh
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Edge off
        
-          
        
-            
        
-              
        
-                        The cells that touch the frame of the image are removed.
-                    
-              
        
-              
        
-                
        
-                  
        >>> i = mmedgeoff(h);
        
-                  
        
-                  
        >>> mmshow(i);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        i
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        Superposition of the contour of the detected cells on the original image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> j=mmgradm(i);
        
-                  
        
-                  
        >>> mmshow(a,j);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,j
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdcalc]
-                
-                    [Up]
-                    
-                    [mmdchickparts]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdchickparts.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdchickparts.html
deleted file mode 100644
index 5d36e7cdec3c..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdchickparts.html
+++ /dev/null
@@ -1,266 +0,0 @@
-
-  
-    
-    mmdchickparts
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdcells]
-              
-                  [Up]
-                  
-                  [mmdconcrete]
-              Demonstrations
        
-    
        mmdchickparts
-      
        
-      Classify chicken parts in breast, legs+tights and wings
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a gray-scale image of many different chicken parts. The purpose is to classify them in breast, legs+tights, tights and wings.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The input image is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('chickparts.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding and labeling
        
-          
        
-            
        
-              
        
-                        Convert to binary objects by thresholding and then labeling the objects.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmcmp(a,'>=', uint8(100));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                  
        >>> c = mmlabel(b);
        
-                  
        
-                  
        >>> mmlblshow(c,'border');
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        bc,'border'
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Area measurement
        
-          
        
-            
        
-              
        
-                        Measure the area o each object and put this value as the pixel object value. For displaying purpose, overlay the background as red in the right image below.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmblob(c,'area');
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                  
        >>> mmshow(d, mmcmp(d,'==',0));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        dd, mmcmp(d,'==',0)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Select the wings and tights
        
-          
        
-            
        
-              
        
-                        The wings are detected by finding objects with area  100 and 2500 pixels. The tights are selected as connected objects with area between 2500 and 5500 pixels.
-                    
-              
        
-              
        
-                
        
-                  
        >>> wings = mmcmp( uint16(100),'<=',d, '<=', uint16(2500));
        
-                  
        Warning: Converting input image from int32 to uint16.
-Warning: Converting input image from int32 to uint16.
        
-                  
        >>> mmshow(wings);
        
-                  
        
-                  
        >>> tights = mmcmp( uint16(2500),'<',d, '<=', uint16(5500));
        
-                  
        Warning: Converting input image from int32 to uint16.
-Warning: Converting input image from int32 to uint16.
        
-                  
        >>> mmshow(tights);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        wingstights
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Select the legs and breast
        
-          
        
-            
        
-              
        
-                        The legs+tights have area larger than 5500 and smaller than 8500 pixels and the breast is the largest connected object with area larger  than 8500 pixels
-                    
-              
        
-              
        
-                
        
-                  
        >>> legs = mmcmp( uint16(5500), '<', d, '<=', uint16(8500));
        
-                  
        Warning: Converting input image from int32 to uint16.
-Warning: Converting input image from int32 to uint16.
        
-                  
        >>> mmshow(legs);
        
-                  
        
-                  
        >>> breast = mmcmp( d,'>', uint16(8500));
        
-                  
        
-                  
        >>> mmshow(breast);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        legsbreast
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        Overlay the contour of the detected parts over the original image
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a, mmgradm(wings), mmgradm(tights), mmgradm(legs),mmgradm(breast));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a, mmgradm(wings), mmgradm(tights), mmgradm(legs),mmgradm(breast)
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdcells]
-                
-                    [Up]
-                    
-                    [mmdconcrete]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdconcrete.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdconcrete.html
deleted file mode 100644
index a40ba0af4d6b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdconcrete.html
+++ /dev/null
@@ -1,311 +0,0 @@
-
-  
-    
-    mmdconcrete
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdchickparts]
-              
-                  [Up]
-                  
-                  [mmdcookies]
-              Demonstrations
        
-    
        mmdconcrete
-      
        
-      Aggregate and anhydrous phase extraction from a concrete section observed by a SEM image.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This example shows an image analysis technique to detect anhydrous phase and aggregate from a polished concrete section observed by scanning electron microscope (SEM). The anhydrous phase appears as white grains while the aggregate appears in the image as an homogeneous medium-gray grains. This image was kindly provided by Prof. Gladis Camarini from FEC-UNICAMP.
-
-          
        The steps for this analysis are: i) anhydrous detection by automatic threshold analysis; ii) homogeneous grain detection using watershed technique; iii) aggregate are homogeneous grains that are not from the anhydrous phase. The automatic threshold analysis is done using 1D-signal morphological processing using watershed.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The SEM image of a polished concrete section is read. The anhydrous phase are the white pores, while the aggregate are the medium-gray homogeneous pores.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmreadgray('csample.jpg')
        
-                  
        
-                  
        >>> mmshow(f)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Histogram
        
-          
        
-            
        
-              
        
-                        The histogram has a small peak in the white region related to the anhydrous phase.
-                    
-              
        
-              
        
-                
        
-                  
        >>> h = mmhistogram(f)
        
-                  
        
-                  
        >>> mmplot([[h]])
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        [[h]]
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Automatic threshold from histogram.
        
-          
        
-            
        
-              
        
-                        The threshold value is extracted using the watershed technique. The aim is to detect the middle valley of the histogram. If the histogram is negated, we need to extract the middle peak of the 1D signal. This is accomplished by find proper markers on the valleys. These markers are extracted by detecting the regional minima of the filtered signal (alternating sequential filtering, closing followed by opening of length 5 pixels). To discard the detection of peaks near the limits of the histogram, an intersection is done using the 
-                mmframe function. For illustrative purpose, a plot of all the signals involved is displayed.
-                    
-              
        
-              
        
-                
        
-                  
        >>> hf = mmasf(mmneg(h),'co',mmseline(5))
        
-                  
        
-                  
        >>> ws = mmwatershed(hf)
        
-                  
        
-                  
        >>> wsf = mmintersec(mmneg(mmframe(ws,20)),ws)
        
-                  
        
-                  
        >>> t = nonzero(wsf)
        
-                  
        
-                  
        >>> print t
        
-                  
        [186]
        
-                  
        >>> mmax = mmstats(h,'max')
        
-                  
        
-                  
        >>> hf_plot = mmneg(hf)
        
-                  
        
-                  
        >>> ws_plot = mmgray(ws, 'uint16', mmax)
        
-                  
        
-                  
        >>> wsf_plot = mmgray(wsf, 'uint16', mmax)
        
-                  
        
-                  
        >>> mmplot([[hf_plot],[ws_plot],[wsf_plot]])
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        [[hf_plot],[ws_plot],[wsf_plot]]
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Anhydrous using thresholding and filtering
        
-          
        
-            
        
-              
        
-                        The threshold value found in the previous step is applied. After, a filter to remove blobs smaller then 20 pixels is applied. For illustrative, the contour of the anhydrous grains are displayed as an overlay on the original image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> aux = mmthreshad( f, t, 255)
        
-                  
        Warning: Converting input image from int32 to uint8.
-Warning: Converting input image from int32 to uint8.
        
-                  
        >>> anidro = mmareaopen(aux, 20)
        
-                  
        
-                  
        >>> mmshow( f, mmgradm(anidro))
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f, mmgradm(anidro)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Homogeneous regions
        
-          
        
-            
        
-              
        
-                        The watershed applied on the gradient using the markers from filtered regional minima of the gradient is a standard watershed based technique. In this case the filter was chosen to be a contrast 
-                mmhmin.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g=mmgradm(f)
        
-                  
        
-                  
        >>> m=mmregmin(mmhmin(g,10))
        
-                  
        
-                  
        >>> ws=mmcwatershed(g,m)
        
-                  
        
-                  
        >>> mmshow(ws)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        ws
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Aggregate detection
        
-          
        
-            
        
-              
        
-                        The result of the watershed in the previous step is the detection of a large number of regions. The larger ones are the aggregate and the anhydrous. So first the regions are filtered out using an area criterion of 300 pixels. Small holes (area <= 50) are closed. The aggregate is obtained by removing the anhydrous phase.
-                    
-              
        
-              
        
-                
        
-                  
        >>> aux1=mmareaopen(mmneg(ws),300)
        
-                  
        
-                  
        >>> aux2=mmareaclose(aux1,50)
        
-                  
        
-                  
        >>> aggr=mmsubm(aux2,anidro)
        
-                  
        
-                  
        >>> mmshow(f, mmgradm(aggr))
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f, mmgradm(aggr)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Measurement and display
        
-          
        
-            
        
-              
        
-                        Finally each phase is measured and an illustrative display is constructed. The grains contoured by red are the aggregate and those contoured by green, the anhydrous.
-                    
-              
        
-              
        
-                
        
-                  
        >>> n = product(shape(f))
        
-                  
        
-                  
        >>> anidro_phase = mmstats(anidro,'sum')/n
        
-                  
        
-                  
        >>> print 'anidro=',anidro_phase
        
-                  
        anidro= 0.114593098958
        
-                  
        >>> aggr_phase = mmstats(aggr,'sum')/n;
        
-                  
        
-                  
        >>> print 'aggr=',aggr_phase
        
-                  
        aggr= 0.252001953125
        
-                  
        >>> mmshow( f, mmgradm(aggr), mmgradm(anidro))
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f, mmgradm(aggr), mmgradm(anidro)
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdchickparts]
-                
-                    [Up]
-                    
-                    [mmdcookies]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcookies.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcookies.html
deleted file mode 100644
index ddc1d630a2dc..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcookies.html
+++ /dev/null
@@ -1,210 +0,0 @@
-
-  
-    
-    mmdcookies
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdconcrete]
-              
-                  [Up]
-                  
-                  [mmdcornea]
-              Demonstrations
        
-    
        mmdcookies
-      
        
-      Detect broken rounded biscuits.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a gray-scale image of two rounded-shaped biscuits. One of them is broken. The purpose is to detect the broken biscuit.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The input image is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('cookies.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding
        
-          
        
-            
        
-              
        
-                        Convert to binary objects by thresholding
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmthreshad(a, uint8(100));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Open tophat with large octagon disk
        
-          
        
-            
        
-              
        
-                        The tophat of the binary image by an octagon disk with a radius fits the good biscuit but does not fit  in the broken biscuit can detect the broken one.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmopenth(b,mmsedisk(55,'2D','OCTAGON'));
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Remove the residues
        
-          
        
-            
        
-              
        
-                        Clean the residues from the octagon disk and the rounded shaped biscuits by eliminating small connected regions
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmareaopen(c,400);
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        Display the detected broken biscuit
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,d
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdconcrete]
-                
-                    [Up]
-                    
-                    [mmdcornea]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcornea.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcornea.html
deleted file mode 100644
index 3295b47dd4b7..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdcornea.html
+++ /dev/null
@@ -1,246 +0,0 @@
-
-  
-    
-    mmdcornea
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdcookies]
-              
-                  [Up]
-                  
-                  [mmdfabric]
-              Demonstrations
        
-    
        mmdcornea
-      
        
-      Cornea cells marking.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This procedure creates a maker for each cell in a very poor quality microscopic image of a cornea. The composition of an opening with the regional maximum is used to create the markers.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading and topographic view
        
-          
        
-            
        
-              
        
-                        The gray-scale image of the cornea is read and displayed. A topographic model is also displayed. We can notice that the cells are formed by small hills in the topographic model. We can also notice that the image is very noisy.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('corneacells.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                  
        >>> b = mmsurf(a);
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ab
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Filtering and cell detection
        
-          
        
-            
        
-              
        
-                        The image is filtered by an alternating sequential filtering with size 2. This filter is composed by openings and closings, removing small peaks and valleys. Next, the regional maxima are detected. For illustrative purpose, they are displayed overlayed on the topographic image view. These regional maxima are the markers for each cell. If anything goes wrong in this step, the error will be propagated throughout the process.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmasf(a,'oc',mmsecross(),2);
        
-                  
        
-                  
        >>> d = mmregmax( c);
        
-                  
        
-                  
        >>> mmshow(mmsurf(c));
        
-                  
        
-                  
        >>> mmshow(mmsurf(c), d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        mmsurf(c)mmsurf(c), d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Find the background marker
        
-          
        
-            
        
-              
        
-                        Following the paradigm of segmentation by watershed, the background marker is detected by applying the constrained watershed on the negation of the cells image using the markers detected in the last step. These watershed lines partition the image in regions of influence of each cell. For illustrative display, the negative of the cell image is displayed overlayed by the markers on the left, and also overlayed by the watershed lines on the right.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mmneg(a);
        
-                  
        
-                  
        >>> f = mmcwatershed(e, d, mmsebox());
        
-                  
        
-                  
        >>> mmshow(e,d);
        
-                  
        
-                  
        >>> mmshow(e,f,d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        e,de,f,d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Labeling the markers and gradient
        
-          
        
-            
        
-              
        
-                        As the internal and external markers can be touching, we combine the external marker with value 1 with the labeling of the internal markers added by 1. The labeled marker image is shown on the left. The final watershed will be applied on the gradient  of the original image, which is shown on the right.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g = mmgray(f, 'uint16', 1);
        
-                  
        
-                  
        >>> h1 = mmaddm(mmlabel(d), uint16(1));
        
-                  
        
-                  
        >>> h = mmintersec(mmgray(d,'uint16'), h1);
        
-                  
        
-                  
        >>> i = mmunion( g, h);
        
-                  
        
-                  
        >>> mmlblshow(i);
        
-                  
        
-                  
        >>> j = mmgradm( a);
        
-                  
        
-                  
        >>> mmshow(j);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ij
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Constrained watershed of the gradient from markers
        
-          
        
-            
        
-              
        
-                        Apply the constrained watershed on the gradient from the labeled internal and external markers. Show the watershed lines on the left and the results overlayed on the original image, on the right.
-                    
-              
        
-              
        
-                
        
-                  
        >>> k = mmcwatershed(j, i);
        
-                  
        
-                  
        >>> mmshow( k);
        
-                  
        
-                  
        >>> mmshow(a, k, k);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ka, k, k
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdcookies]
-                
-                    [Up]
-                    
-                    [mmdfabric]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfabric.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfabric.html
deleted file mode 100644
index 2929fbf8f5a9..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfabric.html
+++ /dev/null
@@ -1,363 +0,0 @@
-
-  
-    
-    mmdfabric
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdcornea]
-              
-                  [Up]
-                  
-                  [mmdfila]
-              Demonstrations
        
-    
        mmdfabric
-      
        
-      Detection of vertical weave in fabrics.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      In this example, an enlarged image of a fabric (with backlight illumination)  is processed. The purpose is getting a quantitative index of the fabric quality. For that, fabric spaces are detected and measured.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading 
        
-          
        
-            
        
-              
        
-                        The image to be processed is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('fabric.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Enhancement of the white vertical stripes
        
-          
        
-            
        
-              
        
-                        A sequence of dilations (by a disk and two line segments)  is applied to enhance the white stripes
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmdil(a,mmsedisk(4));
        
-                  
        
-                  
        >>> c = mmdil(b,mmseline(25,90));
        
-                  
        
-                  
        >>> d = mmdil(c,mmseline(25,-90));
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        The markers are the dark regions
        
-          
        
-            
        
-              
        
-                        The markers are the regional minima with contrast  25.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mmhmin(d,25);
        
-                  
        
-                  
        >>> f = mmregmin(e);
        
-                  
        
-                  
        >>> mmshow(f);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Watershed lines detect the white stripes center
        
-          
        
-            
        
-              
        
-                        Watershed of the original image from the dark stripes markers just created. Show the result overlayed on the original image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g = mmcwatershed(a,f);
        
-                  
        
-                  
        >>> mmshow(a,mmdil(g));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,mmdil(g)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Watershed lines detect the white stripes region
        
-          
        
-            
        
-              
        
-                        Create a new marker by taking the union of the dark markers and the watershed lines just created. The gradient of the original image is computed.
-                    
-              
        
-              
        
-                
        
-                  
        >>> h = mmunion(g,f);
        
-                  
        
-                  
        >>> i = mmgradm(a);
        
-                  
        
-                  
        >>> mmshow(h);
        
-                  
        
-                  
        >>> mmshow(i);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        hi
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final watershed lines
        
-          
        
-            
        
-              
        
-                        The watershed of the gradient of the original image, taking the marker just created, gives the extend of the white regions.
-                    
-              
        
-              
        
-                
        
-                  
        >>> j = mmcwatershed(i,h,mmsebox());
        
-                  
        
-                  
        >>> mmshow(a,j);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,j
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final watershed regions and area measurement
        
-          
        
-            
        
-              
        
-                        The watershed regions area computed. The area of each watershed regions is measured and displayed.
-                    
-              
        
-              
        
-                
        
-                  
        >>> k = mmcwatershed(i,h,mmsebox(),'REGIONS');
        
-                  
        
-                  
        >>> mmlblshow(k,'border');
        
-                  
        
-                  
        >>> l = mmblob(k,'area');
        
-                  
        
-                  
        >>> mmshow(l);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        k,'border'l
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Select only the narrow region (small area)
        
-          
        
-            
        
-              
        
-                        To select only the fabric spacing, select the regions with small area (less than 2000). Label the narrow regions.
-                    
-              
        
-              
        
-                
        
-                  
        >>> m = mmcmp(l,'<=',2000);
        
-                  
        
-                  
        >>> mmshow(m);
        
-                  
        
-                  
        >>> n = mmlabel(m,mmsebox());
        
-                  
        
-                  
        >>> mmlblshow(n,'border');
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        mn,'border'
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Area measurement and plotting
        
-          
        
-            
        
-              
        
-                        Compute the area of each region and plot them. Also display the original image for illustration. From the plot, we can notice that the two rightmost weave spacing are significantly larger than the others.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a);
        
-                  
        
-                  
        >>> o = mmblob(n,'area','data');
        
-                  
        
-                  
        >>> mmplot([[o]],[['style','impulses']])
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        a[[o]],[['style','impulses']]
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdcornea]
-                
-                    [Up]
-                    
-                    [mmdfila]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfila.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfila.html
deleted file mode 100644
index 80f6c8224ede..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdfila.html
+++ /dev/null
@@ -1,334 +0,0 @@
-
-  
-    
-    mmdfila
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdfabric]
-              
-                  [Up]
-                  
-                  [mmdflatzone]
-              Demonstrations
        
-    
        mmdfila
-      
        
-      Detect Filarial Worms.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This procedure extracts the filarial worms from a complex microscopic image by eliminating progressively the other objects present in the image. The selection of the structures begins in the gray-scale level and, after a threshold, continues based on the object geometrical properties.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        A microscopic gray-scale image, with two filarial worms, is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('danaus.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Background regularization.
        
-          
        
-            
        
-              
        
-                        The Close by Reconstruction Top-Hat operator is applied to regularize the image background.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmcloserecth(a,mmsebox(5));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Removing narrow objects
        
-          
        
-            
        
-              
        
-                        The gray-scale opening by the elementary cross is applied to remove narrow objects.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmopen(b);
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Removing small objects
        
-          
        
-            
        
-              
        
-                        The gray-scale area open operator is applied to remove small objects.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmareaopen(c,200);
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding
        
-          
        
-            
        
-              
        
-                        The threshold operator is applied to extract a reduced set of structures that include the two worms present in the image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mmthreshad(d,50);
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Skeleton
        
-          
        
-            
        
-              
        
-                        The objective of the sequence of transformations, that begin with the homotopic skeleton, is to eliminateg the structures that are not worms. The information used for the filtering is that the worms are longer than any other structure found.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmthin(e);
        
-                  
        
-                  
        >>> mmshow(f);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Elimination of short structures
        
-          
        
-            
        
-              
        
-                        The first 12 points of the skeleton branches, counting from their  extremities, are eliminated. The structures that were not eliminated will be the markers for extracting the two worms.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g = mmthin(f,mmendpoints(), 12);
        
-                  
        
-                  
        >>> mmshow(g);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        g
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Extraction of the worms from their markers
        
-          
        
-            
        
-              
        
-                        The binary reconstruction operator is applied to reconstruct the binary image produced by the threshold from the marker image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> h = mminfrec(g,e);
        
-                  
        
-                  
        >>> mmshow(h);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        h
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        The structures extracted are overlaid to the input gray-scale image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,h);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,h
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdfabric]
-                
-                    [Up]
-                    
-                    [mmdflatzone]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdflatzone.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdflatzone.html
deleted file mode 100644
index 77a026ae18d9..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdflatzone.html
+++ /dev/null
@@ -1,282 +0,0 @@
-
-  
-    
-    mmdflatzone
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdfila]
-              
-                  [Up]
-                  
-                  [mmdflow]
-              Demonstrations
        
-    
        mmdflatzone
-      
        
-      Flat-zone image simplification by connected filtering.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This experiment illustrates the flat zone extension property of connected filters. The flat zones of an image is the set of the largest connected components with identical intensity values. The main property of the connected filter is that every flat zone of the input image is included in a flat zone of the output image.
-
-          
        This example was kindly provided by Prof. Jose Crespo from Facultad de Informatica of Universidad Politecnica de Madrid and adapted from CrScSeGrMe:98.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The input image is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('cameraman.tif')
        
-                  
        
-                  
        >>> mmshow(a)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Flat zone computation
        
-          
        
-            
        
-              
        
-                        Obtain the flat zones (8-connectivity) and compute its number. The number of flat zones is determined by the maximum labeling value ( starting from flat zone one).
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmlabelflat(a,mmsebox())
        
-                  
        
-                  
        >>> nfz=mmstats(b,'max')
        
-                  
        
-                  
        >>> print nfz
        
-                  
        43268.0
        
-                  
        >>> mmshow(a)
        
-                  
        
-                  
        >>> mmlblshow(b)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ab
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Flat zone extension using connected filter
        
-          
        
-            
        
-              
        
-                        Apply the alternating sequential filter by reconstruction with increasing sizes. They constitute a connected pyramid.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c=mmasfrec(a,'CO',mmsebox(),mmsebox(),2)
        
-                  
        
-                  
        >>> d=mmasfrec(a,'CO',mmsebox(),mmsebox(),4)
        
-                  
        
-                  
        >>> e=mmasfrec(a,'CO',mmsebox(),mmsebox(),16)
        
-                  
        
-                  
        >>> mmshow(c)
        
-                  
        
-                  
        >>> mmshow(d)
        
-                  
        
-                  
        >>> mmshow(e)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        cd
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Flat zone visualization and counting
        
-          
        
-            
        
-              
        
-                        These figures show the image simplification in a connected pyramid. Notice how the shapes are well preserved along the scale space. The number of flat zones at each level of the pyramid are computed to illustrate the flat zone number reduction.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c_lab=mmlabelflat(c,mmsebox())
        
-                  
        
-                  
        >>> d_lab=mmlabelflat(d,mmsebox())
        
-                  
        
-                  
        >>> e_lab=mmlabelflat(e,mmsebox())
        
-                  
        
-                  
        >>> print mmstats(c_lab,'max')
        
-                  
        15509.0
        
-                  
        >>> print mmstats(d_lab,'max')
        
-                  
        11990.0
        
-                  
        >>> print mmstats(e_lab,'max')
        
-                  
        5648.0
        
-                  
        >>> mmlblshow(c_lab)
        
-                  
        
-                  
        >>> mmlblshow(d_lab)
        
-                  
        
-                  
        >>> mmlblshow(e_lab)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        c_labd_lab
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        e_lab
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Flat zone inclusion property
        
-          
        
-            
        
-              
        
-                        In this experiment we select a particular flat zone, the flat zone to  which the pixel (90,60) belongs, and display it at each level of the  connected pyramid. Notice the flat zone inclusion property.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c_v=c_lab[89,59]
        
-                  
        
-                  
        >>> c_flat=mmcmp(c_lab,'==',c_v)
        
-                  
        
-                  
        >>> d_v=d_lab[89,59]
        
-                  
        
-                  
        >>> d_flat=mmcmp(d_lab,'==',d_v)
        
-                  
        
-                  
        >>> e_v=e_lab[89,59]
        
-                  
        
-                  
        >>> e_flat=mmcmp(e_lab,'==',e_v)
        
-                  
        
-                  
        >>> mmshow(a,e_flat,d_flat,c_flat)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,e_flat,d_flat,c_flat
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdfila]
-                
-                    [Up]
-                    
-                    [mmdflow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdflow.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdflow.html
deleted file mode 100644
index 95b5fbb25446..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdflow.html
+++ /dev/null
@@ -1,216 +0,0 @@
-
-  
-    
-    mmdflow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdflatzone]
-              
-                  [Up]
-                  
-                  [mmdgear]
-              Demonstrations
        
-    
        mmdflow
-      
        
-      Detect water in a static image of an oil-water flow experiment.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      A gray-scale image of an oil-water flow experiment is processed. This image is composed of a top-lateral view of a transparent pipe containing water, in the center, and oil, around the water. This procedure detects the region where the water is by using connected filtering, thresholding and shape smoothing.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The gray-scale image of the water-oil flow experiment is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('flow.tif')
        
-                  
        
-                  
        >>> mmshow(a)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Dark region enhancement
        
-          
        
-            
        
-              
        
-                        The dark region of the image is enhanced by the close top-hat operator.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b=mmcloseth(a,mmseline(50,90))
        
-                  
        
-                  
        >>> mmshow(b)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Filtering
        
-          
        
-            
        
-              
        
-                        A connected filtering is applied to remove small artifacts present in the image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c=mmcloserec(b,mmsebox(5))
        
-                  
        
-                  
        >>> mmshow(c)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Shape filtering
        
-          
        
-            
        
-              
        
-                        An alternated sequential filtering is used for shape smoothing.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d=mmasf(c,'co',mmsecross())
        
-                  
        
-                  
        >>> mmshow(d)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding
        
-          
        
-            
        
-              
        
-                        The original and thresholded image overlayed on the original are  presented successively.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e=mmthreshad(d,100)
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(a)
        
-                  
        
-                  
        >>> mmshow(a,e)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        aa,e
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdflatzone]
-                
-                    [Up]
-                    
-                    [mmdgear]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdgear.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdgear.html
deleted file mode 100644
index 605068bcf197..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdgear.html
+++ /dev/null
@@ -1,160 +0,0 @@
-
-  
-    
-    mmdgear
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdflow]
-              
-                  [Up]
-                  
-                  [mmdholecenter]
-              Demonstrations
        
-    
        mmdgear
-      
        
-      Detect the teeth of a gear
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a binary image of a gear. The opening top-hat is used to detect the gear teeth. Finally, the teeth detected are labeled.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The binary image of a gear is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('gear.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Opening and subtraction
        
-          
        
-            
        
-              
        
-                        Opening of the input image by an Euclidean disk of radius 20. The sequence opening-subtraction is called opening top-hat. The opening top-hat could be executed in a single command: c = 
-                mmopenth(a,
-                mmsedisk(20));
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmopen(a,mmsedisk(20));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                  
        >>> c = mmsubm(a,b);
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        bc
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Labeling and counting
        
-          
        
-            
        
-              
        
-                        The teeth detected are labeled. The maximum pixel value in the labeled image gives the number of connected objects (n. of teeth).
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmlabel(c);
        
-                  
        
-                  
        >>> nteeth=mmstats(d,'max')
        
-                  
        
-                  
        >>> mmlblshow(d,'border');
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d,'border'
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdflow]
-                
-                    [Up]
-                    
-                    [mmdholecenter]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdholecenter.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdholecenter.html
deleted file mode 100644
index a34d44638b3f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdholecenter.html
+++ /dev/null
@@ -1,276 +0,0 @@
-
-  
-    
-    mmdholecenter
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdgear]
-              
-                  [Up]
-                  
-                  [mmdleaf]
-              Demonstrations
        
-    
        mmdholecenter
-      
        
-      Hole center misalignment in PCB.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This demonstration illustrates the estimation of the eccentricity of the holes on the pads of a PCB, and the estimation of the narrowest copper around the holes.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The image of the PCB is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('pcbholes.tif')
        
-                  
        
-                  
        >>> mmshow(a)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        First, find center of the pads.
        
-          
        
-            
        
-              
        
-                        Use the close hole function to remove the holes. Note that one hole is open. This is not considered in this experiment. The regional maxima of the distance transform gives the radius of the largest disk inside the pad. We are interested only in radius larger than 20 pixels.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmclohole(a)
        
-                  
        
-                  
        >>> mmshow(b)
        
-                  
        
-                  
        >>> d = mmdist(b,mmsecross(),'EUCLIDEAN')
        
-                  
        
-                  
        >>> e = mmregmax(d,mmsebox())
        
-                  
        
-                  
        >>> f = mmthreshad(d, uint16([20]))   # radius larger than 20 pixels
        
-                  
        
-                  
        >>> g = mmintersec(e,f)
        
-                  
        
-                  
        >>> h = mmblob(mmlabel(g,mmsebox()),'CENTROID'); # pad center
        
-                  
        
-                  
        >>> mmshow(b,mmdil(h))
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        bb,mmdil(h)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Find the center of the holes
        
-          
        
-            
        
-              
        
-                        The holes are given by the difference of the pad image from the original image. Repeat the same procedure to find the center of the pads to find now the center of the holes.
-                    
-              
        
-              
        
-                
        
-                  
        >>> i = mmsubm(b,a)
        
-                  
        
-                  
        >>> mmshow(i)
        
-                  
        
-                  
        >>> j = mmdist(i,mmsecross(),'EUCLIDEAN')
        
-                  
        
-                  
        >>> k = mmregmax(j,mmsebox())
        
-                  
        
-                  
        >>> l = mmblob(mmlabel(k,mmsebox()),'CENTROID') # hole center
        
-                  
        
-                  
        >>> mmshow(i,mmdil(l))
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ii,mmdil(l)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Show the eccentricity
        
-          
        
-            
        
-              
        
-                        First both centers (pads and holes) are displayed together. Then the actual misalignment is computed using the distance from one point to the other.
-                    
-              
        
-              
        
-                
        
-                  
        >>> from Numeric import nonzero
        
-                  
        
-                  
        >>> mmshow(a,h,l)
        
-                  
        
-                  
        >>> m = mmdist(mmneg(l),mmsecross(),'EUCLIDEAN')
        
-                  
        
-                  
        >>> n = mmintersec(mmgray(h),uint8(m))
        
-                  
        
-                  
        >>> mmshow(n,a)
        
-                  
        
-                  
        >>> i = nonzero(n.flat)
        
-                  
        
-                  
        >>> x = i / n.shape[1]
        
-                  
        
-                  
        >>> y = i % n.shape[1]
        
-                  
        
-                  
        >>> for k in range(len(i)):
-  print 'displacement of %d at (%d,%d)\n' %(n[x[k],y[k]],x[k],y[k])
        
-                  
        displacement of 3 at (43,88)
-displacement of 8 at (44,191)
-displacement of 6 at (153,187)
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        a,h,ln,a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Find the narrowest region around the holes
        
-          
        
-            
        
-              
        
-                        First, the thinning to compute the skeleton of the PCB image, then remove iteratively all the end points of the skeleton so just the skeleton loop around the holes remains. Find the minimum distance of these loops to the border and display their location.
-                    
-              
        
-              
        
-                
        
-                  
        >>> o=mmthin(a)
        
-                  
        
-                  
        >>> p=mmthin(o,mmendpoints())
        
-                  
        
-                  
        >>> mmshow(a,p)
        
-                  
        
-                  
        >>> q = mmdist(a,mmsecross(),'EUCLIDEAN')
        
-                  
        
-                  
        >>> r = mmgrain(mmlabel(p,mmsebox()),q,'min') # minimum
        
-                  
        
-                  
        >>> s = mmgrain(mmlabel(p,mmsebox()),q,'min','data') # minimum
        
-                  
        
-                  
        >>> from Numeric import ravel
        
-                  
        
-                  
        >>> for k in ravel(s):
-  print 'Minimum distance: %d pixels' %(2*k+1)
        
-                  
        Minimum distance: 7 pixels
-Minimum distance: 7 pixels
-Minimum distance: 3 pixels
        
-                  
        >>> t = mmintersec(mmcmp(r,'==',q),a)
        
-                  
        
-                  
        >>> mmshow(a,mmdil(t))
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        a,pa,mmdil(t)
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdgear]
-                
-                    [Up]
-                    
-                    [mmdleaf]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdlabeltext.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdlabeltext.html
deleted file mode 100644
index 15986ba9d733..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdlabeltext.html
+++ /dev/null
@@ -1,209 +0,0 @@
-
-  
-    
-    mmdlabeltext
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdasp]
-              
-                  [Up]
-                  
-                  [mmdbeef]
-              Demonstrations
        
-    
        mmdlabeltext
-      
        
-      Segmenting letters, words and paragraphs.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      In this example, a digitized text is processed to identify the letters, words and paragraphs. This demonstration uses only the 
-          mmlabel function with different connectivity parameters.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The text image is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmreadgray('stext.tif')
        
-                  
        
-                  
        >>> mmshow(f)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        First, label the letters.
        
-          
        
-            
        
-              
        
-                        The letters are the main connected components in the image. So we use the classical 8-connectivity criteria for identify each letter.
-                    
-              
        
-              
        
-                
        
-                  
        >>> fl=mmlabel(f,mmsebox())
        
-                  
        
-                  
        >>> mmlblshow(fl)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        fl
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Second, label the words.
        
-          
        
-            
        
-              
        
-                        The words are made of closed letters. In this case we use a connectivity specified by a rectangle structuring element of 7 pixels high and 11 pixels width, so any two pixels that can be hit by this rectangle, belong to the same connected component. The values 7 and 11 were chosen experimentally and depend on the font size.
-                    
-              
        
-              
        
-                
        
-                  
        >>> from Numeric import ones
        
-                  
        
-                  
        >>> sew = mmimg2se(mmbinary(ones((7,11))))
        
-                  
        
-                  
        >>> mmseshow(sew)
        
-                  
        array([[1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1]],'1')
        
-                  
        >>> fw=mmlabel(f,sew)
        
-                  
        
-                  
        >>> mmlblshow(fw)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        fw
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Finally, label the paragraphs.
        
-          
        
-            
        
-              
        
-                        Similarly, paragraphs are closed words. In this case the connectivity is given by a rectangle of 35 by 20 pixels.
-                    
-              
        
-              
        
-                
        
-                  
        >>> sep = mmimg2se(mmbinary(ones((20,35))))
        
-                  
        
-                  
        >>> fp=mmlabel(f,sep)
        
-                  
        
-                  
        >>> mmlblshow(fp)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        fp
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-          
-        
        mmlabelLabel a binary image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdasp]
-                
-                    [Up]
-                    
-                    [mmdbeef]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdleaf.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdleaf.html
deleted file mode 100644
index 039b0d6bcc92..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdleaf.html
+++ /dev/null
@@ -1,240 +0,0 @@
-
-  
-    
-    mmdleaf
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdholecenter]
-              
-                  [Up]
-                  
-                  [mmdlith]
-              Demonstrations
        
-    
        mmdleaf
-      
        
-      Segment a leaf from the background
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      This experiment demonstrate the use of the toggle to segment an image with ill defined borders.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading 
        
-          
        
-            
        
-              
        
-                        The gray scale image to be processed is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmreadgray('leaf.tif')
        
-                  
        
-                  
        >>> mmshow(f)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Simple thresholding
        
-          
        
-            
        
-              
        
-                        Although the leaf was pictured on a light background, it is not possible to fully segment the leaf using a simple thresholding
-                    
-              
        
-              
        
-                
        
-                  
        >>> f_low=mmthreshad(f,100)
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> f_med=mmthreshad(f,128)
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> f_high=mmthreshad(f,160)
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(f_low)
        
-                  
        
-                  
        >>> mmshow(f_med)
        
-                  
        
-                  
        >>> mmshow(f_high)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        f_lowf_med
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f_high
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Toggle
        
-          
        
-            
        
-              
        
-                        The toggle is a non-linear image enhancement that changes the pixel value to the maximum or the minimum in the neighborhood given by the structure element, depending which one is the nearest value. The result of the toggle is that near the edges, the image is better defined.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f1=mmtoggle(f,mmero(f,mmsedisk(7)),mmdil(f,mmsedisk(7)))
        
-                  
        
-                  
        >>> mmshow(f1)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f1
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
         Thresholding and area open
        
-          
        
-            
        
-              
        
-                        The thresholding can now be applied resulting a good definition of the leaf boarder. Small white spots can be removed by the area open filter.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f2=mmthreshad(f1,100)
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> f3=mmareaopen(f2,80)
        
-                  
        
-                  
        >>> mmshow(f2)
        
-                  
        
-                  
        >>> mmshow(f3)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        f2f3
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        For illustration, the contour of the segmented leaf is overlayed in red in the original image
-                    
-              
        
-              
        
-                
        
-                  
        >>> f4=mmgradm(f3)
        
-                  
        
-                  
        >>> mmshow(f,f4)
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f,f4
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdholecenter]
-                
-                    [Up]
-                    
-                    [mmdlith]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdlith.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdlith.html
deleted file mode 100644
index 9c3b980a084a..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdlith.html
+++ /dev/null
@@ -1,234 +0,0 @@
-
-  
-    
-    mmdlith
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdleaf]
-              
-                  [Up]
-                  
-                  [mmdpcb]
-              Demonstrations
        
-    
        mmdlith
-      
        
-      Detect defects in a microelectronic circuit.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a gray-scale image of a microelectronic circuit. The relevant objects in this image are vertical metal stripes. These stripes have some irregularities that should be detected. Our procedure takes the residues of a gray-scale closing and filter (by size) the threshold of the residues.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The input image is read. The image is also displayed as a surface model.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('r4x2_256.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                  
        >>> mmshow(mmsurf(a));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ammsurf(a)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Closing 
        
-          
        
-            
        
-              
        
-                        Closing of the image by a vertical line of length 25 pixels. Then subtract it from the original. The sequence closing-subtraction is called closing top-hat. (This could be executed in a single command: c=
-                mmcloseth(a,
-                mmseline(25,90));).
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmclose(a,mmseline(25,90));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                  
        >>> mmshow(mmsurf(b));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        bmmsurf(b)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Subtraction
        
-          
        
-            
        
-              
        
-                        Subtraction of the closing from the original is called closing top-hat. It shows the discrepancies of the image where the structuring element cannot fit the surface. In this case, it highlights vertical depression with length longer than 25 pixels.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmsubm(b,a);
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                  
        >>> mmshow(mmsurf(c));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        cmmsurf(c)
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding and Area Open
        
-          
        
-            
        
-              
        
-                        Threshold on the residues image. Elimination of the small objects by area open.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmcmp(c,'>=',50);
        
-                  
        
-                  
        >>> e = mmareaopen(d,5);
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                  
        >>> mmshow(e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        de
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        Overlay the detected defects over the original image, and over the surface display.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,e);
        
-                  
        
-                  
        >>> mmshow(mmsurf(a),e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        a,emmsurf(a),e
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdleaf]
-                
-                    [Up]
-                    
-                    [mmdpcb]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpcb.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpcb.html
deleted file mode 100644
index 2a249df31760..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpcb.html
+++ /dev/null
@@ -1,347 +0,0 @@
-
-  
-    
-    mmdpcb
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdlith]
-              
-                  [Up]
-                  
-                  [mmdpieces]
-              Demonstrations
        
-    
        mmdpcb
-      
        
-      Decompose a printed circuit board in its main parts.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a binary image of a printed circuit board. The decomposition is created mainly using openings by structural elements that depends on the geometry of the circuit board.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The binary image of a printed circuit board is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('pcb1bin.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detecting holes
        
-          
        
-            
        
-              
        
-                        A new image is created by filling the holes. The input image is subtracted from this new image with holes. The resulting residues are  the holes.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmclohole(a);
        
-                  
        
-                  
        >>> holes = mmsubm(b,a);
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                  
        >>> mmshow(a, holes);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        ba, holes
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detecting square islands
        
-          
        
-            
        
-              
        
-                        The square islands are detected using an opening by a square of size 17x17.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmopen(b,mmsebox(8));
        
-                  
        
-                  
        >>> square = mmcdil(c, a);
        
-                  
        
-                  
        >>> mmshow(b, c);
        
-                  
        
-                  
        >>> mmshow(holes, square);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        b, choles, square
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detecting circle islands
        
-          
        
-            
        
-              
        
-                        The circle islands are detected using an opening by an Euclidean disk  on a residues image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmsubm(b, c);
        
-                  
        
-                  
        >>> g = mmopen(f, mmsedisk(8));
        
-                  
        
-                  
        >>> circle = mmcdil(g,a);
        
-                  
        
-                  
        >>> mmshow(f, g);
        
-                  
        
-                  
        >>> mmshow(holes, square, circle);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        f, gholes, square, circle
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detecting rectangular islands
        
-          
        
-            
        
-              
        
-                        The rectangular islands are detected using an opening by a rectangle of size 25 x 8 on a residues image. The rectangle structuring element is built from the composition of vertical and horizontal lines.
-                    
-              
        
-              
        
-                
        
-                  
        >>> i = mmsubm(f, g);
        
-                  
        
-                  
        >>> m = mmopen(i,mmsedil(mmseline(8,90), mmseline(25)));
        
-                  
        
-                  
        >>> rect = mmcdil(m,a);
        
-                  
        
-                  
        >>> mmshow(i, m);
        
-                  
        
-                  
        >>> mmshow(holes, square, circle, rect);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        i, mholes, square, circle, rect
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detecting thick connections
        
-          
        
-            
        
-              
        
-                        The thick connections are detected using an opening by a square on a residues image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> o = mmsubm(i,m);
        
-                  
        
-                  
        >>> p = mmopen(o, mmsebox(2));
        
-                  
        
-                  
        >>> thin = mmcdil(p,a);
        
-                  
        
-                  
        >>> mmshow(o, p);
        
-                  
        
-                  
        >>> mmshow(holes, square, circle, rect, thin);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        o, pholes, square, circle, rect, thin
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detecting thin connections
        
-          
        
-            
        
-              
        
-                        The thin connections are detected using an opening by a square on a  residues image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> r = mmsubm(o,p);
        
-                  
        
-                  
        >>> s = mmopen(r, mmsebox());
        
-                  
        
-                  
        >>> thick = mmcdil(s,a);
        
-                  
        
-                  
        >>> mmshow(r, s);
        
-                  
        
-                  
        >>> mmshow(holes, square, circle, rect, thin, thick);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        r, sholes, square, circle, rect, thin, thick
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Displaying all together
        
-          
        
-            
        
-              
        
-                        The main components of the circuit are overlayed and presented in a single image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(holes, square, circle, rect, thin, thick);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        holes, square, circle, rect, thin, thick
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdlith]
-                
-                    [Up]
-                    
-                    [mmdpieces]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpieces.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpieces.html
deleted file mode 100644
index 4ae796ef5e4e..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpieces.html
+++ /dev/null
@@ -1,488 +0,0 @@
-
-  
-    
-    mmdpieces
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdpcb]
-              
-                  [Up]
-                  
-                  [mmdpotatoes]
-              Demonstrations
        
-    
        mmdpieces
-      
        
-      Classify two dimensional pieces.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a binary image typically found in industrial automation applications. It has three types of objects: rings, nails and T-pins. Our procedure for identification of these classes of objects is based on thickening, thinning and reconstruction.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The binary image of the pieces is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('pieces_bw.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Contour noise reduction
        
-          
        
-            
        
-              
        
-                        An homotopic thickening is applied to reduce contour noise.
-                    
-              
        
-              
        
-                
        
-                  
        >>> seA = mmimg2se(mmbinary([[0,1,0],[1,0,1],[0,0,0]]))
        
-                  
        
-                  
        >>> seB = mmimg2se(mmbinary([[0,0,0],[0,1,0],[0,0,0]]))
        
-                  
        
-                  
        >>> iAB = mmse2hmt(seA,seB);
        
-                  
        
-                  
        >>> print mmintershow(iAB)
        
-                  
        . 1 . 
-1 0 1 
-. . .
        
-                  
        >>> b = mmthick(a, iAB);
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Skeleton
        
-          
        
-            
        
-              
        
-                        The homotopic skeleton by thinning is created.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmthin(b);
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Skeleton pruning
        
-          
        
-            
        
-              
        
-                        The open lines of the skeleton are pruned by the end point thinning. The remaining skeleton components will be loops, identifying the rings.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmthin(c,mmendpoints());
        
-                  
        
-                  
        >>> mmshow(c,d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c,d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detect rings
        
-          
        
-            
        
-              
        
-                        Extraction of the rings by reconstruction of the thicked image from the filtered skeleton.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mminfrec(d,b);
        
-                  
        
-                  
        >>> mmshow(e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Rings in the input image
        
-          
        
-            
        
-              
        
-                        Restriction of the objects detected to the input-image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mmintersec(a,e);
        
-                  
        
-                  
        >>> mmshow(f);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Skeleton of the remaining objects
        
-          
        
-            
        
-              
        
-                        It eliminates the skeleton of the rings.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g = mmsubm(c,e);
        
-                  
        
-                  
        >>> mmshow(g);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        g
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        End points filtering
        
-          
        
-            
        
-              
        
-                        It removes sucessively 4 end-points to let T junctions just on  T-pins.
-                    
-              
        
-              
        
-                
        
-                  
        >>> h = mmthin(g, mmendpoints(), 4);
        
-                  
        
-                  
        >>> mmshow(h);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        h
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        T-pins markers
        
-          
        
-            
        
-              
        
-                        It detects triple points, applying the union of matchings with two  templates. These points will identify (mark) the T-pins.
-                    
-              
        
-              
        
-                
        
-                  
        >>> seA1 = mmimg2se(mmbinary([[0,1,0],[0,1,0],[1,0,1]]))
        
-                  
        
-                  
        >>> seB1 = mmimg2se(mmbinary([[0,0,0],[1,0,1],[0,1,0]]))
        
-                  
        
-                  
        >>> seA2 = mmimg2se(mmbinary([[0,1,0],[1,1,1],[0,0,0]]))
        
-                  
        
-                  
        >>> seB2 = mmimg2se(mmbinary([[1,0,1],[0,0,0],[0,1,0]]))
        
-                  
        
-                  
        >>> i1 = mmsupcanon(h, mmse2hmt(seA1,seB1));
        
-                  
        
-                  
        >>> i2 = mmsupcanon(h, mmse2hmt(seA2,seB2));
        
-                  
        
-                  
        >>> i = mmunion(i1,i2);
        
-                  
        
-                  
        >>> mmshow(h,mmdil(i,mmsedisk(2)));
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        h,mmdil(i,mmsedisk(2))
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detect T-pins
        
-          
        
-            
        
-              
        
-                        Detection of the T-pins by reconstruction of the ticked image from the T-pin markers.
-                    
-              
        
-              
        
-                
        
-                  
        >>> j = mminfrec(i,b,mmsebox());
        
-                  
        
-                  
        >>> mmshow(j);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        j
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        T-pins in the input image
        
-          
        
-            
        
-              
        
-                        Restriction of the objects detect to the input image
-                    
-              
        
-              
        
-                
        
-                  
        >>> k = mmintersec(a,j);
        
-                  
        
-                  
        >>> mmshow(k);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        k
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Detect nails
        
-          
        
-            
        
-              
        
-                        The nails are imediatly detected by the subtration of the images of the rings and T-pints from the input image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> l = mmsubm(mmsubm(a,f),k);
        
-                  
        
-                  
        >>> mmshow(l);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        l
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Color composition
        
-          
        
-            
        
-              
        
-                        The result of the classification is presented in a pseudo color image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> m = mmgray(f,'uint8',1);
        
-                  
        
-                  
        >>> n = mmgray(k,'uint8',2);
        
-                  
        
-                  
        >>> o = mmgray(l,'uint8',3);
        
-                  
        
-                  
        >>> p = mmunion(m,n,o);
        
-                  
        
-                  
        >>> mmlblshow(p);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        p
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdpcb]
-                
-                    [Up]
-                    
-                    [mmdpotatoes]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpotatoes.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpotatoes.html
deleted file mode 100644
index 4c3ff4f71c01..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdpotatoes.html
+++ /dev/null
@@ -1,247 +0,0 @@
-
-  
-    
-    mmdpotatoes
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdpieces]
-              
-                  [Up]
-                  
-                  [mmdrobotop]
-              Demonstrations
        
-    
        mmdpotatoes
-      
        
-      Grade potato quality by shape and skin spots.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a gray-scale image of several washed potatoes. The shape of the potatoes is analysed using skeleton feature and the skin spots are detected. These two features can be used to evaluate their visual quality.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The input image is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('potatoes.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding
        
-          
        
-            
        
-              
        
-                        Convert to binary objects by thresholding
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmthreshad(a,90);
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Skeleton of the potato shapes
        
-          
        
-            
        
-              
        
-                        The binary image is thinned and the result overlayed on the original image
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmthin(b);
        
-                  
        
-                  
        >>> mmshow(a,c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Closing tophat
        
-          
        
-            
        
-              
        
-                        To detect the skin spots, a closing tophat can enhance the dark areas of the image
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmcloseth(a,mmsedisk(5));
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding and masking
        
-          
        
-            
        
-              
        
-                        The tophat is thresholded and the result is masked with the binary image of the potatoes as we are interested only on the spots inside them
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mmthreshad(d,20);
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> f = mmintersec(e,b);
        
-                  
        
-                  
        >>> mmshow(f);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        Show both results: skeleton and skin spots overlayed on the original image
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a);
        
-                  
        
-                  
        >>> mmshow(a,f,c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                      
-                    
-                    
-                      
-                      
-                      
-                    
-                  
-                
        aa,f,c
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdpieces]
-                
-                    [Up]
-                    
-                    [mmdrobotop]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdrobotop.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdrobotop.html
deleted file mode 100644
index 68589b921473..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdrobotop.html
+++ /dev/null
@@ -1,181 +0,0 @@
-
-  
-    
-    mmdrobotop
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdpotatoes]
-              
-                  [Up]
-                  
-                  [mmdruler]
-              Demonstrations
        
-    
        mmdrobotop
-      
        
-      Detect marks on a robot.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input-image is a gray-scale image of a rounded-shaped robot, viewed by a camera mounted on the ceiling. The procedure detects two white marks on top of the robot. This is a typical example of application of the top-hat operator in image segmentation.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading 
        
-          
        
-            
        
-              
        
-                        The gray-scale image of the robot top view is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('robotop.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Open top-hat
        
-          
        
-            
        
-              
        
-                        It detects white regions smaller than a square of radius 4.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmopenth(a,mmsebox(4));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Opening
        
-          
        
-            
        
-              
        
-                        It removes white objects smaller than a square of radius 1.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmopen(b,mmsebox());
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding
        
-          
        
-            
        
-              
        
-                        It detects the robot markers. This is a very robust thresholding  (i.e., the result is not sensible to small changes in the value of the  threshold parameter). The original image is overlayed by the detected robot markers.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmthreshad(c,100);
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(a,d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,d
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdpotatoes]
-                
-                    [Up]
-                    
-                    [mmdruler]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdruler.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdruler.html
deleted file mode 100644
index d4616322a5d4..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdruler.html
+++ /dev/null
@@ -1,365 +0,0 @@
-
-  
-    
-    mmdruler
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdrobotop]
-              
-                  [Up]
-                  
-                  [mmdsoil]
-              Demonstrations
        
-    
        mmdruler
-      
        
-      Detect defects in a ruler.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input image is a gray-scale image of a ruler, that has a number touching a tick mark. This number and mark are detected based on morphological and connected filtering.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The gray-scale image of the ruler is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('mm3.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Segmentation
        
-          
        
-            
        
-              
        
-                        The close top-hat operator followed by a thresholding is applied.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmthreshad( mmcloseth(a,mmsebox(5)),40);
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Size filtering
        
-          
        
-            
        
-              
        
-                        The vertical lines longer than 50 pixels are detected.
-                    
-              
        
-              
        
-                
        
-                  
        >>> c = mmopen(b,mmseline(50,90));
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Ruler tick marks filtering
        
-          
        
-            
        
-              
        
-                        It closes ruler tick marks gaps.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d =mmclose(c,mmseline(15));
        
-                  
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Ruler tick marks connection
        
-          
        
-            
        
-              
        
-                        It detects all objects connected to the ruler tick markers.
-                    
-              
        
-              
        
-                
        
-                  
        >>> e = mminfrec(d,b);
        
-                  
        
-                  
        >>> mmshow(e);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        e
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Ruler tick mark vertical connection
        
-          
        
-            
        
-              
        
-                        It detects all objects vertically connected to the ruler tick mark. Note that the 3x1 rectangle is used as structuring element in the vertical  reconstruction.
-                    
-              
        
-              
        
-                
        
-                  
        >>> f = mminfrec(d,b,mmseline(3,90));
        
-                  
        
-                  
        >>> mmshow(f);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        f
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Non ruler tick mark vertical connection
        
-          
        
-            
        
-              
        
-                        The residues obtained from the previous image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> g = mmsubm(e,f);
        
-                  
        
-                  
        >>> mmshow(g);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        g
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Ruler tick marks detection
        
-          
        
-            
        
-              
        
-                        It uses an opening by an elementary cross structuring element to  eliminate the artifacts.
-                    
-              
        
-              
        
-                
        
-                  
        >>> h = mmopen(g);
        
-                  
        
-                  
        >>> mmshow(h);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        h
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Objects detection
        
-          
        
-            
        
-              
        
-                        It detects the objects connected to ruler tick marks. A reconstruction  from the ruler marks detected is applied.
-                    
-              
        
-              
        
-                
        
-                  
        >>> i = mminfrec(h, b);
        
-                  
        
-                  
        >>> mmshow(i);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        i
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final presentation
        
-          
        
-            
        
-              
        
-                        Overlay the detected defect over the original image
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,i);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,i
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdrobotop]
-                
-                    [Up]
-                    
-                    [mmdsoil]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdsoil.html b/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdsoil.html
deleted file mode 100644
index 34dd32c407d0..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmdemos/mmdsoil.html
+++ /dev/null
@@ -1,207 +0,0 @@
-
-  
-    
-    mmdsoil
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdruler]
-              
-                  [Up]
-                  Demonstrations
        
-    
        mmdsoil
-      
        
-      Detect fractures in soil.
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The input-image is a gray-scale image of soil that has some thin fractures. These fractures are detected by the application of the top-hat and area open operators.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Demo Script
        
-      
        
-        
        
-          
        Reading
        
-          
        
-            
        
-              
        
-                        The image of fractures in soil is read.
-                    
-              
        
-              
        
-                
        
-                  
        >>> a = mmreadgray('soil.tif');
        
-                  
        
-                  
        >>> mmshow(a);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Fractures enhancement
        
-          
        
-            
        
-              
        
-                        The fracture lines are enhanced by the close top-hat operator.
-                    
-              
        
-              
        
-                
        
-                  
        >>> b = mmcloseth(a,mmsebox(2));
        
-                  
        
-                  
        >>> mmshow(b);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        b
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Gray-scale area open
        
-          
        
-            
        
-              
        
-                        Small connected bright regions are removed by the gray-scale area open operator. Note the connectivity used (
-                mmsebox: 8-connected).
-                    
-              
        
-              
        
-                
        
-                  
        >>> c= mmareaopen(b,80,mmsebox());
        
-                  
        
-                  
        >>> mmshow(c);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        c
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Thresholding
        
-          
        
-            
        
-              
        
-                        The fracture lines are detected. This threshold is very robust.
-                    
-              
        
-              
        
-                
        
-                  
        >>> d = mmthreshad(c,15);
        
-                  
        Warning: Converting input image from int32 to uint8.
        
-                  
        >>> mmshow(d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        d
        
-              
        
-            
        
-          
        
-        
        
-        
        
-          
        Final display
        
-          
        
-            
        
-              
        
-                        Overlay of the fracture lines over the original image.
-                    
-              
        
-              
        
-                
        
-                  
        >>> mmshow(a,d);
        
-                  
        
-                
        
-                
-                  
-                    
-                      
-                      
-                    
-                    
-                      
-                      
-                    
-                  
-                
        a,d
        
-              
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdruler]
-                
-                    [Up]
-                    Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mminfo/index.html b/python/plugins/sextante/pymorph/html/morph/mminfo/index.html
deleted file mode 100644
index a18f96e28dc3..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mminfo/index.html
+++ /dev/null
@@ -1,78 +0,0 @@
-
-  
-    
-    Basic Concepts
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [Up] 
-                  
-                      [Demonstrations]
-                  
-                      [Basic Concepts]
-                  
-                      [Functions]
-                  
-                      [Data Types]
-                  pymorph Morphology Toolbox V0.8 01Aug03
        
-    
        Basic Concepts
-      
        
-      Installation, Image model, etc
-
-    
        
-    
        Installation and Software Evolution
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmregisterRegister the SDC Morphology Toolbox.
-
        mmversionSDC Morphology Toolbox version.
-
        mmbenchbenchmarking main functions of the toolbox.
-
        mminstallVerify if the Morphology Toolbox is registered. 
-
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [Up] 
-                    
-                        [Demonstrations]
-                    
-                        [Basic Concepts]
-                    
-                        [Functions]
-                    
-                        [Data Types]
-                    Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mminfo/mmbench.html b/python/plugins/sextante/pymorph/html/morph/mminfo/mmbench.html
deleted file mode 100644
index 1d19dc1b814d..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mminfo/mmbench.html
+++ /dev/null
@@ -1,164 +0,0 @@
-
-  
-    
-    mmbench
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmversion]
-              
-                  [Up]
-                  
-                  [mminstall]
-              Installation and Software Evolution
        
-    
        mmbench
-      
        
-      benchmarking main functions of the toolbox.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        
-          mmbench(
-                  
-          count = 10
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        countDouble
        Number of repetitions of each function.
        Default: 
-                      10
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmbench measures the speed of many of SDC Morphology Toolbox functions in seconds. An illustrative example of the output of 
-          mmbench is, for a MS-Windows 2000 Pentium 4, 2.4GHz, 533MHz system bus, machine:
-
-          
        
-          
        SDC Morphology Toolbox V1.2 27Sep02 Benchmark
-Made on  Wed Jul 16 15:33:17 2003  computer= win32
-image filename= csample.jpg  width= 640 , height= 480
-    Function                            time (sec.)
- 1. Union  bin                       0.00939999818802
- 2. Union  gray-scale                0.00319999456406
- 3. Dilation  bin, mmsecross         0.0110000014305
- 4. Dilation  gray, mmsecross        0.00780000686646
- 5. Dilation  gray, non-flat 3x3 SE  0.0125
- 6. Open      bin, mmsecross         0.0125
- 7. Open      gray-scale, mmsecross  0.0141000032425
- 8. Open      gray, non-flat 3x3 SE  0.0235000014305
- 9. Distance  mmsecross              0.021899998188
-10. Distance  Euclidean              0.0264999985695
-11. Geodesic distance mmsecross      0.028100001812
-12. Geodesic distance Euclidean      0.303100001812
-13. Area open bin                    0.0639999985695
-14. Area open gray-scale             0.148500001431
-15. Label mmsecross                  0.071899998188
-16. Regional maximum, mmsecross      0.043700003624
-17. Open by rec, gray, mmsecross     0.0515000104904
-18. ASF by rec, oc, mmsecross, 1     0.090600001812
-19. Gradient, gray-scale, mmsecross  0.0171999931335
-20. Thinning                         0.0984999895096
-21. Watershed                        0.268799996376
-    Average                          0.0632523809161
-
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmbench(count=10):
-    from sys import platform
-    from time import time, asctime
-    from Numeric import average, zeros
-    filename = 'csample.jpg'
-    f = mmreadgray(filename)
-    fbin=mmthreshad(f,150)
-    se = mmimg2se(mmbinary([[0,1,0],[1,1,1],[0,1,0]]),'NON-FLAT',int32([[0,1,0],[1,2,1],[0,1,0]]))
-    m=mmthin(fbin)
-    tasks=[
-       [' 1. Union  bin                      ','mmunion(fbin,fbin)'],
-       [' 2. Union  gray-scale               ','mmunion(f,f)'],
-       [' 3. Dilation  bin, mmsecross        ','mmdil(fbin)'],
-       [' 4. Dilation  gray, mmsecross       ','mmdil(f)'],
-       [' 5. Dilation  gray, non-flat 3x3 SE ','mmdil(f,se)'],
-       [' 6. Open      bin, mmsecross        ','mmopen(fbin)'],
-       [' 7. Open      gray-scale, mmsecross ','mmopen(f)'],
-       [' 8. Open      gray, non-flat 3x3 SE ','mmopen(f,se)'],
-       [' 9. Distance  mmsecross             ','mmdist(fbin)'],
-       ['10. Distance  Euclidean             ','mmdist(fbin,mmsebox(),"euclidean")'],
-       ['11. Geodesic distance mmsecross     ','mmgdist(fbin,m)'],
-       ['12. Geodesic distance Euclidean     ','mmgdist(fbin,m,mmsebox(),"euclidean")'],
-       ['13. Area open bin                   ','mmareaopen(fbin,100)'],
-       ['14. Area open gray-scale            ','mmareaopen(f,100)'],
-       ['15. Label mmsecross                 ','mmlabel(fbin)'],
-       ['16. Regional maximum, mmsecross     ','mmregmax(f)'],
-       ['17. Open by rec, gray, mmsecross    ','mmopenrec(f)'],
-       ['18. ASF by rec, oc, mmsecross, 1    ','mmasfrec(f)'],
-       ['19. Gradient, gray-scale, mmsecross ','mmgradm(f)'],
-       ['20. Thinning                        ','mmthin(fbin)'],
-       ['21. Watershed                       ','mmcwatershed(f,fbin)']]
-    result = zeros((21),'d')
-    for t in range(len(tasks)):
-       print tasks[t][0],tasks[t][1]
-       t1=time()
-       for k in range(count):
-          a=eval(tasks[t][1])
-       t2=time()
-       result[t]= (t2-t1)/(count+0.0)
-    print mmversion() +' Benchmark'
-    print 'Made on ',asctime(),' computer=',platform
-    print 'image filename=',filename,' width=', f.shape[1],', height=',f.shape[0]
-    print '    Function                            time (sec.)'
-    for j in range(21):
-     print tasks[j][0], result[j]
-    print '    Average                         ', average(result)
-    out=[]
-    
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmversion]
-                
-                    [Up]
-                    
-                    [mminstall]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mminfo/mminstall.html b/python/plugins/sextante/pymorph/html/morph/mminfo/mminstall.html
deleted file mode 100644
index e4400b71117d..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mminfo/mminstall.html
+++ /dev/null
@@ -1,113 +0,0 @@
-
-  
-    
-    mminstall
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmbench]
-              
-                  [Up]
-                  Installation and Software Evolution
        
-    
        mminstall
-      
        
-      Verify if the Morphology Toolbox is registered. 
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        
-          mminstall(
-                  
-          code = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        codeString
        Authorization code.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mminstall verifies if the toolbox is registered or not. If not, it identifies the internal code that must be used to get the authorization code from the software manufacturer.  
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mminstall(code=None):
-    mmver = ''
-    if code is None:
-       s = mmregister()
-       if s[0:8] != 'Licensed':
-          print 'Please access the web site http://www.mmorph.com/cgi-bin/pymorph-reg.cgi'
-          print 'and use the internal code below to obtain your license'
-          print s
-          print 'If you have any difficulty, please inform morph@mmorph.com'
-          return
-    else:
-       if mmregister(code,'pymorph_license.txt'):
-          s=mmregister()
-          if s[0:8] != 'Licensed':
-            print 'Could not license the toolbox.'
-            return
-          else:
-            print 'Toolbox registered successfully.'
-       else:
-          print 'The library file could not be registered'
-          return
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmbench]
-                
-                    [Up]
-                    Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mminfo/mmregister.html b/python/plugins/sextante/pymorph/html/morph/mminfo/mmregister.html
deleted file mode 100644
index c4ff8136b5e3..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mminfo/mmregister.html
+++ /dev/null
@@ -1,125 +0,0 @@
-
-  
-    
-    mmregister
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [Up]
-                  
-                  [mmversion]
-              Installation and Software Evolution
        
-    
        mmregister
-      
        
-      Register the SDC Morphology Toolbox.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        s = 
-          mmregister(
-                  
-          code = None, 
-          file_name = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        codeString
        Authorization code.
        Default: 
-                      None
-                    
        file_nameString
        Filename of the license file to be created.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        sString
        Message of the status of the license.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmregister licenses the copy of the SDC Morphology Toolbox by entering the license code and the toolbox license file. If 
-          mmregister is called without parameters, it returns the internal code that must be sent for registration.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmregister(code=None, file_name=None):
-    s = 'License is not required'
-    return s
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmversionSDC Morphology Toolbox version.
        mminstallVerify if the Morphology Toolbox is registered. 
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [Up]
-                    
-                    [mmversion]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mminfo/mmversion.html b/python/plugins/sextante/pymorph/html/morph/mminfo/mmversion.html
deleted file mode 100644
index a13a2d38ef1b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mminfo/mmversion.html
+++ /dev/null
@@ -1,109 +0,0 @@
-
-  
-    
-    mmversion
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmregister]
-              
-                  [Up]
-                  
-                  [mmbench]
-              Installation and Software Evolution
        
-    
        mmversion
-      
        
-      SDC Morphology Toolbox version.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        S = 
-          mmversion(
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        SString
        ( description of the version).
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmversion gives the SDC Morphology Toolbox version.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> print mmversion()
        
-              
        Expiring in 22 days.
-SDC Morphology Toolbox V1.2 27Sep02
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmversion():
-    return __version_string__
-    return S
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmregister]
-                
-                    [Up]
-                    
-                    [mmbench]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/index.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/index.html
deleted file mode 100644
index a99dd60c673f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/index.html
+++ /dev/null
@@ -1,92 +0,0 @@
-
-  
-    
-    Data Types
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [Up] 
-                  
-                      [Demonstrations]
-                  
-                      [Basic Concepts]
-                  
-                      [Functions]
-                  
-                      [Data Types]
-                  pymorph Morphology Toolbox V0.8 01Aug03
        
-    
        Data Types
-      
        
-      
-    
        
-    
        Data Types
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmImageToolbox image datatype
-
        mmSeToolbox structuring element datatype
-
        mmIntervalInterval or hit-or-miss template
-
        mmBooleanToolbox boolean datatype
-
        mmDoubleToolbox double datatype
-
        mmStringToolbox string datatype
-
        mmCoordImage pixel coordinates
-
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [Up] 
-                    
-                        [Demonstrations]
-                    
-                        [Basic Concepts]
-                    
-                        [Functions]
-                    
-                        [Data Types]
-                    Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmBoolean.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/mmBoolean.html
deleted file mode 100644
index a76748222572..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmBoolean.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-  
-    
-    mmBoolean
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmInterval]
-              
-                  [Up]
-                  
-                  [mmDouble]
-              Data Types
        
-    
        mmBoolean
-      
        
-      Toolbox boolean datatype
-
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmInterval]
-                
-                    [Up]
-                    
-                    [mmDouble]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmCoord.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/mmCoord.html
deleted file mode 100644
index ef88c9b6579a..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmCoord.html
+++ /dev/null
@@ -1,84 +0,0 @@
-
-  
-    
-    mmCoord
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmString]
-              
-                  [Up]
-                  Data Types
        
-    
        mmCoord
-      
        
-      Image pixel coordinates
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The pixel coordinates data type is an int32 vector of up to three values depending on the image dimensionality: 1D: [column]; 2D: [row,column]; 3D: [depth,row,column]. The top-left pixel of a 2D image is at the coordinates [0,0]. The center pixel of a structuring element is at coordinates [0,0] increasing from left to right and top to down.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-                          In the example below, a one pixel structuring element centered at the origin [0,0] is translated one row down and two columns to the left:
-
-          
        
-            
        
-              
        >>> b = mmsetrans(mmbinary([1]),[1,-2])
        
-              
        
-              
        >>> print mmseshow(b)
        
-              
        [[0 0 0 0 0]
- [0 0 0 0 0]
- [1 0 0 0 0]]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmSeToolbox structuring element datatype
        mmsetransTranslate a structuring element
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmString]
-                
-                    [Up]
-                    Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmDouble.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/mmDouble.html
deleted file mode 100644
index 0c1994357c4e..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmDouble.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-  
-    
-    mmDouble
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmBoolean]
-              
-                  [Up]
-                  
-                  [mmString]
-              Data Types
        
-    
        mmDouble
-      
        
-      Toolbox double datatype
-
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmBoolean]
-                
-                    [Up]
-                    
-                    [mmString]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmImage.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/mmImage.html
deleted file mode 100644
index 1f46ed88e87b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmImage.html
+++ /dev/null
@@ -1,133 +0,0 @@
-
-  
-    
-    mmImage
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [Up]
-                  
-                  [mmSe]
-              Data Types
        
-    
        mmImage
-      
        
-      Toolbox image datatype
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The Morphology Toolbox mainly supports four types of images according to their pixel datatypes : binary, unsigned gray scale uint8 and uint16, and signed gray scale int32. Most functions work for 1D, 2D and 3D images. If an operation involves images of specific datatype, an automatic conversion can take place, controlled by the function 
-          mmfreedom. To verify the datatype of an image, use the functions: 
-          mmdatatype and 
-          mmlimits.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-                          In the examples below, all images has pixels with values zero and one, but only the first one is a binary image. This can be verified by calling the function mmlimits that outputs the minimum and maximum pixel values allowed in an image.
-
-          
        
-            
        
-              
        >>> f1 = mmbinary([[0,1,0,1],
-                   [0,0,1,1]])
        
-              
        
-              
        >>> print mmlimits(f1)
        
-              
        [0 1]
        
-              
        >>> print mmdatatype(f1)
        
-              
        binary
        
-              
        >>> f2 = uint8([[0,1,0,1],
-                [0,0,1,1]])
        
-              
        
-              
        >>> print mmlimits(f2)
        
-              
        [  0 255]
        
-              
        >>> print mmdatatype(f2)
        
-              
        uint8
        
-              
        >>> f3 = uint16([[0,1,0,1],
-                [0,0,1,1]])
        
-              
        
-              
        >>> print mmlimits(f3)
        
-              
        [    0 65535]
        
-              
        >>> print mmdatatype(f3)
        
-              
        uint16
        
-              
        >>> f4 = int32([[0,1,0,1],
-               [0,0,1,1]])
        
-              
        
-              
        >>> print mmlimits(f4)
        
-              
        [-2147483647  2147483647]
        
-              
        >>> print mmdatatype(f4)
        
-              
        int32
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmbinaryConvert a gray-scale image into a binary image
        uint8Convert an image to an uint8 image.
        uint16Convert an image to a uint16 image.
        int32Convert an image to an int32 image.
        mmshowDisplay binary or gray-scale images and optionally overlay it with binary images.
        mmdatatypeReturn the image datatype string
        mmlimitsGet the possible minimum and maximum of an image.
        mmfreedomControl automatic data type conversion.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [Up]
-                    
-                    [mmSe]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmInterval.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/mmInterval.html
deleted file mode 100644
index 870f171dcf76..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmInterval.html
+++ /dev/null
@@ -1,100 +0,0 @@
-
-  
-    
-    mmInterval
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmSe]
-              
-                  [Up]
-                  
-                  [mmBoolean]
-              Data Types
        
-    
        mmInterval
-      
        
-      Interval or hit-or-miss template
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The hit-or-miss template (also called interval) is defined by two structuring elements: one associated to the 'hit' template, and the other associated to the 'miss' template. A hit-or-miss template can be build with the function 
-          mmse2hmt and can be visualized with 
-          mmintershow.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> print mmintershow(mmhomothin())
        
-              
        0 0 0 
-. 1 . 
-1 1 1
        
-              
        >>> A  = mmbinary([[0,1,0],[1,0,1],[0,0,0]])
        
-              
        
-              
        >>> Bc = mmbinary([[0,0,0],[0,1,0],[0,0,0]])
        
-              
        
-              
        >>> T = mmse2hmt(A,Bc)
        
-              
        
-              
        >>> print mmintershow(T)
        
-              
        . 1 . 
-1 0 1 
-. . .
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmintershowVisualize an interval.
        mmhomothinInterval for homotopic thinning.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmSe]
-                
-                    [Up]
-                    
-                    [mmBoolean]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmSe.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/mmSe.html
deleted file mode 100644
index 94f7634d279e..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmSe.html
+++ /dev/null
@@ -1,104 +0,0 @@
-
-  
-    
-    mmSe
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmImage]
-              
-                  [Up]
-                  
-                  [mmInterval]
-              Data Types
        
-    
        mmSe
-      
        
-      Toolbox structuring element datatype
-
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The structuring element is normally represented by a binary or int32 matrix that by convention the position of the origin [0,0] is at the center of the matrix. The structuring elements can be flat, represented by a binary matrix or non-flat, represented by an uint32 matrix. Sometimes, the structuring element can be represented by an internal data structure so that the best way to visualize a structuring element is by calling the function mmseshow which converts the structuring element to a matrix with the above conventions.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> print mmseshow(mmsecross())
        
-              
        [[0 1 0]
- [1 1 1]
- [0 1 0]]
        
-              
        >>> print mmseshow(mmsecross(),'non-flat')
        
-              
        [[-2147483647           0 -2147483647]
- [          0           0           0]
- [-2147483647           0 -2147483647]]
        
-              
        >>> print mmseshow(mmbinary([0,1,1]))
        
-              
        [0 1 1]
        
-            
        
-          
        A graphical representation of a flat structuring element can be created using the option 'expand' in the mmseshow function:
-
-          
        
-            
        
-              
        >>> B = mmsecross(3)
        
-              
        
-              
        >>> F = mmseshow(B,'expand')
        
-              
        
-              
        >>> mmshow(F)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        F
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmImage]
-                
-                    [Up]
-                    
-                    [mmInterval]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmString.html b/python/plugins/sextante/pymorph/html/morph/mmtypes/mmString.html
deleted file mode 100644
index cd8baa38ea60..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/mmtypes/mmString.html
+++ /dev/null
@@ -1,43 +0,0 @@
-
-  
-    
-    mmString
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmDouble]
-              
-                  [Up]
-                  
-                  [mmCoord]
-              Data Types
        
-    
        mmString
-      
        
-      Toolbox string datatype
-
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmDouble]
-                
-                    [Up]
-                    
-                    [mmCoord]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/index.html b/python/plugins/sextante/pymorph/html/morph/morph/index.html
deleted file mode 100644
index 432be638e7c0..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/index.html
+++ /dev/null
@@ -1,739 +0,0 @@
-
-  
-    
-    Functions
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [Up] 
-                  
-                      [Demonstrations]
-                  
-                      [Basic Concepts]
-                  
-                      [Functions]
-                  
-                      [Data Types]
-                  pymorph Morphology Toolbox V0.8 01Aug03
        
-    
        Functions
-      
        
-      List of all morphological processing functions
-
-    
        
-    
        Data Type Conversion
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmbinaryConvert a gray-scale image into a binary image
-
        mmfreedomControl automatic data type conversion.
-
        mmgrayConvert a binary image into a gray-scale image.
-
        int32Convert an image to an int32 image.
-
        uint8Convert an image to an uint8 image.
-
        uint16Convert an image to a uint16 image.
-
        
-    
        
-    
        Image Creation
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmframeCreate a frame image.
-
        mmdrawvSuperpose points, rectangles and lines on an image.
-
        mmtextCreate a binary image of a text.
-
        
-    
        
-    
        Image Information and Manipulation
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmconcatConcatenate two or more images along width, height or depth.
-
        mmlimitsGet the possible minimum and maximum of an image.
-
        mmmaxleveltypeReturns the maximum value associated to an image datatype
-
        mmdatatypeReturn the image datatype string
-
        mmmat2setConverts image representation from matrix to set
-
        mmset2matConverts image representation from set to matrix
-
        
-    
        
-    
        Image file I/O
        
-    
        
-      
-        
-          
-            
-            
-          
-        
-      
        mmreadgrayRead an image from a commercial file format and stores it as a gray-scale image.
-
        
-    
        
-    
        Relations
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmcmpCompare two images pixelwisely.
-
        mmisVerify if a relationship among images is true or false.
-
        mmisbinaryCheck for binary image
-
        mmisequalVerify if two images are equal
-
        mmislesseqVerify if one image is less or equal another (is beneath)
-
        
-    
        
-    
        Operations
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmnegNegate an image.
-
        mmtoggleImage contrast enhancement or classification by the toggle operator.
-
        mmaddmAddition of two images, with saturation.
-
        mmintersecIntersection of images.
-
        mmsubmSubtraction of two images, with saturation.
-
        mmsymdifSymmetric difference between two images
-
        mmunionUnion of images.
-
        
-    
        
-    
        Structuring Elements
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmimg2seCreate a structuring element from a pair of images.
-
        mmseboxCreate a box structuring element.
-
        mmsecrossDiamond structuring element and elementary 3x3 cross.
-
        mmsediskCreate a disk or a semi-sphere structuring element.
-
        mmselineCreate a line structuring element.
-
        mmserotRotate a structuring element.
-
        mmseshowDisplay a structuring element as an image.
-
        mmsesumN-1 iterative Minkowski  additions
-
        mmsetransTranslate a structuring element
-
        mmsereflectReflect a structuring element
-
        mmsedilDilate one structuring element by another
-
        mmseunionUnion of structuring elements
-
        
-    
        
-    
        Dilations And Erosions
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmcdilDilate an image conditionally.
-
        mmceroErode an image conditionally.
-
        mmdilDilate an image by a structuring element.
-
        mmeroErode an image by a structuring element.
-
        
-    
        
-    
        Morphological Filters
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmcenterCenter filter.
-
        mmasfAlternating Sequential Filtering
-
        mmcloseMorphological closing.
-
        mmopenMorphological opening.
-
        
-    
        
-    
        Image Transforms
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmdistDistance transform.
-
        mmgdistGeodesic Distance Transform.
-
        mmopentransfOpen transform.
-
        
-    
        
-    
        Connected Operators
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmcloholeClose holes of binary and gray-scale images.
-
        mmareacloseArea closing
-
        mmareaopenArea opening
-
        mmasfrecReconstructive Alternating Sequential Filtering
-
        mmcloserecClosing by reconstruction.
-
        mmhminRemove basins with contrast less than h.
-
        mmvmaxRemove domes with volume less than v.
-
        mmhmaxRemove peaks with contrast less than h.
-
        mminfrecInf-reconstruction.
-
        mminposMinima imposition.
-
        mmopenrecOpening by reconstruction.
-
        mmregmaxRegional Maximum.
-
        mmregminRegional Minimum (with generalized dynamics).
-
        mmsuprecSup-reconstruction.
-
        
-    
        
-    
        Residues
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmedgeoffEliminate the objects that hit the image frame.
-
        mmcbisectorN-Conditional bisector.
-
        mmcloserecthClose-by-Reconstruction Top-Hat.
-
        mmclosethClosing Top Hat.
-
        mmgradmMorphological gradient.
-
        mmopenrecthOpen-by-Reconstruction Top-Hat.
-
        mmopenthOpening Top Hat.
-
        mmskelmMorphological skeleton (Medial Axis Transform).
-
        mmskelmrecMorphological skeleton reconstruction (Inverse Medial Axis Transform).
-
        
-    
        
-    
        Intervals (hit-or-miss templates)
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmendpointsInterval to detect end-points.
-
        mmhomothickInterval for homotopic thickening.
-
        mmhomothinInterval for homotopic thinning.
-
        mminterotRotate an interval
-
        mmintershowVisualize an interval.
-
        mmse2intervalCreate an interval from a pair of structuring elements.
-
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
-
        
-    
        
-    
        Sup-generating And Inf-generating
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmthreshadThreshold (adaptive)
-
        mminfcanonIntersection of inf-generating operators.
-
        mminfgenInf-generating.
-
        mmsupcanonUnion of sup-generating or hit-miss operators.
-
        mmsupgenSup-generating (hit-miss).
-
        
-    
        
-    
        Thinning And Thickening
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmcthickImage transformation by conditional thickening.
-
        mmcthinImage transformation by conditional thinning.
-
        mmcwatershedDetection of watershed from markers.
-
        mmskizSkeleton of Influence Zone - also know as Generalized Voronoi Diagram
-
        mmswatershedDetection of similarity-based watershed from markers.
-
        mmthickImage transformation by thickening.
-
        mmthinImage transformation by thinning.
-
        mmwatershedWatershed detection.
-
        
-    
        
-    
        Measurements
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmhistogramFind the histogram of the image f.
-
        mmlabelLabel a binary image.
-
        mmblobBlob measurements from a labeled image.
-
        mmgrainGray-scale statistics for each labeled region.
-
        mmlabelflatLabel the flat zones of gray-scale images.
-
        mmpatspecPattern spectrum (also known as granulometric size density).
-
        mmstatsFind global image statistics.
-
        
-    
        
-    
        Visualization
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmglblshowApply a random color table to a gray-scale image.
-
        mmgshowApply binary overlays as color layers on a binary or gray-scale image
-
        mmdtshowDisplay a distance transform image with an iso-line color table.
-
        mmlblshowDisplay a labeled image assigning a random color for each label.
-
        mmshowDisplay binary or gray-scale images and optionally overlay it with binary images.
-
        mmbshowGenerate a graphical representation of overlaid binary images.
-
        mmplotPlot a function.
-
        
-    
        
-    
        Obsolete
        
-    
        
-      
-        
-          
-            
-            
-          
-        
-      
        mmvdomeObsolete, use mmvmax.
-
        
-    
        
-    
        Python functions
        
-    
        
-      
-        
-          
-            
-            
-          
-          
-            
-            
-          
-        
-      
        mmadd4dilAddition for dilation
-
        mmpad4nmmpad4n
-
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [Up] 
-                    
-                        [Demonstrations]
-                    
-                        [Basic Concepts]
-                    
-                        [Functions]
-                    
-                        [Data Types]
-                    Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/int32.html b/python/plugins/sextante/pymorph/html/morph/morph/int32.html
deleted file mode 100644
index df5bc5c522df..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/int32.html
+++ /dev/null
@@ -1,124 +0,0 @@
-
-  
-    
-    int32
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmgray]
-              
-                  [Up]
-                  
-                  [uint8]
-              Data Type Conversion
        
-    
        int32
-      
        
-      Convert an image to an int32 image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        img = 
-          int32(
-                  
-          f
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fImage
        Any image
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        imgImage
        The converted image
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          int32 clips the input image between the values -2147483647 and 2147483647 and converts it to the signed 32-bit datatype.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def int32(f):
-    from Numeric import array, clip
-    img = array(clip(f,-2147483647,2147483647)).astype('i')
-    return img
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        uint16Convert an image to a uint16 image.
        uint8Convert an image to an uint8 image.
        mmdatatypeReturn the image datatype string
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmgray]
-                
-                    [Up]
-                    
-                    [uint8]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmadd4dil.html b/python/plugins/sextante/pymorph/html/morph/morph/mmadd4dil.html
deleted file mode 100644
index eb987b074b67..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmadd4dil.html
+++ /dev/null
@@ -1,108 +0,0 @@
-
-  
-    
-    mmadd4dil
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmvdome]
-              
-                  [Up]
-                  
-                  [mmpad4n]
-              Python functions
        
-    
        mmadd4dil
-      
        
-      Addition for dilation
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        a = 
-          mmadd4dil(
-                  
-          f, 
-          c
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Image
        cImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Constant
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        aImage
        f + c
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmadd4dil(f, c):
-    from Numeric import asarray, minimum, maximum
-    if c:            
-       y = asarray(f,'d') + c
-       k1,k2 = mmlimits(f)
-       y = ((f==k1) * k1) + ((f!=k1) * y)
-       y = maximum(minimum(y,k2),k1)
-       a = y.astype(f.typecode())
-    else:
-       a = f
-    return a
-    
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmvdome]
-                
-                    [Up]
-                    
-                    [mmpad4n]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmaddm.html b/python/plugins/sextante/pymorph/html/morph/morph/mmaddm.html
deleted file mode 100644
index c6caeab5336b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmaddm.html
+++ /dev/null
@@ -1,197 +0,0 @@
-
-  
-    
-    mmaddm
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmtoggle]
-              
-                  [Up]
-                  
-                  [mmintersec]
-              Operations
        
-    
        mmaddm
-      
        
-      Addition of two images, with saturation.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmaddm(
-                  
-          f1, 
-          f2
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        f2Image          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                          
        Or constant.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmaddm creates the image 
-          y by pixelwise addition of  images 
-          f1 and 
-          f2. When the addition of the values of two pixels saturates the image data type considered, the greatest value of this type is taken as the result of the addition.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f = uint8([255,   255,    0,   10,    0,   255,   250])
        
-              
        
-              
        >>> g = uint8([ 0,    40,   80,   140,  250,    10,    30])
        
-              
        
-              
        >>> y1 = mmaddm(f,g)
        
-              
        
-              
        >>> print y1
        
-              
        [255 255  80 150 250 255 255]
        
-              
        >>> y2 = mmaddm(g, 100)
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> print y2
        
-              
        [100 140 180 240 255 110 130]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> a = mmreadgray('keyb.tif')
        
-              
        
-              
        >>> b = mmaddm(a,128)
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmaddm(f1, f2):
-    from Numeric import array, minimum, maximum
-    if type(f2) is array:
-        assert f1.typecode() == f2.typecode(), 'Cannot have different datatypes:'
-    y = maximum(minimum(f1.astype('d')+f2, mmlimits(f1)[1]),mmlimits(f1)[0])
-    y = y.astype(f1.typecode())
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsubmSubtraction of two images, with saturation.
        mmlimitsGet the possible minimum and maximum of an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmtoggle]
-                
-                    [Up]
-                    
-                    [mmintersec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmareaclose.html b/python/plugins/sextante/pymorph/html/morph/morph/mmareaclose.html
deleted file mode 100644
index 5f0ef872e661..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmareaclose.html
+++ /dev/null
@@ -1,239 +0,0 @@
-
-  
-    
-    mmareaclose
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmclohole]
-              
-                  [Up]
-                  
-                  [mmareaopen]
-              Connected Operators
        
-    
        mmareaclose
-      
        
-      Area closing
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmareaclose(
-                  
-          f, 
-          a, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        aDouble
        non negative integer.
        BcStructuring Element
        ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        Same type of 
-                      f
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmareaclose removes any pore (i.e., background connected component)  with area less than 
-          a of  a binary image 
-          f. The connectivity is given by the structuring element 
-          Bc.  This operator is generalized to gray-scale images  by applying the binary operator successively on slices of 
-          f taken from higher threshold levels to lower threshold levels.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> a=mmreadgray('form-1.tif')
        
-              
        
-              
        >>> b=mmareaclose(a,400)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> a=mmreadgray('n2538.tif')
        
-              
        
-              
        >>> b=mmareaclose(a,400)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      The structuring elements allowed are the elementary cross (4-connected) and the elementary box (8-connected).
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmareaclose(f, a, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    y = mmneg(mmareaopen(mmneg(f),a,Bc))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmareaopenArea opening
        mmlabelLabel a binary image.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmfreedomControl automatic data type conversion.
        mmcloholeClose holes of binary and gray-scale images.
        mmregminRegional Minimum (with generalized dynamics).
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmclohole]
-                
-                    [Up]
-                    
-                    [mmareaopen]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmareaopen.html b/python/plugins/sextante/pymorph/html/morph/morph/mmareaopen.html
deleted file mode 100644
index d4a144da8afe..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmareaopen.html
+++ /dev/null
@@ -1,276 +0,0 @@
-
-  
-    
-    mmareaopen
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmareaclose]
-              
-                  [Up]
-                  
-                  [mmasfrec]
-              Connected Operators
        
-    
        mmareaopen
-      
        
-      Area opening
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmareaopen(
-                  
-          f, 
-          a, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        aDouble
        non negative integer.
        BcStructuring Element
        ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        Same type of 
-                      f
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmareaopen removes any grain (i.e., connected component) with area less than 
-          a of a binary image 
-          f. The connectivity is given by the structuring element 
-          Bc. This operator is generalized to gray-scale images  by applying the binary operator successively  on slices of 
-          f taken from higher threshold levels to lower threshold levels.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical examples:
        
-          
        
-            
        
-              
        >>> f=mmbinary(uint8([
- [1, 1, 0, 0, 0, 0, 1],
- [1, 0, 1, 1, 1, 0, 1],
- [0, 0, 0, 0, 1, 0, 0]]))
        
-              
        
-              
        >>> y=mmareaopen(f,4,mmsecross())
        
-              
        
-              
        >>> print y
        
-              
        [[0 0 0 0 0 0 0]
- [0 0 1 1 1 0 0]
- [0 0 0 0 1 0 0]]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> f=uint8([
-   [10,   11,   0,    0,   0,   0,  20],
-   [10,    0,   5,    8,   9,   0,  15],
-   [10,    0,   0,    0,  10,   0,   0]])
        
-              
        
-              
        >>> y=mmareaopen(f,4,mmsecross())
        
-              
        
-              
        >>> print y
        
-              
        [[10 10  0  0  0  0  0]
- [10  0  5  5  5  0  0]
- [10  0  0  0  5  0  0]]
        
-            
        
-          
        
-          
        Binary image
        
-          
        
-            
        
-              
        >>> a=mmreadgray('form-1.tif');
        
-              
        
-              
        >>> b=mmareaopen(a,500);
        
-              
        
-              
        >>> mmshow(a);
        
-              
        
-              
        >>> mmshow(b);
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-          
        Gray-scale image
        
-          
        
-            
        
-              
        >>> a=mmreadgray('bloodcells.tif');
        
-              
        
-              
        >>> b=mmareaopen(a,500);
        
-              
        
-              
        >>> mmshow(a);
        
-              
        
-              
        >>> mmshow(b);
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      The structuring elements allowed are the elementary cross (4-connected) and the elementary box (8-connected).
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmareaopen(f, a, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    if mmisbinary(f):
-      fr = mmlabel(f,Bc)      # binary area open, use area measurement
-      g = mmblob(fr,'area')
-      y = mmthreshad(g,a)
-    else:
-      y = mmintersec(f,0)
-      zero = mmbinary(y)
-      k1 = mmstats(f,'min')
-      k2 = mmstats(f,'max')
-      for k in range(k1,k2+1):   # gray-scale, use thresholding decomposition
-        fk = mmthreshad(f,k)
-        fo = mmareaopen(fk,a,Bc)
-        if mmisequal(fo,zero):
-          break
-        y = mmunion(y, mmgray(fo,mmdatatype(f),k))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmlabelLabel a binary image.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmareacloseArea closing
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmareaclose]
-                
-                    [Up]
-                    
-                    [mmasfrec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmasf.html b/python/plugins/sextante/pymorph/html/morph/morph/mmasf.html
deleted file mode 100644
index fffdcba99a9f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmasf.html
+++ /dev/null
@@ -1,266 +0,0 @@
-
-  
-    
-    mmasf
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcenter]
-              
-                  [Up]
-                  
-                  [mmclose]
-              Morphological Filters
        
-    
        mmasf
-      
        
-      Alternating Sequential Filtering
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmasf(
-                  
-          f, 
-          SEQ = "OC", 
-          b = None, 
-          n = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        SEQString
        'OC', 'CO', 'OCO', 'COC'.
        Default: 
-                      "OC"
-                    
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        nDouble      Non-negative integer.
-                          
        (number of iterations).
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmasf creates the image 
-          y by filtering the image 
-          f by 
-          n iterations of the close and open alternating sequential filter characterized by the structuring element 
-          b. The sequence of opening and closing is controlled by the parameter 
-          SEQ. 'OC' performs opening after closing, 'CO' performs closing after opening, 'OCO' performs opening after closing after opening, and 'COC' performs closing after opening after closing.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> f=mmreadgray('gear.tif')
        
-              
        
-              
        >>> g=mmasf(f,'oc',mmsecross(),2)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> f=mmreadgray('fabric.tif')
        
-              
        
-              
        >>> g=mmasf(f,'oc',mmsecross(),3)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Case oc, close-open filter:
        
-          
        
-            
-          
        
-          
        Case co, open-close filter:
        
-          
        
-            
-          
        
-          
        Case oco:
        
-          
        
-            
-          
        
-          
        Case coc:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmasf(f, SEQ="OC", b=None, n=1):
-    from string import upper
-    if b is None: b = mmsecross()
-    SEQ=upper(SEQ)
-    y = f
-    if SEQ == 'OC':
-        for i in range(1,n+1):
-            nb = mmsesum(b,i)
-            y = mmopen(mmclose(y,nb),nb)
-    elif SEQ == 'CO':
-        for i in range(1,n+1):
-            nb = mmsesum(b,i)
-            y = mmclose(mmopen(y,nb),nb)
-    elif SEQ == 'OCO':
-        for i in range(1,n+1):
-            nb = mmsesum(b,i)
-            y = mmopen(mmclose(mmopen(y,nb),nb),nb)
-    elif SEQ == 'COC':
-        for i in range(1,n+1):
-            nb = mmsesum(b,i)
-            y = mmclose(mmopen(mmclose(y,nb),nb),nb)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmopenMorphological opening.
        mmcloseMorphological closing.
        mmasfrecReconstructive Alternating Sequential Filtering
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcenter]
-                
-                    [Up]
-                    
-                    [mmclose]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmasfrec.html b/python/plugins/sextante/pymorph/html/morph/morph/mmasfrec.html
deleted file mode 100644
index 413a6d9d6e8e..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmasfrec.html
+++ /dev/null
@@ -1,237 +0,0 @@
-
-  
-    
-    mmasfrec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmareaopen]
-              
-                  [Up]
-                  
-                  [mmcloserec]
-              Connected Operators
        
-    
        mmasfrec
-      
        
-      Reconstructive Alternating Sequential Filtering
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmasfrec(
-                  
-          f, 
-          SEQ = "OC", 
-          b = None, 
-          bc = None, 
-          n = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        SEQString
        Values: "OC" or "CO".
        Default: 
-                      "OC"
-                    
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        bcStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        nDouble      Non-negative integer.
-                          
        (number of iterations).
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        Same type of 
-                      f
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmasf creates the image 
-          y by filtering the image 
-          f by 
-          n iterations of the close by reconstruction and open by reconstruction alternating sequential filter characterized by the structuring element 
-          b. The structure element 
-          bc is used in the reconstruction. The sequence of opening and closing is controlled by the parameter 
-          SEQ. 'OC' performs opening after closing, and 'CO' performs closing after opening.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('fabric.tif')
        
-              
        
-              
        >>> g=mmasfrec(f,'oc',mmsecross(),mmsecross(),3)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Case oc, reconstructive close-open filter:
        
-          
        
-            
-          
        
-          
        Case co, reconstructive open-close filter:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmasfrec(f, SEQ="OC", b=None, bc=None, n=1):
-    from string import upper
-    if b is None: b = mmsecross()
-    if bc is None: bc = mmsecross()
-    SEQ = upper(SEQ)
-    y = f
-    if SEQ == 'OC':
-        for i in range(1,n+1):
-            nb = mmsesum(b,i)
-            y = mmcloserec(y,nb,bc)
-            y = mmopenrec(y,nb,bc)
-    elif SEQ == 'CO':
-        for i in range(1,n+1):
-            nb = mmsesum(b,i)
-            y = mmopenrec(y,nb,bc)
-            y = mmcloserec(y,nb,bc)
-    else:
-        assert 0,'Only accepts OC or CO for SEQ parameter'
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmasfAlternating Sequential Filtering
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmopenrecOpening by reconstruction.
        mmcloserecClosing by reconstruction.
        mmfreedomControl automatic data type conversion.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmareaopen]
-                
-                    [Up]
-                    
-                    [mmcloserec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmbinary.html b/python/plugins/sextante/pymorph/html/morph/morph/mmbinary.html
deleted file mode 100644
index b894dbfefdb7..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmbinary.html
+++ /dev/null
@@ -1,190 +0,0 @@
-
-  
-    
-    mmbinary
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [Up]
-                  
-                  [mmfreedom]
-              Data Type Conversion
        
-    
        mmbinary
-      
        
-      Convert a gray-scale image into a binary image
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmbinary(
-                  
-          f, 
-          k1 = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        k1Double
        Threshold value.
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmbinary converts a gray-scale image 
-          f into a binary image 
-          y by a threshold rule. A pixel in 
-          y has the value 1 if and only if the corresponding pixel in 
-          f has a value greater or equal 
-          k1.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = array([0, 1, 2, 3, 4])
        
-              
        
-              
        >>> b=mmbinary(a)
        
-              
        
-              
        >>> print b
-            
        
-              
        [0 1 1 1 1]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> a=mmreadgray('mm3.tif')
        
-              
        
-              
        >>> b=mmbinary(a,82)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
-            
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmbinary(f, k1=1):
-    from Numeric import array
-    if type(f) is not array: f = array(f)
-    y = array(f>=k1).astype('1')
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmthreshadThreshold (adaptive)
        mmisbinaryCheck for binary image
        mmgrayConvert a binary image into a gray-scale image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [Up]
-                    
-                    [mmfreedom]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmblob.html b/python/plugins/sextante/pymorph/html/morph/morph/mmblob.html
deleted file mode 100644
index 434f9bede334..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmblob.html
+++ /dev/null
@@ -1,313 +0,0 @@
-
-  
-    
-    mmblob
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmlabel]
-              
-                  [Up]
-                  
-                  [mmgrain]
-              Measurements
        
-    
        mmblob
-      
        
-      Blob measurements from a labeled image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmblob(
-                  
-          fr, 
-          measurement, 
-          option = "image"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        frImage          Gray-scale (uint8 or uint16) image.
-                          
        Labeled image.
        measurementString
        Choice from 'AREA', 'CENTROID', or 'BOUNDINGBOX'.
        optionString
        Output format: 'image': results as a binary image; 'data': results a column vector of measurements (double).
        Default: 
-                      "image"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Take measurements from the labeled image 
-          fr. The measurements are: area, centroid, or bounding rectangle. The parameter 
-          option controls the output format: 'IMAGE': the result is an image; 'DATA': the result is a double column vector with the measurement for each blob. The region with label zero is not measured as it is normally the background. The measurement of region with label 1 appears at the first row of the output.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> fr=uint8([
-   [1,1,1,0,0,0],
-   [1,1,1,0,0,2],
-   [1,1,1,0,2,2]])
        
-              
        
-              
        >>> f_area=mmblob(fr,'area')
        
-              
        
-              
        >>> print f_area
        
-              
        [[9 9 9 0 0 0]
- [9 9 9 0 0 3]
- [9 9 9 0 3 3]]
        
-              
        >>> f_cent=mmblob(fr,'centroid')
        
-              
        
-              
        >>> print f_cent
        
-              
        [[0 0 0 0 0 0]
- [0 1 0 0 1 0]
- [0 0 0 0 0 0]]
        
-              
        >>> f_bb=mmblob(fr,'boundingbox')
        
-              
        
-              
        >>> print f_bb
        
-              
        [[1 1 1 0 0 0]
- [1 0 1 0 1 1]
- [1 1 1 0 1 1]]
        
-              
        >>> d_area=mmblob(fr,'area','data')
        
-              
        
-              
        >>> print d_area
        
-              
        [[9]
- [3]]
        
-              
        >>> d_cent=mmblob(fr,'centroid','data')
        
-              
        
-              
        >>> print d_cent
        
-              
        [[1 1]
- [4 1]]
        
-              
        >>> d_bb=mmblob(fr,'boundingbox','data')
        
-              
        
-              
        >>> print d_bb
        
-              
        [[0 0 2 2]
- [4 1 5 2]]
        
-            
        
-          
        
-          
        Area Transform
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob3.tif')
        
-              
        
-              
        >>> fr=mmlabel(f)
        
-              
        
-              
        >>> g=mmblob(fr,'area')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-          
        Centroids
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob3.tif')
        
-              
        
-              
        >>> fr=mmlabel(f)
        
-              
        
-              
        >>> centr=mmblob(fr,'centroid')
        
-              
        
-              
        >>> mmshow(f,mmdil(centr))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f,mmdil(centr)
        
-          
        
-          
        Bounding Box
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob3.tif')
        
-              
        
-              
        >>> fr=mmlabel(f)
        
-              
        
-              
        >>> box=mmblob(fr,'boundingbox')
        
-              
        
-              
        >>> mmshow(f,box)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f,box
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmblob(fr, measurement, option="image"):
-    from Numeric import NewAxis, ravel, zeros, sum, nonzero, sometrue, array
-    from string import upper
-    measurement = upper(measurement)
-    option      = upper(option)
-    if len(fr.shape) == 1: fr = fr[NewAxis,:]
-    n = max(ravel(fr))
-    if option == 'DATA': y = []
-    else               : y = zeros(fr.shape)
-    if measurement == 'AREA':
-        for i in range(1,n+1):
-            aux  = fr==i
-            area = sum(ravel(aux))
-            if option == 'DATA': y.append(area)
-            else               : y = y + area*aux
-    elif measurement == 'CENTROID':
-        for i in range(1,n+1):
-            aux  = fr==i
-            ind  = nonzero(ravel(aux))
-            indx = ind / fr.shape[1]
-            indy = ind % fr.shape[1]
-            centroid = [sum(indx)/len(ind), sum(indy)/len(ind)]
-            if option == 'DATA': y.append([centroid[1],centroid[0]])
-            else               : y[centroid] = 1
-    elif measurement == 'BOUNDINGBOX':
-        for i in range(1,n+1):
-            aux = fr==i
-            aux1, aux2 = sometrue(aux,0), sometrue(aux,1)
-            col , row  = nonzero(aux1)  , nonzero(aux2)
-            if option == 'DATA': y.append([col[0],row[0],col[-1],row[-1]])
-            else:
-                y[row[0]:row[-1],col[0] ] = 1
-                y[row[0]:row[-1],col[-1]] = 1
-                y[row[0], col[0]:col[-1]] = 1
-                y[row[-1],col[0]:col[-1]] = 1
-    else:
-        print "Measurement option should be 'AREA','CENTROID', or 'BOUNDINGBOX'."
-    if option == 'DATA':
-        y = array(y)
-        if len(y.shape) == 1: y = y[:,NewAxis]
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmlabelLabel a binary image.
        mmgrainGray-scale statistics for each labeled region.
        mmlabelflatLabel the flat zones of gray-scale images.
        mmstatsFind global image statistics.
        mmdrawvSuperpose points, rectangles and lines on an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmlabel]
-                
-                    [Up]
-                    
-                    [mmgrain]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmbshow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmbshow.html
deleted file mode 100644
index ae1c2cb88d34..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmbshow.html
+++ /dev/null
@@ -1,217 +0,0 @@
-
-  
-    
-    mmbshow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmshow]
-              
-                  [Up]
-                  
-                  [mmplot]
-              Visualization
        
-    
        mmbshow
-      
        
-      Generate a graphical representation of overlaid binary images.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmbshow(
-                  
-          f1, 
-          f2 = None, 
-          f3 = None, 
-          factor = 17
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Binary image.
-                        
        f2Image          Binary image.
-                                
        Default: 
-                      None
-                    
        f3Image          Binary image.
-                                
        Default: 
-                      None
-                    
        factorDouble
        Expansion factor for the output image. Use odd values above 9.
        Default: 
-                      17
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                          
        shaded image.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Generate an expanded binary image as a graphical representation of up to three binary input images. The 1-pixels of the first image are represented by square contours, the pixels of the optional second image are represented by circles and for the third image they are represented by shaded squares. This function is useful to create graphical illustration of small images.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f1=mmtext('b')
        
-              
        
-              
        >>> f2=mmtext('w')
        
-              
        
-              
        >>> g2=mmbshow(f1,f2)
        
-              
        
-              
        >>> mmshow(g2)
        
-              
        
-              
        >>> f3=mmtext('x')
        
-              
        
-              
        >>> g3=mmbshow(f1,f2,f3)
        
-              
        
-              
        >>> mmshow(g3);
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        g2g3
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmbshow(f1, f2=None, f3=None, factor=17):
-    from Numeric import NewAxis, zeros, resize, transpose, floor, arange, array
-    if f1.shape == ()    : f1 = array([f1])
-        if len(f1.shape) == 1: f1 = f1[NewAxis,:]
-        if (`f1.shape` != `f2.shape`) or \
-           (`f1.shape` != `f3.shape`) or \
-           (`f2.shape` != `f3.shape`):
-           print 'Different sizes.'
-           return None
-        s = factor
-        if factor < 9: s = 9
-        h,w = f1.shape
-        y = zeros((s*h, s*w))
-        xc = resize(range(s), (s,s))
-        yc = transpose(xc)
-        r  = int(floor((s-8)/2. + 0.5))
-        circle = (xc - s/2)**2 + (yc - s/2)**2 <= r**2
-        r = arange(s) % 2
-        fillrect = resize(array([r, 1-r]), (s,s))
-        fillrect[0  ,:] = 0
-        fillrect[s-1,:] = 0
-        fillrect[:  ,0] = 0
-        fillrect[:  ,s-1] = 0
-        for i in range(h):
-            for j in range(w):
-                m, n = s*i, s*j
-                if f1 and f1[i,j]:
-                    y[m     ,n:n+s] = 1
-                    y[m+s-1 ,n:n+s] = 1
-                    y[m:m+s ,n    ] = 1
-                    y[m:m+s ,n+s-1] = 1
-                if f2 and f2[i,j]:
-                    y[m:m+s, n:n+s] = y[m:m+s, n:n+s] + circle
-                if f3 and f3[i,j]:
-                    y[m:m+s, n:n+s] = y[m:m+s, n:n+s] + fillrect
-        y = y > 0
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmshowDisplay binary or gray-scale images and optionally overlay it with binary images.
        mmseshowDisplay a structuring element as an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmshow]
-                
-                    [Up]
-                    
-                    [mmplot]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcbisector.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcbisector.html
deleted file mode 100644
index 1afd7f1f5019..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcbisector.html
+++ /dev/null
@@ -1,209 +0,0 @@
-
-  
-    
-    mmcbisector
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmedgeoff]
-              
-                  [Up]
-                  
-                  [mmcloserecth]
-              Residues
        
-    
        mmcbisector
-      
        
-      N-Conditional bisector.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcbisector(
-                  
-          f, 
-          B, 
-          n
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        BStructuring Element
        nDouble
        positive integer ( filtering rate)
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcbisector creates the binary image 
-          y by performing a filtering of the morphological skeleton of the binary image 
-          f, relative to the structuring element 
-          B. The strength of this filtering is controlled by the parameter n. Particularly, if 
-          n=0, 
-          y is the morphological skeleton of 
-          f itself.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a=mmreadgray('blob2.tif')
        
-              
        
-              
        >>> b=mmcbisector(a,mmsebox(),1)
        
-              
        
-              
        >>> c=mmcbisector(a,mmsebox(),3)
        
-              
        
-              
        >>> d=mmcbisector(a,mmsebox(),10)
        
-              
        
-              
        >>> mmshow(a,b)
        
-              
        
-              
        >>> mmshow(a,c)
        
-              
        
-              
        >>> mmshow(a,d)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        a,ba,c
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        a,d
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcbisector(f, B, n):
-    y = mmintersec(f,0)
-    for i in range(n):
-        nb = mmsesum(B,i)
-        nbp = mmsesum(B,i+1)
-        f1 = mmero(f,nbp)
-        f2 = mmcdil(f1,f,B,n)
-        f3 = mmsubm(mmero(f,nb),f2)
-        y  = mmunion(y,f3)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmskelmMorphological skeleton (Medial Axis Transform).
        mmthinImage transformation by thinning.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmedgeoff]
-                
-                    [Up]
-                    
-                    [mmcloserecth]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcdil.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcdil.html
deleted file mode 100644
index 771ad8166eb6..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcdil.html
+++ /dev/null
@@ -1,316 +0,0 @@
-
-  
-    
-    mmcdil
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmseunion]
-              
-                  [Up]
-                  
-                  [mmcero]
-              Dilations And Erosions
        
-    
        mmcdil
-      
        
-      Dilate an image conditionally.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcdil(
-                  
-          f, 
-          g, 
-          b = None, 
-          n = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        gImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Conditioning image.
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        nDouble      Non-negative integer.
-                          
        (number of iterations).
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcdil creates the image 
-          y by dilating the image 
-          f by the structuring element 
-          b conditionally to the image 
-          g. This operator may be applied recursively 
-          n times.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical examples:
        
-          
        
-            
        
-              
        >>> f = mmbinary(uint8([[1, 0, 0, 0, 0, 0, 0],\
-    [0, 0, 0, 0, 0, 0, 0],\
-    [0, 0, 0, 0, 1, 0, 0,]]))
        
-              
        
-              
        >>> g = mmbinary(uint8([[1, 1, 1, 0, 0, 1, 1],\
-    [1, 0, 1, 1, 1, 0, 0],\
-    [0, 0, 0, 0, 1, 0, 0]]));
        
-              
        
-              
        >>> y1=mmcdil(f,g,mmsecross())
        
-              
        
-              
        >>> y2=mmcdil(f,g,mmsecross(),3)
-        
        
-              
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> f = uint8([\
-    [   0,    0,   0,   80,   0,   0],\
-    [   0,    0,   0,    0,   0,   0],\
-    [  10,   10,   0,  255,   0,   0]])
        
-              
        
-              
        >>> g = uint8([\
-    [   0,    1,   2,   50,   4,   5],\
-    [   2,    3,   4,    0,   0,   0],\
-    [  12,  255,  14,   15,  16,  17]])
        
-              
        
-              
        >>> y1=mmcdil(f,g,mmsecross())
        
-              
        
-              
        >>> y2=mmcdil(f,g,mmsecross(),3)
-        
        
-              
        
-            
        
-          
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> g=mmreadgray('pcb1bin.tif')
        
-              
        
-              
        >>> f=mmframe(g,5,5)
        
-              
        
-              
        >>> y5=mmcdil(f,g,mmsecross(),5)
        
-              
        
-              
        >>> y25=mmcdil(f,g,mmsecross(),25)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-              
        >>> mmshow(g,f)
        
-              
        
-              
        >>> mmshow(g,y5)
        
-              
        
-              
        >>> mmshow(g,y25)
-        
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        gg,f
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        g,y5g,y25
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> g=mmneg(mmreadgray('n2538.tif'))
        
-              
        
-              
        >>> f=mmintersec(g,0)
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> f=mmdraw(f,'LINE:40,30,60,30:END')
        
-              
        
-              
        >>> y1=mmcdil(f,g,mmsebox())
        
-              
        
-              
        >>> y30=mmcdil(f,g,mmsebox(),30)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(y1)
        
-              
        
-              
        >>> mmshow(y30)
-        
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
        gfy1y30
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcdil(f, g, b=None, n=1):
-    if b is None: b = mmsecross()
-    y = mmintersec(f,g)
-    for i in range(n):
-        aux = y
-        y = mmintersec(mmdil(y,b),g)
-        if mmisequal(y,aux): break
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmdilDilate an image by a structuring element.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmimg2seCreate a structuring element from a pair of images.
        mminfrecInf-reconstruction.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmseunion]
-                
-                    [Up]
-                    
-                    [mmcero]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcenter.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcenter.html
deleted file mode 100644
index a01a2cdff917..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcenter.html
+++ /dev/null
@@ -1,202 +0,0 @@
-
-  
-    
-    mmcenter
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmero]
-              
-                  [Up]
-                  
-                  [mmasf]
-              Morphological Filters
        
-    
        mmcenter
-      
        
-      Center filter.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcenter(
-                  
-          f, 
-          b = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcenter creates the image 
-          y by computing recursively the morphological center, relative to the structuring element 
-          b, of the image 
-          f .
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('gear.tif')
        
-              
        
-              
        >>> g=mmcenter(f,mmsedisk(2))
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Center filter primitive:
        
-          
        
-            
-          
        
-          
        Center filter:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcenter(f, b=None):
-    if b is None: b = mmsecross()
-    y = f
-    diff = 0
-    while not diff:
-        aux = y
-        beta1 = mmasf(y,'COC',b,1)
-        beta2 = mmasf(y,'OCO',b,1)
-        y = mmunion(mmintersec(y,beta1),beta2)
-        diff = mmisequal(aux,y)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmcloseMorphological closing.
        mmopenMorphological opening.
        mmimg2seCreate a structuring element from a pair of images.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmero]
-                
-                    [Up]
-                    
-                    [mmasf]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcero.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcero.html
deleted file mode 100644
index 6b63075e657d..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcero.html
+++ /dev/null
@@ -1,225 +0,0 @@
-
-  
-    
-    mmcero
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcdil]
-              
-                  [Up]
-                  
-                  [mmdil]
-              Dilations And Erosions
        
-    
        mmcero
-      
        
-      Erode an image conditionally.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcero(
-                  
-          f, 
-          g, 
-          b = None, 
-          n = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        gImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Conditioning image.
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        nDouble      Non-negative integer.
-                          
        (number of iterations).
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcero creates the image 
-          y by eroding the image 
-          f by the structuring element 
-          b conditionally to  
-          g. This operator may be applied recursively 
-          n times.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f = mmneg(mmtext('hello'))
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> g = mmdil(f,mmseline(7,90))
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-              
        >>> a1=mmcero(g,f,mmsebox())
        
-              
        
-              
        >>> mmshow(a1)
        
-              
        
-              
        >>> a13=mmcero(a1,f,mmsebox(),13)
        
-              
        
-              
        >>> mmshow(a13)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
        fga1a13
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcero(f, g, b=None, n=1):
-    if b is None: b = mmsecross()
-    y = mmunion(f,g)
-    for i in range(n):
-        aux = y
-        y = mmunion(mmero(y,b),g)
-        if mmisequal(y,aux): break
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmeroErode an image by a structuring element.
        mmfreedomControl automatic data type conversion.
        mmimg2seCreate a structuring element from a pair of images.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmsuprecSup-reconstruction.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcdil]
-                
-                    [Up]
-                    
-                    [mmdil]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmclohole.html b/python/plugins/sextante/pymorph/html/morph/morph/mmclohole.html
deleted file mode 100644
index aa67e47cef10..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmclohole.html
+++ /dev/null
@@ -1,217 +0,0 @@
-
-  
-    
-    mmclohole
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmopentransf]
-              
-                  [Up]
-                  
-                  [mmareaclose]
-              Connected Operators
        
-    
        mmclohole
-      
        
-      Close holes of binary and gray-scale images.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmclohole(
-                  
-          f, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        BcStructuring Element
        ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        (same datatype of 
-                      f).
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmclohole creates the image 
-          y by closing the holes of the image 
-          f, according with the connectivity defined by the structuring element 
-          Bc.The images can be either  binary or gray-scale.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> a = mmreadgray('pcb1bin.tif')
        
-              
        
-              
        >>> b = mmclohole(a)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> a = mmreadgray('boxdrill-B.tif')
        
-              
        
-              
        >>> b = mmclohole(a)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmclohole(f, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    delta_f = mmframe(f)
-    y = mmneg( mminfrec( delta_f, mmneg(f), Bc))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mminfrecInf-reconstruction.
        mmframeCreate a frame image.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmareacloseArea closing
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmopentransf]
-                
-                    [Up]
-                    
-                    [mmareaclose]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmclose.html b/python/plugins/sextante/pymorph/html/morph/morph/mmclose.html
deleted file mode 100644
index 707e15878368..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmclose.html
+++ /dev/null
@@ -1,261 +0,0 @@
-
-  
-    
-    mmclose
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmasf]
-              
-                  [Up]
-                  
-                  [mmopen]
-              Morphological Filters
        
-    
        mmclose
-      
        
-      Morphological closing.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmclose(
-                  
-          f, 
-          b = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmclose creates the image 
-          y by the morphological closing of the image 
-          f by the structuring element 
-          b. In the binary case, the closing by a structuring element 
-          B  may be interpreted as the intersection of all the binary images that contain the image 
-          f and have a hole equal to a translation of 
-          B. In the gray-scale case, there is a similar interpretation taking the functions umbra.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob.tif')
        
-              
        
-              
        >>> bimg=mmreadgray('blob1.tif')
        
-              
        
-              
        >>> b=mmimg2se(bimg)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(mmclose(f,b))
        
-              
        
-              
        >>> mmshow(mmclose(f,b),mmgradm(f))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fmmclose(f,b)
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        mmclose(f,b),mmgradm(f)
        
-          
        
-          
        
-            
        
-              
        >>> f = mmreadgray('form-1.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> y = mmclose(f,mmsedisk(4))
        
-              
        
-              
        >>> mmshow(y)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fy
        
-          
        
-          
        
-            
        
-              
        >>> f = mmreadgray('n2538.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> y = mmclose(f,mmsedisk(3))
        
-              
        
-              
        >>> mmshow(y)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fy
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmclose(f, b=None):
-    if b is None: b = mmsecross()
-    y = mmero(mmdil(f,b),b)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmopenMorphological opening.
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmimg2seCreate a structuring element from a pair of images.
        mmsesumN-1 iterative Minkowski  additions
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmasf]
-                
-                    [Up]
-                    
-                    [mmopen]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcloserec.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcloserec.html
deleted file mode 100644
index 49852f79c943..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcloserec.html
+++ /dev/null
@@ -1,193 +0,0 @@
-
-  
-    
-    mmcloserec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmasfrec]
-              
-                  [Up]
-                  
-                  [mmhmin]
-              Connected Operators
        
-    
        mmcloserec
-      
        
-      Closing by reconstruction.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcloserec(
-                  
-          f, 
-          bdil = None, 
-          bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bdilStructuring Element
        (dilation).
        Default: 
-                      None (3x3 elementary cross)
-                    
        bcStructuring Element
        ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        Same type of 
-                      f.
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcloserec creates the image 
-          y by a sup-reconstruction ( with the connectivity defined by the structuring element 
-          bc) of the image 
-          f from its dilation by 
-          bdil.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = mmreadgray('danaus.tif')
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> b = mmcloserec(a,mmsebox(4))
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcloserec(f, bdil=None, bc=None):
-    if bdil is None: bdil = mmsecross()
-    if bc is None: bc = mmsecross()
-    y = mmsuprec(mmdil(f,bdil),f,bc)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmopenrecOpening by reconstruction.
        mmsuprecSup-reconstruction.
        mmcloseMorphological closing.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmasfrec]
-                
-                    [Up]
-                    
-                    [mmhmin]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcloserecth.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcloserecth.html
deleted file mode 100644
index 9456ad19a612..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcloserecth.html
+++ /dev/null
@@ -1,196 +0,0 @@
-
-  
-    
-    mmcloserecth
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcbisector]
-              
-                  [Up]
-                  
-                  [mmcloseth]
-              Residues
        
-    
        mmcloserecth
-      
        
-      Close-by-Reconstruction Top-Hat.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcloserecth(
-                  
-          f, 
-          bdil = None, 
-          bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bdilStructuring Element
        (dilation)
        Default: 
-                      None (3x3 elementary cross)
-                    
        bcStructuring Element
        ( connectivity)
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcloserecth creates the image 
-          y by subtracting the image 
-          f of its closing by reconstruction, defined by the structuring elements 
-          bc and 
-          bdil.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = mmreadgray('danaus.tif')
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> b = mmcloserecth(a,mmsebox(4))
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcloserecth(f, bdil=None, bc=None):
-    if bdil is None: bdil = mmsecross()
-    if bc is None: bc = mmsecross()
-    y = mmsubm(mmcloserec(f,bdil,bc), f)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmopenrecthOpen-by-Reconstruction Top-Hat.
        mmclosethClosing Top Hat.
        mmsuprecSup-reconstruction.
        mmcloseMorphological closing.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcbisector]
-                
-                    [Up]
-                    
-                    [mmcloseth]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcloseth.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcloseth.html
deleted file mode 100644
index e7eee9ca5869..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcloseth.html
+++ /dev/null
@@ -1,189 +0,0 @@
-
-  
-    
-    mmcloseth
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcloserecth]
-              
-                  [Up]
-                  
-                  [mmgradm]
-              Residues
        
-    
        mmcloseth
-      
        
-      Closing Top Hat.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcloseth(
-                  
-          f, 
-          b = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        (Same type of 
-                      f).
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcloseth creates the image 
-          y by subtracting the image 
-          f of its morphological closing by the structuring element 
-          b.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = mmreadgray('danaus.tif')
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> b = mmcloseth(a,mmsebox(5))
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcloseth(f, b=None):
-    if b is None: b = mmsecross()
-    y = mmsubm( mmclose(f,b), f)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmopenthOpening Top Hat.
        mmcloserecthClose-by-Reconstruction Top-Hat.
        mmgradmMorphological gradient.
        mmcloseMorphological closing.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcloserecth]
-                
-                    [Up]
-                    
-                    [mmgradm]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcmp.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcmp.html
deleted file mode 100644
index 8e4eebeaa238..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcmp.html
+++ /dev/null
@@ -1,216 +0,0 @@
-
-  
-    
-    mmcmp
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmreadgray]
-              
-                  [Up]
-                  
-                  [mmis]
-              Relations
        
-    
        mmcmp
-      
        
-      Compare two images pixelwisely.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcmp(
-                  
-          f1, 
-          oper, 
-          f2, 
-          oper1 = None, 
-          f3 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        operString
        relationship from: '==', '~=', '<','<=', '>', '>='.
        f2Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        oper1String
        relationship from: '==', '~=', '<','<=', '>', '>='.
        Default: 
-                      None
-                    
        f3Image          Gray-scale (uint8 or uint16) or binary image.
-                                
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Apply the relation 
-          oper to each pixel of images 
-          f1 and 
-          f2, the result is a binary image with the same size. Optionally, it is possible to make the comparison among three image. It is possible to use a constant value in place of any image, in this case the constant is treated as an image of the same size as the others with all pixels with the value of the constant.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> print mmcmp(uint8([1, 2, 3]),'<', uint8(2))
        
-              
        [1 0 0]
        
-              
        >>> print mmcmp(uint8([1, 2, 3]),'<', uint8([0, 2, 4]))
        
-              
        [0 0 1]
        
-              
        >>> print mmcmp(uint8([1, 2, 3]),'==', uint8([1, 1, 3]))
        
-              
        [1 0 1]
        
-            
        
-          
        
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('keyb.tif')
        
-              
        
-              
        >>> fbin=mmcmp(uint8(10), '<', f, '<', uint8(50))
        
-              
        Warning: Converting input image from int32 to uint16.
-Warning: Converting input image from int32 to uint16.
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(fbin)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ffbin
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcmp(f1, oper, f2, oper1=None, f3=None):
-    if   oper == '==':    y = (f1==f2)
-    elif oper == '~=':    y = (f1!=f2)
-    elif oper == '<=':    y = (f1<=f2)
-    elif oper == '>=':    y = (f1>=f2)
-    elif oper == '>':     y = (f1> f2)
-    elif oper == '<':     y = (f1< f2)
-    else:
-        assert 0, 'oper must be one of: ==, ~=, >, >=, <, <=, it was:'+oper
-    if oper1 != None:
-        if   oper1 == '==':     y = mmintersec(y, f2==f3)
-        elif oper1 == '~=':     y = mmintersec(y, f2!=f3)
-        elif oper1 == '<=':     y = mmintersec(y, f2<=f3)
-        elif oper1 == '>=':     y = mmintersec(y, f2>=f3)
-        elif oper1 == '>':      y = mmintersec(y, f2> f3)
-        elif oper1 == '<':      y = mmintersec(y, f2< f3)
-        else:
-            assert 0, 'oper1 must be one of: ==, ~=, >, >=, <, <=, it was:'+oper1
-    y = mmbinary(y)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmisVerify if a relationship among images is true or false.
        mmthreshadThreshold (adaptive)
        mmfreedomControl automatic data type conversion.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmreadgray]
-                
-                    [Up]
-                    
-                    [mmis]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmconcat.html b/python/plugins/sextante/pymorph/html/morph/morph/mmconcat.html
deleted file mode 100644
index 5674411c1e54..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmconcat.html
+++ /dev/null
@@ -1,223 +0,0 @@
-
-  
-    
-    mmconcat
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmtext]
-              
-                  [Up]
-                  
-                  [mmlimits]
-              Image Information and Manipulation
        
-    
        mmconcat
-      
        
-      Concatenate two or more images along width, height or depth.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Y = 
-          mmconcat(
-                  
-          DIM, 
-          X1, 
-          X2, 
-          X3 = None, 
-          X4 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        DIMString
        Dimension to concatenate. 'WIDTH' or 'W', 'HEIGHT' or 'H', or ' DEPTH' or 'D'.
        X1Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        X2Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        X3Image          Gray-scale (uint8 or uint16) or binary image.
-                                
        Default: 
-                      None
-                    
        X4Image          Gray-scale (uint8 or uint16) or binary image.
-                                
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        YImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Concatenate two or more images in any of the dimensions: width, height or depth. If the images do not match the dimension, a larger image is create with zero pixels to accommodate them. The images must have the same datatype.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f1=mmreadgray('cameraman.tif')
        
-              
        
-              
        >>> f2=mmreadgray('blob.tif')
        
-              
        
-              
        >>> g=mmconcat('W',f1,mmgray(mmneg(f2)))
        
-              
        
-              
        >>> mmshow(g);
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        g
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmconcat(DIM, X1, X2, X3=None, X4=None):
-    from Numeric import NewAxis, sum, zeros
-    aux = 'NewAxis,'
-    d = len(X1.shape)
-    if d < 3: X1 = eval('X1[' + (3-d)*aux + ':]')
-    d1,h1,w1 = X1.shape
-    d = len(X2.shape)
-    if d < 3: X2 = eval('X2[' + (3-d)*aux + ':]')
-    d2,h2,w2 = X2.shape
-    h3 = w3 = d3 = h4 = w4 = d4 = 0
-    if X3:
-       d = len(X3.shape)
-       if d < 3: X3 = eval('X3[' + (3-d)*aux + ':]')
-       d3,h3,w3 = X3.shape
-    if X4:
-       d = len(X4.shape)
-       if d < 3: X4 = eval('X4[' + (3-d)*aux + ':]')
-       d4,h4,w4 = X4.shape
-    h = [h1, h2, h3, h4]
-    w = [w1, w2, w3, w4]
-    d = [d1, d2, d3, d4]
-    if DIM in ['WIDTH', 'W', 'w', 'width']:
-       hy, wy, dy = max(h), sum(w), max(d)
-       Y = zeros((dy,hy,wy))
-       Y[0:d1, 0:h1, 0 :w1   ] = X1
-       Y[0:d2, 0:h2, w1:w1+w2] = X2
-       if X3:
-          Y[0:d3, 0:h3, w1+w2:w1+w2+w3] = X3
-          if X4:
-              Y[0:d4, 0:h4, w1+w2+w3::] = X4
-    elif DIM in ['HEIGHT', 'H', 'h', 'height']:
-       hy, wy, dy = sum(h), max(w), max(d)
-       Y = zeros((dy,hy,wy))
-       Y[0:d1, 0 :h1   , 0:w1] = X1
-       Y[0:d2, h1:h1+h2, 0:w2] = X2
-       if X3:
-           Y[0:d3, h1+h2:h1+h2+h3, 0:w3] = X3
-           if X4:
-               Y[0:d4, h1+h2+h3::, 0:w4] = X4
-    elif DIM in ['DEPTH', 'D', 'd', 'depth']:
-       hy, wy, dy = max(h), max(w), sum(d)
-       Y = zeros((dy,hy,wy))
-       Y[0:d1    , 0:h1, 0:w1   ] = X1
-       Y[d1:d1+d2, 0:h2, 0:w2] = X2
-       if X3:
-           Y[d1+d2:d1+d2+d3, 0:h3, 0:w3] = X3
-           if X4:
-               Y[d1+d2+d3::, 0:h4, 0:w4] = X4
-    if Y.shape[0] == 1: # adjustment
-       Y = Y[0,:,:]
-    return Y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-          
-        
        mmshowDisplay binary or gray-scale images and optionally overlay it with binary images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmtext]
-                
-                    [Up]
-                    
-                    [mmlimits]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcthick.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcthick.html
deleted file mode 100644
index 54ca1bb6f533..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcthick.html
+++ /dev/null
@@ -1,260 +0,0 @@
-
-  
-    
-    mmcthick
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsupgen]
-              
-                  [Up]
-                  
-                  [mmcthin]
-              Thinning And Thickening
        
-    
        mmcthick
-      
        
-      Image transformation by conditional thickening.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcthick(
-                  
-          f, 
-          g, 
-          Iab = None, 
-          n = -1, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        gImage          Binary image.
-                        
        IabInterval
        Default: 
-                      None (mmhomothick)
-                    
        nDouble      Non-negative integer.
-                          
        Number of iterations.
        Default: 
-                      -1
-                    
        thetaDouble
        Degrees of rotation: 45, 90, or 180.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or 'ANTI-CLOCKWISE'.
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcthick creates the binary image 
-          y by performing a thickening of the binary image 
-          f conditioned to the binary image 
-          g. The number of iterations of the conditional thickening is 
-          n and in each iteration the thickening is characterized by rotations of 
-          theta of the interval 
-          Iab.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Pseudo convex hull
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob2.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> t=mmse2hmt(mmbinary([[0,0,0],[0,0,1],[1,1,1]]),
-                          mmbinary([[0,0,0],[0,1,0],[0,0,0]]))
        
-              
        
-              
        >>> print mmintershow(t)
        
-              
        . . . 
-. 0 1 
-1 1 1
        
-              
        >>> f1=mmthick(f,t,40); # The thickening makes the image border grow
        
-              
        
-              
        >>> mmshow(f1)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ff1
        
-          
        
-          
        
-            
        
-              
        >>> f2=mmcthick(f,mmneg(mmframe(f)),t,40) # conditioning to inner pixels
        
-              
        
-              
        >>> fn=mmcthick(f,mmneg(mmframe(f)),t) #pseudo convex hull
        
-              
        
-              
        >>> mmshow(f2)
        
-              
        
-              
        >>> mmshow(fn,f)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        f2fn,f
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcthick(f, g, Iab=None, n=-1, theta=45, DIRECTION="CLOCKWISE"):
-    from Numeric import product
-    from string import upper
-    if Iab is None: Iab = mmhomothick()
-    DIRECTION = upper(DIRECTION)            
-    assert mmisbinary(f),'f must be binary image'
-    if n == -1: n = product(f.shape)
-    y = f
-    old = y
-    for i in range(n):
-        for t in range(0,360,theta):
-            sup = mmsupgen( y, mminterot(Iab, t, DIRECTION))
-            y = mmintersec(mmunion( y, sup),g)
-        if mmisequal(old,y): break
-        old = y
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmthickImage transformation by thickening.
        mmhomothickInterval for homotopic thickening.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsupgen]
-                
-                    [Up]
-                    
-                    [mmcthin]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcthin.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcthin.html
deleted file mode 100644
index e5b249b1f2fc..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcthin.html
+++ /dev/null
@@ -1,197 +0,0 @@
-
-  
-    
-    mmcthin
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcthick]
-              
-                  [Up]
-                  
-                  [mmcwatershed]
-              Thinning And Thickening
        
-    
        mmcthin
-      
        
-      Image transformation by conditional thinning.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmcthin(
-                  
-          f, 
-          g, 
-          Iab = None, 
-          n = -1, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        gImage          Binary image.
-                        
        IabInterval
        Default: 
-                      None (mmhomothin)
-                    
        nDouble      Non-negative integer.
-                          
        Number of iterations.
        Default: 
-                      -1
-                    
        thetaDouble
        Degrees of rotations: 45, 90, or 180.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or ' ANTI-CLOCKWISE'.
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcthin creates the binary image 
-          y by performing a thinning of the binary image 
-          f conditioned to the binary image 
-          g. The number of iterations of the conditional thinning is 
-          n and in each iteration the thinning is characterized by rotations of 
-          theta of the interval 
-          Iab.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcthin(f, g, Iab=None, n=-1, theta=45, DIRECTION="CLOCKWISE"):
-    from Numeric import product
-    from string import upper
-    if Iab is None: Iab = mmhomothin()
-    DIRECTION = upper(DIRECTION)            
-    assert mmisbinary(f),'f must be binary image'
-    if n == -1: n = product(f.shape)
-    y = f
-    old = y
-    for i in range(n):
-        for t in range(0,360,theta):
-            sup = mmsupgen( y, mminterot(Iab, t, DIRECTION))
-            y = mmunion(mmsubm( y, sup),g)
-        if mmisequal(old,y): break
-        old = y
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmthinImage transformation by thinning.
        mmendpointsInterval to detect end-points.
        mmhomothinInterval for homotopic thinning.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcthick]
-                
-                    [Up]
-                    
-                    [mmcwatershed]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmcwatershed.html b/python/plugins/sextante/pymorph/html/morph/morph/mmcwatershed.html
deleted file mode 100644
index d82fde1450b9..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmcwatershed.html
+++ /dev/null
@@ -1,325 +0,0 @@
-
-  
-    
-    mmcwatershed
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcthin]
-              
-                  [Up]
-                  
-                  [mmskiz]
-              Thinning And Thickening
        
-    
        mmcwatershed
-      
        
-      Detection of watershed from markers.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Y = 
-          mmcwatershed(
-                  
-          f, 
-          g, 
-          Bc = None, 
-          LINEREG = "LINES"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        gImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        marker image: binary or labeled.
        BcStructuring Element
        (watershed connectivity)
        Default: 
-                      None (3x3 elementary cross)
-                    
        LINEREGString
        'LINES' or ' REGIONS'.
        Default: 
-                      "LINES"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        YImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmcwatershed creates the image 
-          y by detecting the domain of the catchment basins of 
-          f indicated by the marker image 
-          g, according to the connectivity defined by 
-          Bc. According to the flag LINEREG 
-          y will be a labeled image of the catchment basins domain or just a binary image that presents the watershed lines. To know more about watershed and watershed from markers, see BeucMeye:93. The implementation of this function is based on LotuFalc:00. WARNING: There is a common mistake related to the marker image 
-          g. If this image contains only zeros and ones, but it is not a binary image, the result will be an image with all ones. If the marker image is binary, you have to set this explicitly using the 
-          logical function.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = uint8([\
-    [10,   10,   10,   10,   10,   10,   10],\
-    [10,    9,    6,   18,    6,    5,   10],\
-    [10,    9,    6,   18,    6,    8,   10],\
-    [10,    9,    9,   15,    9,    9,   10],\
-    [10,    9,    9,   15,   12,   10,   10],\
-    [10,   10,   10,   10,   10,   10,   10]])
        
-              
        
-              
        >>> b = mmcmp(a,'==',uint8(6))
        
-              
        
-              
        >>> print mmcwatershed(a,b)
        
-              
        [[0 0 0 1 0 0 0]
- [0 0 0 1 0 0 0]
- [0 0 0 1 0 0 0]
- [0 0 0 1 0 0 0]
- [0 0 0 1 0 0 0]
- [0 0 0 0 1 0 0]]
        
-              
        >>> print mmcwatershed(a,b,mmsecross(),'REGIONS')
        
-              
        [[1 1 1 1 2 2 2]
- [1 1 1 1 2 2 2]
- [1 1 1 1 2 2 2]
- [1 1 1 1 2 2 2]
- [1 1 1 1 2 2 2]
- [1 1 1 1 2 2 2]]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('astablet.tif')
        
-              
        
-              
        >>> grad=mmgradm(f)
        
-              
        
-              
        >>> mark=mmregmin(mmhmin(grad,17))
        
-              
        
-              
        >>> w=mmcwatershed(grad,mark)
        
-              
        
-              
        >>> mmshow(grad)
        
-              
        
-              
        >>> mmshow(mark)
        
-              
        
-              
        >>> mmshow(w)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        gradmark
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        w
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Equation (watershed regions):
        
-          
        
-            
-          
        
-          
        Minimum length of a point to a set:
        
-          
        
-            
-          
        
-          
        Length of a point to a set:
        
-          
        
-            
-          
        
-          
        Where:
        
-          
        
-            
-          
        is the path between the point 
-          x and subset 
-          X under connectivity 
-          Bc
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmcwatershed(f, g, Bc=None, LINEREG="LINES"):
-    from Numeric import ones, zeros, nonzero, array, put, take, argmin, transpose, compress, concatenate
-    if Bc is None: Bc = mmsecross()
-    return g
-    print 'starting'
-    withline = (LINEREG == 'LINES')
-    if mmis(g,'binary'):
-        g = mmlabel(g,Bc)
-    print 'before 1. mmpad4n'
-    status = mmpad4n(uint8(zeros(f.shape)),Bc, 3)
-    f = mmpad4n( f,Bc,0)                 #pad input image
-    print 'before 2. mmpad4n'
-    y = mmpad4n( g,Bc,0)                  # pad marker image with 0
-    if withline:
-        y1 = mmintersec(mmbinary(y), 0)
-    costM = mmlimits(f)[1] * ones(f.shape)  # cummulative cost function image
-    mi = nonzero(mmgradm(y,mmsebox(0),Bc).flat)  # 1D index of internal contour of marker
-    print 'before put costM'
-    put(costM.flat,mi, 0)
-    HQueue=transpose([mi, take(costM.flat, mi)])       # init hierarquical queue: index,value
-    print 'before mmse2list0'
-    Bi=mmse2list0(f,Bc)                # get 1D displacement neighborhood pixels
-    x,v = mmmat2set(Bc)
-    while HQueue:
-        print 'Hq=',HQueue
-        i = argmin(HQueue[:,1])           # i is the index of minimum value
-        print 'imin=',i
-        pi = HQueue[i,0]
-        print 'pi=',pi
-        ii = ones(HQueue.shape[0])
-        ii[i] = 0
-        print 'ii=',ii
-        HQueue = transpose(array([compress(ii,HQueue[:,0]),
-                                  compress(ii,HQueue[:,1])])) # remove this pixel from queue
-        print 'H=',HQueue
-        put(status.flat, pi, 1)          # make it a permanent label
-        for qi in pi+Bi :                # for each neighbor of pi
-            if (status.flat[qi] != 3):          # not image border
-                if (status.flat[qi] != 1):        # if not permanent
-                    cost_M = max(costM.flat[pi], f.flat[qi])
-                    if cost_M < costM.flat[qi]:
-                        print 'qi=',qi
-                        costM.flat[qi] = cost_M
-                        y.flat[qi] = y.flat[pi]                  # propagate the label
-                        aux = zeros(array(HQueue.shape) + [1,0])
-                        aux[:-1,:] = HQueue
-                        aux[-1,:]=[qi, cost_M]
-                        HQueue = aux # insert pixel in the queue
-                        print 'insert H=',HQueue
-                elif (withline        and
-                     (y.flat[qi] != y.flat[pi]) and
-                     (y1.flat[pi] == 0)    and
-                     (y1.flat[qi] == 0)     ):
-                    y1.flat[pi] = 1
-    if withline:
-        Y = y1
-    else:
-        Y = y
-    return Y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmwatershedWatershed detection.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmswatershedDetection of similarity-based watershed from markers.
        mmdcalcExtract the keys of a calculator.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcthin]
-                
-                    [Up]
-                    
-                    [mmskiz]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmdatatype.html b/python/plugins/sextante/pymorph/html/morph/morph/mmdatatype.html
deleted file mode 100644
index cbed7f3bb296..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmdatatype.html
+++ /dev/null
@@ -1,112 +0,0 @@
-
-  
-    
-    mmdatatype
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmmaxleveltype]
-              
-                  [Up]
-                  
-                  [mmmat2set]
-              Image Information and Manipulation
        
-    
        mmdatatype
-      
        
-      Return the image datatype string
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        type = 
-          mmdatatype(
-                  
-          f
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                          
        Any image
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        typeString
           String representation of image type: 'binary', 'uint8', 'uint16' or 'int32'
-                         
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmdatatype returns a string that identifies the pixel datatype of the image 
-          f.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmdatatype(f):
-    code = f.typecode()
-    if   code == '1': type='binary'
-    elif code == 'b': type='uint8'
-    elif code == 'w': type='uint16'
-    elif code == 'i': type='int32'
-    else:
-        assert 0,'Does not accept this typecode:'+code
-    return type
-    
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmmaxleveltype]
-                
-                    [Up]
-                    
-                    [mmmat2set]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmdil.html b/python/plugins/sextante/pymorph/html/morph/morph/mmdil.html
deleted file mode 100644
index 526c00e4a788..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmdil.html
+++ /dev/null
@@ -1,327 +0,0 @@
-
-  
-    
-    mmdil
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcero]
-              
-                  [Up]
-                  
-                  [mmero]
-              Dilations And Erosions
        
-    
        mmdil
-      
        
-      Dilate an image by a structuring element.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmdil(
-                  
-          f, 
-          b = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmdil performs the dilation of image 
-          f by the structuring element 
-          b.  Dilation is a neighbourhood operator that compares locally 
-          b with 
-          f, according to an intersection rule.  Since Dilation is a fundamental operator to the construction of all other morphological operators,  it is also called an elementary operator of Mathematical Morphology. When 
-          f is a gray-scale image, 
-          b may be a flat or non-flat structuring element.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical examples
        
-          
        
-            
        
-              
        >>> f=mmbinary([
-   [0, 0, 0, 0, 0, 0, 1],
-   [0, 1, 0, 0, 0, 0, 0],
-   [0, 0, 0, 0, 1, 0, 0]])
        
-              
        
-              
        >>> b=mmbinary([1, 1, 0])
        
-              
        
-              
        >>> mmdil(f,b)
        
-              
        array([[0, 0, 0, 0, 0, 1, 1],
-       [1, 1, 0, 0, 0, 0, 0],
-       [0, 0, 0, 1, 1, 0, 0]],'1')
        
-              
        >>> f=uint8([
-   [ 0,   1,  2, 50,  4,  5],
-   [ 2,   3,  4,  0,  0,  0],
-   [12, 255, 14, 15, 16, 17]])
        
-              
        
-              
        >>> mmdil(f,b)
        
-              
        array([[  1,   2,  50,  50,   5,   5],
-       [  3,   4,   4,   0,   0,   0],
-       [255, 255,  15,  16,  17,  17]],'b')
        
-            
        
-          
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> f=mmbinary(mmreadgray('blob.tif'))
        
-              
        
-              
        >>> bimg=mmbinary(mmreadgray('blob1.tif'))
        
-              
        
-              
        >>> b=mmimg2se(bimg)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(mmdil(f,b))
        
-              
        
-              
        >>> mmshow(mmdil(f,b),mmgradm(f))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fmmdil(f,b)
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        mmdil(f,b),mmgradm(f)
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> f=mmreadgray('pcb_gray.tif')
        
-              
        
-              
        >>> b=mmsedisk(5)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(mmdil(f,b))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fmmdil(f,b)
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        
-            
-          
        
-          
        Non-flat structuring element:
        
-          
        
-            
-          
        Where
-
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmdil(f, b=None):
-    from Numeric import maximum, NewAxis, ones
-    if b is None: b = mmsecross()
-    if len(f.shape) == 1: f = f[NewAxis,:]
-    h,w = f.shape
-    x,v = mmmat2set(b)
-    if len(x)==0:
-        y = (ones((h,w)) * mmlimits(f)[0]).astype(f.typecode())
-    else:
-        if mmisbinary(v):
-            v = mmintersec(mmgray(v,'int32'),0)
-        mh,mw = max(abs(x)[:,0]),max(abs(x)[:,1])
-        y = (ones((h+2*mh,w+2*mw)) * mmlimits(f)[0]).astype(f.typecode())
-        for i in range(x.shape[0]):
-            if v[i] > -2147483647:
-                y[mh+x[i,0]:mh+x[i,0]+h, mw+x[i,1]:mw+x[i,1]+w] = maximum(
-                    y[mh+x[i,0]:mh+x[i,0]+h, mw+x[i,1]:mw+x[i,1]+w], mmadd4dil(f,v[i]))
-        y = y[mh:mh+h, mw:mw+w]
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmcdilDilate an image conditionally.
        mmeroErode an image by a structuring element.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmimg2seCreate a structuring element from a pair of images.
        mmsesumN-1 iterative Minkowski  additions
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsedilDilate one structuring element by another
        mmcdilDilate an image conditionally.
        mmeroErode an image by a structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmimg2seCreate a structuring element from a pair of images.
        mmsesumN-1 iterative Minkowski  additions
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcero]
-                
-                    [Up]
-                    
-                    [mmero]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmdist.html b/python/plugins/sextante/pymorph/html/morph/morph/mmdist.html
deleted file mode 100644
index 39b3eb5dff69..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmdist.html
+++ /dev/null
@@ -1,285 +0,0 @@
-
-  
-    
-    mmdist
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmopen]
-              
-                  [Up]
-                  
-                  [mmgdist]
-              Image Transforms
        
-    
        mmdist
-      
        
-      Distance transform.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmdist(
-                  
-          f, 
-          Bc = None, 
-          METRIC = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        BcStructuring Element
        (connectivity)
        Default: 
-                      None (3x3 elementary cross)
-                    
        METRICString
        'EUCLIDEAN', or 'EUC2' for squared Euclidean.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        distance image in uint16, or in int32 datatype with EUC2 option.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmdist creates the distance image 
-          y of the binary image 
-          f.  The value of  
-          y at the pixel 
-          x is the distance of 
-          x to the complement of 
-          f, that is, the distance of 
-          x to nearest point in the complement of 
-          f. The distances available are based on the Euclidean metrics and on metrics generated by a a regular graph, that is characterized by a connectivity rule defined by the structuring element 
-          Bc. The implementation of the Euclidean algorithm is based on LotuZamp:01.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Simple numeric example
        
-          
        
-            
        
-              
        >>> a = mmframe(mmbinary(ones((5,9))),2,4)
        
-              
        
-              
        >>> f4=mmdist(a)
        
-              
        
-              
        >>> f8=mmdist(a,mmsebox())
        
-              
        
-              
        >>> fe=mmdist(a,mmsebox(),'EUCLIDEAN')
        
-              
        
-            
        
-          
        
-          
        Image example
        
-          
        
-            
        
-              
        >>> f = mmreadgray('gear.tif')
        
-              
        
-              
        >>> f = mmneg(mmgradm(f))
        
-              
        
-              
        >>> d4=mmdist(f)
        
-              
        
-              
        >>> d8=mmdist(f,mmsebox())
        
-              
        
-              
        >>> de=mmdist(f,mmsebox(),'EUCLIDEAN')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(d4%8)
        
-              
        Warning: Converting input image from int32 to uint16.
        
-              
        >>> mmshow(d8%8)
        
-              
        Warning: Converting input image from int32 to uint16.
        
-              
        >>> mmshow(de%8)
        
-              
        Warning: Converting input image from int32 to uint16.
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
        fd4%8d8%8de%8
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        distance of a point x to a set X:
        
-          
        
-            
-          
        
-          
        distance function:
        
-          
        
-            
-          
        
-          
        distance function using structuring element:
        
-          
        
-            
-          
        
-          
        Relationship between erosion and distance transform:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      To generate useful Distance transforms, the structuring elements must be symmetric and have the origin included.
-          The Euclidean distance transform is rounded to the nearest integer, since it is represented as an unsigned integer image. Use the option EUC2 to compute exact squared Euclidean distance transform.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmdist(f, Bc=None, METRIC=None):
-    from string import upper
-    from Numeric import zeros, sqrt
-    if Bc is None: Bc = mmsecross()
-    if METRIC is not None:
-       METRIC = upper(METRIC)
-    f = mmgray(f,'uint16')
-    y = mmintersec(f,0)
-    if (METRIC == 'EUCLIDEAN') or (METRIC == 'EUC2'):
-        b = int32(zeros((3,3)))
-        i=1
-        while not mmisequal(f,y):
-            a4,a2 = -4*i+2, -2*i+1
-            b = int32([[a4,a2,a4],
-                       [a2, 0,a2],
-                       [a4,a2,a4]])
-            y=f
-            i=i+1
-            f = mmero(f,b)
-        if METRIC == 'EUCLIDEAN':
-            f = uint16(sqrt(f)+0.5)
-    else:
-        if mmisequal(Bc, mmsecross()):
-            b = int32([[-2147483647,  -1, -2147483647],
-                       [         -1,   0,          -1],
-                       [-2147483647,  -1, -2147483647]])
-        elif mmisequal(Bc, mmsebox()):
-            b = int32([[-1,-1,-1],
-                       [-1, 0,-1],
-                       [-1,-1,-1]])
-        else: b = Bc
-        while not mmisequal(f,y):
-            y=f
-            f = mmero(f,b)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmdtshowDisplay a distance transform image with an iso-line color table.
        mmeroErode an image by a structuring element.
        mmgdistGeodesic Distance Transform.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmopen]
-                
-                    [Up]
-                    
-                    [mmgdist]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmdrawv.html b/python/plugins/sextante/pymorph/html/morph/morph/mmdrawv.html
deleted file mode 100644
index 1b84a0a20091..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmdrawv.html
+++ /dev/null
@@ -1,260 +0,0 @@
-
-  
-    
-    mmdrawv
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmframe]
-              
-                  [Up]
-                  
-                  [mmtext]
-              Image Creation
        
-    
        mmdrawv
-      
        
-      Superpose points, rectangles and lines on an image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmdrawv(
-                  
-          f, 
-          data, 
-          value, 
-          GEOM
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        dataImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        vector of points. Each row gives information regarding a geometrical primitive. The interpretation of this data is dependent on the parameter GEOM.
        The line drawing algorithm is not invariant to image transposition.
        valueImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        pixel gray-scale value associated to each point in parameter data. It can be a column vector of values or a single value.
        GEOMString
        geometrical figure. One of 'point','line', 'rect', or 'frect' for drawing points, lines, rectangles or filled rectangles respectively.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        
-                      y  has the same type of 
-                      f.
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmdrawv creates the image 
-          y by a superposition of points, rectangles and lines of gray-level 
-          k1 on the image 
-          f. The parameters for each geometrical primitive are defined by each line in the 'data' parameter. For 
-          points, they are represented by a matrix where each row gives the point's row and column, in this order. For 
-          lines, they are drawn with the same convention used by points, with a straight line connecting them in the order given by the 
-          data matrix. For 
-          rectangles and 
-          filled rectangles, each row in the 
-          data matrix gives the two points of the diagonal of the rectangle, where the points use the same row, column convention.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical examples
        
-          
        
-            
        
-              
        >>> f=uint8(zeros((3,5)))
        
-              
        
-              
        >>> pcoords=uint16([[0,2,4],
-                [0,0,2]])
        
-              
        
-              
        >>> pvalue=uint16([1,2,3])
        
-              
        
-              
        >>> print mmdrawv(f,pcoords,pvalue,'point')
        
-              
        [[1 0 2 0 0]
- [0 0 0 0 0]
- [0 0 0 0 3]]
        
-              
        >>> print mmdrawv(f,pcoords,pvalue,'line')
        
-              
        [[1 1 2 0 0]
- [0 0 0 2 0]
- [0 0 0 0 2]]
        
-              
        >>> rectcoords=uint16([[0],
-                   [0],
-                   [3],
-                   [2]])
        
-              
        
-              
        >>> print mmdrawv(f,rectcoords, uint16(5), 'rect')
        
-              
        [[5 5 5 5 0]
- [5 0 0 5 0]
- [5 5 5 5 0]]
        
-            
        
-          
        
-          
        
-          
        Gray-scale image
        A line connecting the centroids of the blobs is drawn.
-
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob3.tif')
        
-              
        
-              
        >>> pc=mmblob(mmlabel(f),'centroid','data')
        
-              
        
-              
        >>> lines=mmdrawv(mmintersec(f,0),transpose(pc),uint8(1),'line')
        
-              
        Warning: Converting input image from int32 to binary uint8.
        
-              
        >>> mmshow(f,lines)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f,lines
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmdrawv(f, data, value, GEOM):
-    from Numeric import array, NewAxis, zeros, Int, put, ravel, arange, floor
-    from string import upper
-    GEOM  = upper(GEOM)
-    data  = array(data)
-    value = array(value)
-    y     = array(f)
-    lin, col = data[1,:], data[0,:]
-    i = lin*f.shape[1] + col; i = i.astype(Int)
-    if len(f.shape) == 1: f = f[NewAxis,:]
-    if value.shape == (): value = value + zeros(lin.shape)
-    if len(lin) != len(value):
-        print 'Number of points must match n. of colors.'
-        return None
-    if GEOM == 'POINT':
-        put(ravel(y), i, value)
-    elif GEOM == 'LINE':
-        for k in range(len(value)-1):
-            delta = 1.*(lin[k+1]-lin[k])/(1e-10 + col[k+1]-col[k])
-            if abs(delta) <= 1:
-                if col[k] < col[k+1]: x_ = arange(col[k],col[k+1]+1)
-                else                : x_ = arange(col[k+1],col[k]+1)
-                y_ = floor(delta*(x_-col[k]) + lin[k] + 0.5)
-            else:
-                if lin[k] < lin[k+1]: y_ = arange(lin[k],lin[k+1]+1)
-                else                : y_ = arange(lin[k+1],lin[k]+1)
-                x_ = floor((y_-lin[k])/delta + col[k] + 0.5)
-            i_ = y_*f.shape[1] + x_; i_ = i_.astype(Int)
-            put(ravel(y), i_, value[k])
-    elif GEOM == 'RECT':
-        for k in range(data.shape[1]):
-            d = data[:,k]
-            x0,y0,x1,y1 = d[1],d[0],d[3],d[2]
-            y[x0:x1,y0]   = value[k]
-            y[x0:x1,y1]   = value[k]
-            y[x0,y0:y1]   = value[k]
-            y[x1,y0:y1+1] = value[k]
-    elif GEOM == 'FRECT':
-        for k in range(data.shape[1]):
-            d = data[:,k]
-            x0,y0,x1,y1 = d[1],d[0],d[3],d[2]
-            y[x0:x1+1,y0:y1+1] = value[k]
-    else:
-        print "GEOM should be 'POINT', 'LINE', 'RECT', or 'FRECT'."
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmframeCreate a frame image.
        mmtextCreate a binary image of a text.
        mmblobBlob measurements from a labeled image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmframe]
-                
-                    [Up]
-                    
-                    [mmtext]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmdtshow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmdtshow.html
deleted file mode 100644
index 8199759fe5e9..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmdtshow.html
+++ /dev/null
@@ -1,177 +0,0 @@
-
-  
-    
-    mmdtshow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmgshow]
-              
-                  [Up]
-                  
-                  [mmlblshow]
-              Visualization
        
-    
        mmdtshow
-      
        
-      Display a distance transform image with an iso-line color table.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmdtshow(
-                  
-          f, 
-          n = 10
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                          
        Distance transform.
        nBoolean
        Number of iso-contours.
        Default: 
-                      10
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Optionally return RGB uint8 image
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Displays the distance transform image 
-          f (uint8 or uint16) with a special gray-scale color table with 
-          n pseudo-color equaly spaced. The final appearance of this display is similar to an iso-contour image display. The infinity value, which is the maximum level allowed in the image, is displayed as black. The image is displayed in the MATLAB figure only if no output parameter is given.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob.tif')
        
-              
        
-              
        >>> fd=mmdist(f)
        
-              
        
-              
        >>> mmshow(fd)
        
-              
        
-              
        >>> mmdtshow(fd)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fdfd
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmdtshow(f, n=10):
-    import adpil
-    if (mmisbinary(f)) or (len(f.shape) != 2):
-      print 'Error, mmdtshow: works only for grayscale labeled image'
-      return
-    y=mmgdtshow(f, n)
-    adpil.adshow(y)
-    return
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdistDistance transform.
        mmgdistGeodesic Distance Transform.
        mmlblshowDisplay a labeled image assigning a random color for each label.
        mmshowDisplay binary or gray-scale images and optionally overlay it with binary images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmgshow]
-                
-                    [Up]
-                    
-                    [mmlblshow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmedgeoff.html b/python/plugins/sextante/pymorph/html/morph/morph/mmedgeoff.html
deleted file mode 100644
index 2ace3a50e32f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmedgeoff.html
+++ /dev/null
@@ -1,180 +0,0 @@
-
-  
-    
-    mmedgeoff
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsuprec]
-              
-                  [Up]
-                  
-                  [mmcbisector]
-              Residues
        
-    
        mmedgeoff
-      
        
-      Eliminate the objects that hit the image frame.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmedgeoff(
-                  
-          f, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        BcStructuring Element
        ( connectivity)
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmedgeoff creates the binary image 
-          y by eliminating the objects (connected components) of the binary image 
-          f that hit the image frame, according to the connectivity defined by the structuring element 
-          Bc.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a=mmreadgray('form-1.tif')
        
-              
        
-              
        >>> b=mmedgeoff(a)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmedgeoff(f, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    edge = mmframe(f)
-    y = mmsubm( f, mminfrec(edge, f, Bc))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmframeCreate a frame image.
        mminfrecInf-reconstruction.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsuprec]
-                
-                    [Up]
-                    
-                    [mmcbisector]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmendpoints.html b/python/plugins/sextante/pymorph/html/morph/morph/mmendpoints.html
deleted file mode 100644
index e777ca314ec0..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmendpoints.html
+++ /dev/null
@@ -1,260 +0,0 @@
-
-  
-    
-    mmendpoints
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmskelmrec]
-              
-                  [Up]
-                  
-                  [mmhomothick]
-              Intervals (hit-or-miss templates)
        
-    
        mmendpoints
-      
        
-      Interval to detect end-points.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Iab = 
-          mmendpoints(
-                  
-          OPTION = "LOOP"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        OPTIONString
        'LOOP' or 'HOMOTOPIC'
        Default: 
-                      "LOOP"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        IabInterval
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmendpoints creates an interval that is useful to detect end-points of curves (i.e., one pixel thick connected components) in binary images. It can be used to prune skeletons and to mark objects transforming them in a single pixel or closed loops if they have holes. There are two options available: LOOP, deletes all points but preserves loops if used in 
-          mmthin; HOMOTOPIC, deletes all points but preserves the last single point or loops.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Interval visualization
        
-          
        
-            
        
-              
        >>> print mmintershow(mmendpoints())
        
-              
        . . . 
-0 1 0 
-0 0 0
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> print mmintershow(mmendpoints('HOMOTOPIC'))
        
-              
        . 1 . 
-0 1 0 
-0 0 0
        
-            
        
-          
        
-          
        Pruning
        
-          
        
-            
        
-              
        >>> f = mmreadgray('pcbholes.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> f1 = mmthin(f)
        
-              
        
-              
        >>> mmshow(f1)
        
-              
        
-              
        >>> f2 = mmthin(f1,mmendpoints(),20)
        
-              
        
-              
        >>> mmshow(f2)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ff1
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f2
        
-          
        
-          
        Homotopic marking
        
-          
        
-            
        
-              
        >>> fn = mmthin(f1,mmendpoints('HOMOTOPIC'))
        
-              
        
-              
        >>> mmshow(mmdil(fn))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        mmdil(fn)
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmendpoints(OPTION="LOOP"):
-    from string import upper
-    Iab = None
-    OPTION = upper(OPTION)
-    if OPTION == 'LOOP':
-        Iab = mmse2hmt(mmbinary([[0,0,0],
-                                  [0,1,0],
-                                  [0,0,0]]),
-                        mmbinary([[0,0,0],
-                                  [1,0,1],
-                                  [1,1,1]]))
-    elif OPTION == 'HOMOTOPIC':
-        Iab = mmse2hmt(mmbinary([[0,1,0],
-                                  [0,1,0],
-                                  [0,0,0]]),
-                        mmbinary([[0,0,0],
-                                  [1,0,1],
-                                  [1,1,1]]))
-    return Iab
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmhomothickInterval for homotopic thickening.
        mmhomothinInterval for homotopic thinning.
        mmsupcanonUnion of sup-generating or hit-miss operators.
        mmsupgenSup-generating (hit-miss).
        mmthinImage transformation by thinning.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        mmintershowVisualize an interval.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmskelmrec]
-                
-                    [Up]
-                    
-                    [mmhomothick]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmero.html b/python/plugins/sextante/pymorph/html/morph/morph/mmero.html
deleted file mode 100644
index d4714858f7f1..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmero.html
+++ /dev/null
@@ -1,309 +0,0 @@
-
-  
-    
-    mmero
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdil]
-              
-                  [Up]
-                  
-                  [mmcenter]
-              Dilations And Erosions
        
-    
        mmero
-      
        
-      Erode an image by a structuring element.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmero(
-                  
-          f, 
-          b = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmero performs the erosion of the image 
-          f by the structuring element 
-          b. Erosion is a neighbourhood operator that compairs locally 
-          b with 
-          f, according to an inclusion rule.  Since erosion is a fundamental operator to the construction of all other morphological operators, it is also called an elementary operator of Mathematical Morphology. When 
-          f is a gray-scale image , 
-          b may be a flat or non-flat structuring element.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical examples
        
-          
        
-            
        
-              
        >>> f=mmbinary([
-   [1, 1, 1, 0, 0, 1, 1],
-   [1, 0, 1, 1, 1, 0, 0],
-   [0, 0, 0, 0, 1, 0, 0]])
        
-              
        
-              
        >>> b=mmbinary([1, 1, 0])
        
-              
        
-              
        >>> mmero(f,b)
        
-              
        array([[1, 1, 1, 0, 0, 0, 1],
-       [1, 0, 0, 1, 1, 0, 0],
-       [0, 0, 0, 0, 0, 0, 0]],'1')
        
-              
        >>> f=uint8([
-   [ 0,   1,  2, 50,  4,  5],
-   [ 2,   3,  4,  0,  0,  0],
-   [12, 255, 14, 15, 16, 17]])
        
-              
        
-              
        >>> mmero(f,b)
        
-              
        array([[ 0,  0,  1,  2,  4,  4],
-       [ 2,  2,  3,  0,  0,  0],
-       [12, 12, 14, 14, 15, 16]],'b')
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> f=mmbinary(mmreadgray('blob.tif'))
        
-              
        
-              
        >>> bimg=mmbinary(mmreadgray('blob1.tif'))
        
-              
        
-              
        >>> b=mmimg2se(bimg)
        
-              
        
-              
        >>> g=mmero(f,b)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-              
        >>> mmshow(g,mmgradm(f))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        g,mmgradm(f)
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> f=mmreadgray('pcb_gray.tif')
        
-              
        
-              
        >>> b=mmsedisk(3)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(mmero(f,b))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fmmero(f,b)
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        
-            
-          
        
-          
        Non-flat structuring element:
        
-          
        
-            
-          
        Where
-
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmero(f, b=None):
-    if b is None: b = mmsecross()
-    y = mmneg(mmdil(mmneg(f),mmsereflect(b)))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmdilDilate an image by a structuring element.
        mmimg2seCreate a structuring element from a pair of images.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmceroErode an image conditionally.
        mmdistDistance transform.
        mmsesumN-1 iterative Minkowski  additions
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmdilDilate an image by a structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmceroErode an image conditionally.
        mmdistDistance transform.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdil]
-                
-                    [Up]
-                    
-                    [mmcenter]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmframe.html b/python/plugins/sextante/pymorph/html/morph/morph/mmframe.html
deleted file mode 100644
index b9b81d9b2a39..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmframe.html
+++ /dev/null
@@ -1,181 +0,0 @@
-
-  
-    
-    mmframe
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [uint16]
-              
-                  [Up]
-                  
-                  [mmdrawv]
-              Image Creation
        
-    
        mmframe
-      
        
-      Create a frame image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmframe(
-                  
-          f, 
-          WT = 1, 
-          HT = 1, 
-          DT = 0, 
-          k1 = None, 
-          k2 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        WTDouble
        Positive integer ( width thickness).
        Default: 
-                      1
-                    
        HTDouble
        Positive integer ( height thickness).
        Default: 
-                      1
-                    
        DTDouble
        Positive integer ( depth thickness).
        Default: 
-                      0
-                    
        k1Double      Non-negative integer.
-                          
        Frame gray-level.
        Default: 
-                      None (Maximum pixel value allowed in f)
-                    
        k2Double      Non-negative integer.
-                          
        Background gray level.
        Default: 
-                      None (Minimum pixel value allowed in f)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        image of same type as 
-                      f.
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmframe creates an image 
-          y, with the same dimensions (W,H,D) and same pixel type of the image 
-          f, such that the value of the pixels in the image frame is 
-          k1 and the value of the other pixels is 
-          k2. The thickness of the image frame is DT.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
          Where  is the image frame of f, characterized by wt and ht
-                      
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmframe(f, WT=1, HT=1, DT=0, k1=None, k2=None):
-    if k1 is None: k1 = mmlimits(f)[1]
-    if k2 is None: k2 = mmlimits(f)[0]
-    assert len(f.shape)<3,'Supports 2D only'
-    y = mmunion(mmintersec(f,mmlimits(f)[0]),k2)
-    y[:,0:WT] = k1
-    y[:,-WT:] = k1
-    y[0:HT,:] = k1
-    y[-HT:,:] = k1
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmlimitsGet the possible minimum and maximum of an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [uint16]
-                
-                    [Up]
-                    
-                    [mmdrawv]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmfreedom.html b/python/plugins/sextante/pymorph/html/morph/morph/mmfreedom.html
deleted file mode 100644
index 1b17ca4f965a..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmfreedom.html
+++ /dev/null
@@ -1,162 +0,0 @@
-
-  
-    
-    mmfreedom
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmbinary]
-              
-                  [Up]
-                  
-                  [mmgray]
-              Data Type Conversion
        
-    
        mmfreedom
-      
        
-      Control automatic data type conversion.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Y = 
-          mmfreedom(
-                  
-          L = 5
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        LDouble
        level of FREEDOM: 0, 1 or 2. If the input parameter is omitted, the current level is returned.
        Default: 
-                      5
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        YDouble
        current  FREEDOM  level
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmfreedom controls the automatic data type conversion. There are 3 possible levels, called FREEDOM levels, for automatic conversion: 0 - image type conversion is not allowed;  1- image type conversion is allowed, but a warning is sent for each conversion;  2- image type conversion is allowed without warning.  The FREEDOM  levels are set or inquired by 
-          mmfreedom.
-          If an image is not in the required datatype, than it should be converted to the maximum and nearest pymorph Morphology Toolbox datatype.   For example, if an image is in int32 and a morphological gray-scale processing that accepts only binary, uint8 or uint16 images, is required, it will be converted to uint16.  Another example, if a binary image should be added to a uint8  image, the binary image will be converted to uint8.
-
-          
        In cases of operators that have as parameters an image and a constant, the type of the image should be  kept as reference, while the type of the constant should be converted, if necessary.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        In the following code, both images are gray-scale images, the first image is double and the second is uint8. The nearest image type supported by the toolbox is int32. Both images are converted to int32 and then subtracted. The result is in int32 datatype.
-
-          
        
-            
        
-              
        >>> a=mmsubm([4., 2., 1.],uint8([3, 2, 0]))
        
-              
        Warning: Converting input image from double to int32.
-Warning: Converting input image from uint8 to int32.
        
-              
        >>> print a
        
-              
        [1 0 1]
        
-              
        >>> print mmdatatype(a)
        
-              
        int32
        
-            
        
-          
        
-          
        The first image is gray-scale double and the second is binary double. The nearest image type supported by the toolbox is gray-scale int32. The second image is binary and when converted to gray-scale int32 will become int32([1 1 0]).
-
-          
        
-            
        
-              
        >>> a=mmsubm([4., 2., 1], mmbinary([3, 2, 0]))
        
-              
        Warning: Converting input image from double to int32.
-Warning: Converting input image from binary uint8 to int32.
        
-              
        >>> print a
        
-              
        [3 1 1]
        
-              
        >>> print mmdatatype(a)
        
-              
        int32
        
-            
        
-          
        
-          
        Although the image is uint8 and the constant is int32 the predominant type is given for the image and the constant will be converted to uint8.
-
-          
        
-            
        
-              
        >>> a=mmsubm(uint8([4, 3, 2, 1]), 1)
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> print a
        
-              
        [3 2 1 0]
        
-              
        >>> print mmdatatype(a)
        
-              
        uint8
        
-            
        
-          
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmfreedom(L=5):
-    Y = -1
-    return Y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmbinary]
-                
-                    [Up]
-                    
-                    [mmgray]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmgdist.html b/python/plugins/sextante/pymorph/html/morph/morph/mmgdist.html
deleted file mode 100644
index 6aea01375349..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmgdist.html
+++ /dev/null
@@ -1,261 +0,0 @@
-
-  
-    
-    mmgdist
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdist]
-              
-                  [Up]
-                  
-                  [mmopentransf]
-              Image Transforms
        
-    
        mmgdist
-      
        
-      Geodesic Distance Transform.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmgdist(
-                  
-          f, 
-          g, 
-          Bc = None, 
-          METRIC = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        gImage          Binary image.
-                          
        Marker image
        BcStructuring Element
        (metric for distance).
        Default: 
-                      None (3x3 elementary cross)
-                    
        METRICString
        'EUCLIDEAN' if specified.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        uint16 (distance image).
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmgdist creates the geodesic distance image 
-          y of the binary image 
-          f relative to the binary image 
-          g.  The value of 
-          y at the pixel 
-          x is the length of the smallest path between 
-          x and 
-          f. The distances available are based  on the Euclidean metrics  and on metrics generated by a neighbourhood graph,  that is characterized by a connectivity rule defined by the structuring element 
-          Bc.   The  connectivity for defining the paths is consistent with the metrics adopted to measure their length.   In the case of the Euclidean distance, the space is considered continuos and, in the other cases, the connectivity is the one defined by 
-          Bc.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmbinary([
- [1,1,1,1,1,1],
- [1,1,1,0,0,1],
- [1,0,1,0,0,1],
- [1,0,1,1,0,0],
- [0,0,1,1,1,1],
- [0,0,0,1,1,1]])
        
-              
        
-              
        >>> g=mmbinary([
- [0,0,0,0,0,0],
- [1,1,0,0,0,0],
- [0,0,0,0,0,0],
- [0,0,0,0,0,0],
- [0,0,0,0,0,0],
- [0,0,0,0,0,1]])
        
-              
        
-              
        >>> y=mmgdist(f,g,mmsecross())
        
-              
        
-              
        >>> print y
        
-              
        [[    1     1     2     3     4     5]
- [    0     0     1 65535 65535     6]
- [    1 65535     2 65535 65535     7]
- [    2 65535     3     4 65535 65535]
- [65535 65535     4     3     2     1]
- [65535 65535 65535     2     1     0]]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('maze_bw.tif')
        
-              
        
-              
        >>> g=mmintersec(f,0)
        
-              
        Warning: Converting input image from int32 to binary uint8.
        
-              
        >>> g=mmdrawv(g,uint16([[2],[2],[6],[6]]),uint16(1),'frect')
        
-              
        
-              
        >>> y=mmgdist(f,g,mmsebox(),'EUCLIDEAN')
        
-              
        
-              
        >>> mmshow(f,g)
        
-              
        
-              
        >>> mmdtshow(y,200)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        f,gy,200
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        geodesic distance function using structuring element:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      To generate useful Distance transforms, the structuring elements must be symmetric and with the origin included.
-          The Euclidean Distance transform is rounded to the nearest integer, since it is represented in an unsigned integer image. You should use the 
-          mmsebox structuring element when computing the Euclidean Distance transform.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmgdist(f, g, Bc=None, METRIC=None):
-    if Bc is None: Bc = mmsecross()
-    assert METRIC is None,'Does not support EUCLIDEAN'
-    fneg,gneg = mmneg(f),mmneg(g)
-    y = mmgray(gneg,'uint16',1)
-    ero = mmintersec(y,0)
-    aux = y
-    i = 1
-    while not mmisequal(ero,aux):
-        aux = ero
-        ero = mmcero(gneg,fneg,Bc,i)
-        y = mmaddm(y,mmgray(ero,'uint16',1))
-        i = i + 1
-    y = mmunion(y,mmgray(ero,'uint16'))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdistDistance transform.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmseboxCreate a box structuring element.
        mmfreedomControl automatic data type conversion.
        mmceroErode an image conditionally.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdist]
-                
-                    [Up]
-                    
-                    [mmopentransf]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmglblshow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmglblshow.html
deleted file mode 100644
index 18e31dca3e7b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmglblshow.html
+++ /dev/null
@@ -1,132 +0,0 @@
-
-  
-    
-    mmglblshow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmstats]
-              
-                  [Up]
-                  
-                  [mmgshow]
-              Visualization
        
-    
        mmglblshow
-      
        
-      Apply a random color table to a gray-scale image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Y = 
-          mmglblshow(
-                  
-          X, 
-          border = 0.0
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        XImage          Gray-scale (uint8 or uint16) image.
-                          
        Labeled image.
        borderBoolean
        Labeled image.
        Default: 
-                      0.0
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        YImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmglblshow(X, border=0.0):
-    from Numeric import take, resize, shape
-    from MLab import rand
-    mmin = mmstats(X,'min')
-    mmax = mmstats(X,'max')
-    ncolors = mmax - mmin + 1
-    R = int32(rand(ncolors)*255)
-    G = int32(rand(ncolors)*255)
-    B = int32(rand(ncolors)*255)
-    if mmin == 0:
-       R[0],G[0],B[0] = 0,0,0
-    r=resize(take(R, X.flat - mmin),X.shape)
-    g=resize(take(G, X.flat - mmin),X.shape)
-    b=resize(take(B, X.flat - mmin),X.shape)
-    Y=mmconcat('d',r,g,b)
-    return Y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmlabelLabel a binary image.
        mmlblshowDisplay a labeled image assigning a random color for each label.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmstats]
-                
-                    [Up]
-                    
-                    [mmgshow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmgradm.html b/python/plugins/sextante/pymorph/html/morph/morph/mmgradm.html
deleted file mode 100644
index 51aa39c9282b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmgradm.html
+++ /dev/null
@@ -1,248 +0,0 @@
-
-  
-    
-    mmgradm
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcloseth]
-              
-                  [Up]
-                  
-                  [mmopenrecth]
-              Residues
        
-    
        mmgradm
-      
        
-      Morphological gradient.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmgradm(
-                  
-          f, 
-          Bdil = None, 
-          Bero = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        BdilStructuring Element
        for the dilation.
        Default: 
-                      None (3x3 elementary cross)
-                    
        BeroStructuring Element
        for the erosion.
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        (same type of 
-                      f).
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmgradm creates the image 
-          y by the subtraction of the erosion of the image 
-          f by 
-          Bero of the dilation of 
-          f by 
-          Bdil.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Binary image:
        
-          
        Binary image, internal and external gradient:
        
-          
        Gray-scale
        
-          
        
-            
        
-              
        >>> a = mmreadgray('small_bw.tif')
        
-              
        
-              
        >>> b = mmgradm(a)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-          
        Binary image, internal and external gradient:
        
-          
        
-            
        
-              
        >>> c=mmgradm(a,mmsecross(0),mmsecross())
        
-              
        
-              
        >>> d=mmgradm(a,mmsecross(),mmsecross(0))
        
-              
        
-              
        >>> mmshow(a,c)
        
-              
        
-              
        >>> mmshow(a,d)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        a,ca,d
        
-          
        
-          
        Gray-scale
        
-          
        
-            
        
-              
        >>> a = mmreadgray('bloodcells.tif')
        
-              
        
-              
        >>> b = mmgradm(a)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmgradm(f, Bdil=None, Bero=None):
-    if Bdil is None: Bdil = mmsecross()
-    if Bero is None: Bero = mmsecross()
-    y = mmsubm(mmdil(f,Bdil),mmero(f,Bero))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmdilDilate an image by a structuring element.
        mmeroErode an image by a structuring element.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcloseth]
-                
-                    [Up]
-                    
-                    [mmopenrecth]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmgrain.html b/python/plugins/sextante/pymorph/html/morph/morph/mmgrain.html
deleted file mode 100644
index 6adb3ed5ddf2..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmgrain.html
+++ /dev/null
@@ -1,265 +0,0 @@
-
-  
-    
-    mmgrain
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmblob]
-              
-                  [Up]
-                  
-                  [mmlabelflat]
-              Measurements
        
-    
        mmgrain
-      
        
-      Gray-scale statistics for each labeled region.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmgrain(
-                  
-          fr, 
-          f, 
-          measurement, 
-          option = "image"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        frImage          Gray-scale (uint8 or uint16) image.
-                          
        Labeled image, to define the regions. Label 0 is the background region.
        fImage          Gray-scale (uint8 or uint16) image.
-                          
        To extract the measuremens.
        measurementString
        Choose the measure to compute: 'max', 'min', 'median', 'mean', 'sum', 'std', 'std1'.
        optionString
        Output format: 'image': results as a gray-scale mosaic image (uint16); 'data': results a column vector of measurements (double).
        Default: 
-                      "image"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) image.
-                          
        Or a column vector (double) with gray-scale statistics per region.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Computes gray-scale statistics of each grain in the image. The grains regions are specified by the labeled image 
-          fr and the gray-scale information is specified by the image 
-          f. The statistics to compute is specified by the parameter 
-          measurement, which has the same options as in function 
-          mmstats. The parameter 
-          option defines: ('image') if the output is an uint16 image where each label value is changed to the measurement value, or ('data') a double column vector. In this case, the first element (index 1) is the measurement of region 1. The region with label zero is not measure as it is normally the background.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical Example
        
-          
        
-            
        
-              
        >>> f=uint8([range(6),range(6),range(6)])
        
-              
        
-              
        >>> fr=mmlabelflat(f)
        
-              
        
-              
        >>> mmgrain(fr,f,'sum','data')
        
-              
        array([[  0.],
-       [  3.],
-       [  6.],
-       [  9.],
-       [ 12.],
-       [ 15.]])
        
-              
        >>> mmgrain(fr,f,'sum')
        
-              
        array([[ 0,  3,  6,  9, 12, 15],
-       [ 0,  3,  6,  9, 12, 15],
-       [ 0,  3,  6,  9, 12, 15]],'w')
        
-            
        
-          
        
-          
        Watershed Mosaic
        The catchment basins of the watershed of the gradient from markers have all its pixels with the mean gray level within its catchment basin.
-
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('astablet.tif')
        
-              
        
-              
        >>> g=mmgradm(f)
        
-              
        
-              
        >>> marker=mmregmin(mmclose(g))
        
-              
        
-              
        >>> ws=mmcwatershed(g,marker,mmsebox(),'regions')
        
-              
        
-              
        >>> g=mmgrain(ws,f,'mean')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmgrain(fr, f, measurement, option="image"):
-    from Numeric import NewAxis, ravel, zeros, sum, nonzero, put, take, array
-    from MLab import mean, std
-    from string import upper
-    measurement = upper(measurement)
-    option      = upper(option)
-    if len(fr.shape) == 1: fr = fr[NewAxis,:]
-    n = max(ravel(fr))
-    if option == 'DATA': y = []
-    else               : y = zeros(fr.shape)
-    if measurement == 'MAX':
-        for i in range(1,n+1):
-            aux = fr==i
-            val = max(ravel(aux*f))
-            if option == 'DATA': y.append(val)
-            else               : put(ravel(y), nonzero(ravel(aux)), val)
-    elif measurement == 'MIN':
-        for i in range(1,n+1):
-            aux = fr==i
-            lin = ravel(aux*f)
-            ind = nonzero(ravel(aux))
-            val = min(take(lin,ind))
-            if option == 'DATA': y.append(val)
-            else               : put(ravel(y), ind, val)
-    elif measurement == 'SUM':
-        for i in range(1,n+1):
-            aux = fr==i
-            val = sum(ravel(aux*f))
-            if option == 'DATA': y.append(val)
-            else               : put(ravel(y), nonzero(ravel(aux)), val)
-    elif measurement == 'MEAN':
-        for i in range(1,n+1):
-            aux = fr==i
-            ind = nonzero(ravel(aux))
-            val = mean(take(ravel(aux*f), ind))
-            if option == 'DATA': y.append(val)
-            else               : put(ravel(y), ind, val)
-    elif measurement == 'STD':
-        for i in range(1,n+1):
-            aux = fr==i
-            ind = nonzero(ravel(aux))
-            v   = take(ravel(aux*f), ind)
-            if len(v) < 2: val = 0
-            else         : val = std(v)
-            if option == 'DATA': y.append(val)
-            else               : put(ravel(y), ind, val)
-    elif measurement == 'STD1':
-        print "'STD1' is not implemented"
-    else:
-        print "Measurement should be 'MAX', 'MIN', 'MEAN', 'SUM', 'STD', 'STD1'."
-    if option == 'DATA':
-        y = array(y)
-        if len(y.shape) == 1: y = y[:,NewAxis]
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmlabelLabel a binary image.
        mmblobBlob measurements from a labeled image.
        mmlabelflatLabel the flat zones of gray-scale images.
        mmstatsFind global image statistics.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmblob]
-                
-                    [Up]
-                    
-                    [mmlabelflat]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmgray.html b/python/plugins/sextante/pymorph/html/morph/morph/mmgray.html
deleted file mode 100644
index 113ff3b5d1cb..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmgray.html
+++ /dev/null
@@ -1,197 +0,0 @@
-
-  
-    
-    mmgray
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmfreedom]
-              
-                  [Up]
-                  
-                  [int32]
-              Data Type Conversion
        
-    
        mmgray
-      
        
-      Convert a binary image into a gray-scale image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmgray(
-                  
-          f, 
-          TYPE = "uint8", 
-          k1 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        TYPEString
        'uint8', 'uint16', or 'int32'.
        Default: 
-                      "uint8"
-                    
        k1Double      Non-negative integer.
-                                
        Default: 
-                      None (Maximum pixel level in pixel type)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmgray converts a binary image into a gray-scale image of a specified data type. The value 
-          k1 is assigned to the 1 pixels of  
-          f, while the 0 pixels are assigned to the minimum value associated to the specified data type.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b=mmbinary([0, 1, 0, 1])
        
-              
        
-              
        >>> print b
        
-              
        [0 1 0 1]
        
-              
        >>> c=mmgray(b)
        
-              
        
-              
        >>> print c
        
-              
        [  0 255   0 255]
        
-              
        >>> d=mmgray(b,'uint8',100)
        
-              
        
-              
        >>> print d
        
-              
        [  0 100   0 100]
        
-              
        >>> e=mmgray(b,'uint16')
        
-              
        
-              
        >>> print e
        
-              
        [    0 65535     0 65535]
        
-              
        >>> f=mmgray(b,'int32',0)
        
-              
        
-              
        >>> print f
        
-              
        [-2147483647           0 -2147483647           0]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmgray(f, TYPE="uint8", k1=None):
-    from Numeric import array
-    if k1 is None: k1 = mmmaxleveltype(TYPE)
-    if type(f) is list: f = mmbinary(f)
-    assert mmis(f,'binary'), 'f must be binary'
-    if k1==None:
-        k1=mmmaxleveltype(TYPE)
-    if   TYPE == 'uint8' : y = uint8(f*k1)
-    elif TYPE == 'uint16': y = uint16(f*k1)
-    elif TYPE == 'int32' : y = int32(f*k1) - int32(mmneg(f)*mmmaxleveltype(TYPE))
-    else:
-        assert 0, 'type not supported:'+TYPE
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmbinaryConvert a gray-scale image into a binary image
        mmthreshadThreshold (adaptive)
        mmisVerify if a relationship among images is true or false.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmfreedom]
-                
-                    [Up]
-                    
-                    [int32]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmgshow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmgshow.html
deleted file mode 100644
index 907ffd13b8ff..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmgshow.html
+++ /dev/null
@@ -1,196 +0,0 @@
-
-  
-    
-    mmgshow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmglblshow]
-              
-                  [Up]
-                  
-                  [mmdtshow]
-              Visualization
        
-    
        mmgshow
-      
        
-      Apply binary overlays as color layers on a binary or gray-scale image
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Y = 
-          mmgshow(
-                  
-          X, 
-          X1 = None, 
-          X2 = None, 
-          X3 = None, 
-          X4 = None, 
-          X5 = None, 
-          X6 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        XImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        X1Image          Binary image.
-                          
        Red overlay.
        Default: 
-                      None
-                    
        X2Image          Binary image.
-                          
        Green overlay.
        Default: 
-                      None
-                    
        X3Image          Binary image.
-                          
        Blue overlay.
        Default: 
-                      None
-                    
        X4Image          Binary image.
-                          
        Magenta overlay.
        Default: 
-                      None
-                    
        X5Image          Binary image.
-                          
        Yellow overlay.
        Default: 
-                      None
-                    
        X6Image          Binary image.
-                          
        Cyan overlay.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        YImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmgshow(X, X1=None, X2=None, X3=None, X4=None, X5=None, X6=None):
-    if mmisbinary(X): X = mmgray(X,'uint8')
-    r = X
-    g = X
-    b = X
-    if X1 is not None: # red 1 0 0
-      assert mmisbinary(X1),'X1 must be binary overlay'
-      x1 = mmgray(X1,'uint8')
-      r = mmunion(r,x1)
-      g = mmintersec(g,mmneg(x1))
-      b = mmintersec(b,mmneg(x1))
-    if X2 is not None: # green 0 1 0
-      assert mmisbinary(X2),'X2 must be binary overlay'
-      x2 = mmgray(X2,'uint8')
-      r = mmintersec(r,mmneg(x2))
-      g = mmunion(g,x2)
-      b = mmintersec(b,mmneg(x2))
-    if X3 is not None: # blue 0 0 1
-      assert mmisbinary(X3),'X3 must be binary overlay'
-      x3 = mmgray(X3,'uint8')
-      r = mmintersec(r,mmneg(x3))
-      g = mmintersec(g,mmneg(x3))
-      b = mmunion(b,x3)
-    if X4 is not None: # magenta 1 0 1
-      assert mmisbinary(X4),'X4 must be binary overlay'
-      x4 = mmgray(X4,'uint8')
-      r = mmunion(r,x4)
-      g = mmintersec(g,mmneg(x4))
-      b = mmunion(b,x4)
-    if X5 is not None: # yellow 1 1 0
-      assert mmisbinary(X5),'X5 must be binary overlay'
-      x5 = mmgray(X5,'uint8')
-      r = mmunion(r,x5)
-      g = mmunion(g,x5)
-      b = mmintersec(b,mmneg(x5))
-    if X6 is not None: # cyan 0 1 1
-      assert mmisbinary(X6),'X6 must be binary overlay'
-      x6 = mmgray(X6,'uint8')
-      r = mmintersec(r,mmneg(x6))
-      g = mmunion(g,x6)
-      b = mmunion(b,x6)
-    return mmconcat('d',r,g,b)
-    return Y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-          
-        
        mmshowDisplay binary or gray-scale images and optionally overlay it with binary images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmglblshow]
-                
-                    [Up]
-                    
-                    [mmdtshow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmhistogram.html b/python/plugins/sextante/pymorph/html/morph/morph/mmhistogram.html
deleted file mode 100644
index 61c43b650f9f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmhistogram.html
+++ /dev/null
@@ -1,197 +0,0 @@
-
-  
-    
-    mmhistogram
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmwatershed]
-              
-                  [Up]
-                  
-                  [mmlabel]
-              Measurements
        
-    
        mmhistogram
-      
        
-      Find the histogram of the image f.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        h = 
-          mmhistogram(
-                  
-          f, 
-          option = "uint16"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        optionString
        Values: "uint16" or "int32".
        Default: 
-                      "uint16"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        hImage          Gray-scale (uint8 or uint16) image.
-                          
        Histogram in a 
-                      uint16 or an 
-                      int32 vector.
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Finds the histogram of the image 
-          f and returns the result in the  vector 
-          h. For binary image the vector size is 2, for gray-scale uint8 and uint16 images, the vector size is the maximum pixel value plus one. 
-          h[0] gives the number of pixels with value 0.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=uint8([0, 1, 1, 2, 2, 2, 5, 3, 5])
        
-              
        
-              
        >>> h=mmhistogram(f)
        
-              
        
-              
        >>> print h
        
-              
        [1 2 3 1 0 2]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('lenina.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> h=mmhistogram(f)
        
-              
        
-              
        >>> mmplot([[h]],[['style', 'impulses']])
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        f[[h]],[['style', 'impulses']]
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmhistogram(f, option="uint16"):
-    from Numeric import searchsorted, sort, ravel, concatenate, product
-    n = searchsorted(sort(ravel(f)), range(max(ravel(f))+1))
-    n = concatenate([n, [product(f.shape)]])
-    h = n[1:]-n[:-1]
-    return h
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmstatsFind global image statistics.
        mmblobBlob measurements from a labeled image.
        mmgrainGray-scale statistics for each labeled region.
        mmfreedomControl automatic data type conversion.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmwatershed]
-                
-                    [Up]
-                    
-                    [mmlabel]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmhmax.html b/python/plugins/sextante/pymorph/html/morph/morph/mmhmax.html
deleted file mode 100644
index ce6feee94c98..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmhmax.html
+++ /dev/null
@@ -1,229 +0,0 @@
-
-  
-    
-    mmhmax
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmvmax]
-              
-                  [Up]
-                  
-                  [mminfrec]
-              Connected Operators
        
-    
        mmhmax
-      
        
-      Remove peaks with contrast less than h.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmhmax(
-                  
-          f, 
-          h = 1, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        hDouble
        Contrast parameter.
        Default: 
-                      1
-                    
        BcStructuring Element
        Structuring element ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmhmax inf-reconstructs the gray-scale image 
-          f from the marker created by the subtraction of  the positive integer value 
-          h from 
-          f,  using  connectivity 
-          Bc. This operator removes connected peaks with contrast less than 
-          h.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example:
        
-          
        
-            
        
-              
        >>> a = uint8([
-    [4,   3,   6,  1,  3,  5,  2],
-    [2,   9,   6,  1,  6,  7,  3],
-    [8,   9,   3,  2,  4,  9,  4],
-    [3,   1,   2,  1,  2,  4,  2]])
        
-              
        
-              
        >>> print mmhmax(a,2,mmsebox())
        
-              
        [[4 3 6 1 3 5 2]
- [2 7 6 1 6 7 3]
- [7 7 3 2 4 7 4]
- [3 1 2 1 2 4 2]]
        
-            
        
-          
        
-          
        Signal example:
        
-          
        Image example:
        
-          
        
-            
        
-              
        >>> f = mmreadgray('r4x2_256.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> fb = mmhmax(f,50)
        
-              
        
-              
        >>> mmshow(fb)
        
-              
        
-              
        >>> mmshow(mmregmax(fb))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ffb
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        mmregmax(fb)
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmhmax(f, h=1, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    g = mmsubm(f,h)
-    y = mminfrec(g,f,Bc);
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmseboxCreate a box structuring element.
        mmfreedomControl automatic data type conversion.
        mmhminRemove basins with contrast less than h.
        mmareaopenArea opening
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmvmax]
-                
-                    [Up]
-                    
-                    [mminfrec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmhmin.html b/python/plugins/sextante/pymorph/html/morph/morph/mmhmin.html
deleted file mode 100644
index 052510efa50a..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmhmin.html
+++ /dev/null
@@ -1,229 +0,0 @@
-
-  
-    
-    mmhmin
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcloserec]
-              
-                  [Up]
-                  
-                  [mmvmax]
-              Connected Operators
        
-    
        mmhmin
-      
        
-      Remove basins with contrast less than h.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmhmin(
-                  
-          f, 
-          h = 1, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        hDouble
        Contrast parameter.
        Default: 
-                      1
-                    
        BcStructuring Element
        Structuring element (connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmhmin sup-reconstructs the gray-scale image 
-          f from the marker created by the addition of  the positive integer value 
-          h to 
-          f, using the connectivity 
-          Bc. This operator removes connected basins with contrast less than 
-          h. This function is very userful for simplifying the basins of the image.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example:
        
-          
        
-            
        
-              
        >>> a = uint8([
-    [10,   3,   6,  18,  16,  15,  10],
-    [10,   9,   6,  18,   6,   5,  10],
-    [10,   9,   9,  15,   4,   9,  10],
-    [10,  10,  10,  10,  10,  10,  10]])
        
-              
        
-              
        >>> print mmhmin(a,1,mmsebox())
        
-              
        [[10  4  6 18 16 15 10]
- [10  9  6 18  6  5 10]
- [10  9  9 15  5  9 10]
- [10 10 10 10 10 10 10]]
        
-            
        
-          
        
-          
        Signal example:
        
-          
        Image example:
        
-          
        
-            
        
-              
        >>> f = mmreadgray('r4x2_256.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> fb = mmhmin(f,70)
        
-              
        
-              
        >>> mmshow(fb)
        
-              
        
-              
        >>> mmshow(mmregmin(fb))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ffb
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        mmregmin(fb)
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmhmin(f, h=1, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    g = mmaddm(f,h)
-    y = mmsuprec(g,f,Bc);
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmfreedomControl automatic data type conversion.
        mmhmaxRemove peaks with contrast less than h.
        mmareacloseArea closing
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcloserec]
-                
-                    [Up]
-                    
-                    [mmvmax]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmhomothick.html b/python/plugins/sextante/pymorph/html/morph/morph/mmhomothick.html
deleted file mode 100644
index 85adadc10fbe..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmhomothick.html
+++ /dev/null
@@ -1,159 +0,0 @@
-
-  
-    
-    mmhomothick
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmendpoints]
-              
-                  [Up]
-                  
-                  [mmhomothin]
-              Intervals (hit-or-miss templates)
        
-    
        mmhomothick
-      
        
-      Interval for homotopic thickening.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Iab = 
-          mmhomothick(
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        IabInterval
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmhomothick creates an interval that is useful for the homotopic (i.e., that conserves the relation between objects and holes) thickening of binary images.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Interval visualization
        
-          
        
-            
        
-              
        >>> print mmintershow(mmhomothick())
        
-              
        1 1 1 
-. 0 . 
-0 0 0
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmhomothick():
-    Iab = mmse2hmt(mmbinary([[1,1,1],
-                             [0,0,0],
-                             [0,0,0]]),
-                   mmbinary([[0,0,0],
-                             [0,1,0],
-                             [1,1,1]]))
-    return Iab
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmendpointsInterval to detect end-points.
        mmhomothinInterval for homotopic thinning.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        mmthinImage transformation by thinning.
        mmsupcanonUnion of sup-generating or hit-miss operators.
        mmsupgenSup-generating (hit-miss).
        mmintershowVisualize an interval.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmendpoints]
-                
-                    [Up]
-                    
-                    [mmhomothin]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmhomothin.html b/python/plugins/sextante/pymorph/html/morph/morph/mmhomothin.html
deleted file mode 100644
index 78f035894657..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmhomothin.html
+++ /dev/null
@@ -1,143 +0,0 @@
-
-  
-    
-    mmhomothin
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmhomothick]
-              
-                  [Up]
-                  
-                  [mminterot]
-              Intervals (hit-or-miss templates)
        
-    
        mmhomothin
-      
        
-      Interval for homotopic thinning.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Iab = 
-          mmhomothin(
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        IabInterval
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmhomothin creates an interval that is useful for the homotopic (i.e., that conserves the relation between objects and holes) thinning of binary images.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmhomothin():
-    Iab = mmse2hmt(mmbinary([[0,0,0],
-                             [0,1,0],
-                             [1,1,1]]),
-                   mmbinary([[1,1,1],
-                             [0,0,0],
-                             [0,0,0]]))
-    return Iab
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmhomothickInterval for homotopic thickening.
        mmendpointsInterval to detect end-points.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        mmthinImage transformation by thinning.
        mmsupcanonUnion of sup-generating or hit-miss operators.
        mmsupgenSup-generating (hit-miss).
        mmintershowVisualize an interval.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmhomothick]
-                
-                    [Up]
-                    
-                    [mminterot]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmimg2se.html b/python/plugins/sextante/pymorph/html/morph/morph/mmimg2se.html
deleted file mode 100644
index 807522ae7908..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmimg2se.html
+++ /dev/null
@@ -1,281 +0,0 @@
-
-  
-    
-    mmimg2se
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmunion]
-              
-                  [Up]
-                  
-                  [mmsebox]
-              Structuring Elements
        
-    
        mmimg2se
-      
        
-      Create a structuring element from a pair of images.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        B = 
-          mmimg2se(
-                  
-          fd, 
-          FLAT = "FLAT", 
-          f = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fdImage          Binary image.
-                          
        The image is in the matrix format where the origin (0,0) is at the matrix center.
        FLATString
        'FLAT' or 'NON-FLAT'.
        Default: 
-                      "FLAT"
-                    
        fImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                                
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmimg2se creates a flat structuring element 
-          B from the binary image 
-          fd or creates a non-flat structuring element 
-          b from the binary image 
-          fd and the gray-scale image 
-          f. 
-          fd represents the domain of 
-          b and 
-          f represents the image of the points  in 
-          fd.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-                          Let us apply 
-          mmimg2se to create structuring elements. In the example below, the flat 3x3 diamond is created.
-
-          
        
-          
        
-            
        
-              
        >>> a = mmimg2se(mmbinary([
-  [0,1,0],
-  [1,1,1],
-  [0,1,0]]))
        
-              
        
-              
        >>> print mmseshow(a)
        
-              
        [[0 1 0]
- [1 1 1]
- [0 1 0]]
        
-            
        
-          
        
-          
        In this next example, the image sizes are even. Note the origin of the
-          structuring element.
-
-          
        
-          
        
-            
        
-              
        >>> b = mmbinary([
-  [0,1,1,1],
-  [1,1,1,0]])
        
-              
        
-              
        >>> b1 = mmimg2se(b)
        
-              
        
-              
        >>> print mmseshow(b1)
        
-              
        [[0 0 0 0 0]
- [0 0 1 1 1]
- [0 1 1 1 0]]
        
-            
        
-          
        In the example below,  a non-flat diamond is created.
-
-          
        
-          
        
-            
        
-              
        >>> c = mmbinary([
-  [0,1,0],
-  [1,1,1],
-  [0,1,0]])
        
-              
        
-              
        >>> d = int32([
-  [0,0,0],
-  [0,1,0],
-  [0,0,0]])
        
-              
        
-              
        >>> e = mmimg2se(c,'NON-FLAT',d)
        
-              
        
-              
        >>> print mmseshow(e)
        
-              
        [[-2147483647           0 -2147483647]
- [          0           1           0]
- [-2147483647           0 -2147483647]]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        
-            
-          
        
-          
        Non-flat structuring element:
        
-          
        
-            
-          
        H and W are the number of rows and columns of f, respectively.
-                      
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmimg2se(fd, FLAT="FLAT", f=None):
-    from string import upper
-    from Numeric import choose, ones
-    assert mmisbinary(fd),'First parameter must be binary'
-    FLAT = upper(FLAT)
-    if FLAT == 'FLAT':
-        return mmseshow(fd)
-    else:
-        B = choose(fd, (mmlimits(int32([0]))[0]*ones(fd.shape),f) )
-    B = mmseshow(int32(B),'NON-FLAT')
-    return B
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmsediskCreate a disk or a semi-sphere structuring element.
        mmselineCreate a line structuring element.
        mmseshowDisplay a structuring element as an image.
        mmdilDilate an image by a structuring element.
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmseshowDisplay a structuring element as an image.
        mmdilDilate an image by a structuring element.
        mmmat2setConverts image representation from matrix to set
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmunion]
-                
-                    [Up]
-                    
-                    [mmsebox]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mminfcanon.html b/python/plugins/sextante/pymorph/html/morph/morph/mminfcanon.html
deleted file mode 100644
index 1e8156b4eed3..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mminfcanon.html
+++ /dev/null
@@ -1,163 +0,0 @@
-
-  
-    
-    mminfcanon
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmthreshad]
-              
-                  [Up]
-                  
-                  [mminfgen]
-              Sup-generating And Inf-generating
        
-    
        mminfcanon
-      
        
-      Intersection of inf-generating operators.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mminfcanon(
-                  
-          f, 
-          Iab, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        IabInterval
        thetaDouble
        Degrees of rotation: 45, 90, or 180.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or ' ANTI-CLOCKWISE'
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mminfcanon creates the image 
-          y by computing intersections of transformations of the image 
-          f by inf-generating (i.e.,  dual of the hit-or-miss) operators. These inf-generating operators are characterized by rotations (in the clockwise or anti-clockwise direction) of 
-          theta degrees of the interval 
-          Iab.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mminfcanon(f, Iab, theta=45, DIRECTION="CLOCKWISE"):
-    from string import upper
-    DIRECTION = upper(DIRECTION)            
-    y = mmunion(f,1)
-    for t in range(0,360,theta):
-        Irot = mminterot( Iab, t, DIRECTION )
-        y = mmintersec( y, mminfgen(f, Irot))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mminfgenInf-generating.
        mmsupcanonUnion of sup-generating or hit-miss operators.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmthreshad]
-                
-                    [Up]
-                    
-                    [mminfgen]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mminfgen.html b/python/plugins/sextante/pymorph/html/morph/morph/mminfgen.html
deleted file mode 100644
index d09ff9469b77..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mminfgen.html
+++ /dev/null
@@ -1,144 +0,0 @@
-
-  
-    
-    mminfgen
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mminfcanon]
-              
-                  [Up]
-                  
-                  [mmsupcanon]
-              Sup-generating And Inf-generating
        
-    
        mminfgen
-      
        
-      Inf-generating.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mminfgen(
-                  
-          f, 
-          Iab
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        IabInterval
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mminfgen creates the image 
-          y by computing the transformation of the image 
-          f by the inf-generating operator (or dual of the hit-or-miss) characterized by the interval 
-          Iab.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mminfgen(f, Iab):
-    A,Bc = Iab
-    y = mmunion(mmdil( f, A),mmdil( mmneg(f), Bc))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsupgenSup-generating (hit-miss).
        mminfcanonIntersection of inf-generating operators.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mminfcanon]
-                
-                    [Up]
-                    
-                    [mmsupcanon]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mminfrec.html b/python/plugins/sextante/pymorph/html/morph/morph/mminfrec.html
deleted file mode 100644
index 0238de2a0799..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mminfrec.html
+++ /dev/null
@@ -1,246 +0,0 @@
-
-  
-    
-    mminfrec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmhmax]
-              
-                  [Up]
-                  
-                  [mminpos]
-              Connected Operators
        
-    
        mminfrec
-      
        
-      Inf-reconstruction.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mminfrec(
-                  
-          f, 
-          g, 
-          bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Marker image.
        gImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Conditioning image.
        bcStructuring Element
        Structuring element ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mminfrec creates the image 
-          y by an infinite number of recursive iterations (iterations until stability) of the dilation of 
-          f by 
-          bc conditioned to 
-          g. We say the 
-          y is the inf-reconstruction of 
-          g from the marker 
-          f. For algorithms and applications, see Vinc:93b.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> g=mmreadgray('text_128.tif')
        
-              
        
-              
        >>> f=mmero(g,mmseline(9,90))
        
-              
        
-              
        >>> y=mminfrec(f,g,mmsebox())
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(y)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        gfy
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> g=mmneg(mmreadgray('n2538.tif'))
        
-              
        
-              
        >>> f=mmintersec(g,0)
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> f=mmdraw(f,'LINE:40,30,60,30:END')
        
-              
        
-              
        >>> y30=mmcdil(f,g,mmsebox(),30)
        
-              
        
-              
        >>> y=mminfrec(f,g,mmsebox())
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(y30)
        
-              
        
-              
        >>> mmshow(y)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                  
-                
-              
-            
        gfy30y
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mminfrec(f, g, bc=None):
-    from Numeric import product
-    if bc is None: bc = mmsecross()
-    n = product(f.shape)
-    y = mmcdil(f,g,bc,n);
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsuprecSup-reconstruction.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmcdilDilate an image conditionally.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmhmax]
-                
-                    [Up]
-                    
-                    [mminpos]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mminpos.html b/python/plugins/sextante/pymorph/html/morph/morph/mminpos.html
deleted file mode 100644
index 304fe7db497c..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mminpos.html
+++ /dev/null
@@ -1,172 +0,0 @@
-
-  
-    
-    mminpos
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mminfrec]
-              
-                  [Up]
-                  
-                  [mmopenrec]
-              Connected Operators
        
-    
        mminpos
-      
        
-      Minima imposition.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mminpos(
-                  
-          f, 
-          g, 
-          bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                          
        Marker image.
        gImage          Gray-scale (uint8 or uint16) image.
-                          
        input image.
        bcStructuring Element
        (connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Minima imposition on 
-          g based on the marker 
-          f. 
-          mminpos creates an image 
-          y by filing the valleys of 
-          g that does not cover the connect components of 
-          f. A remarkable property of 
-          y is that its regional minima are exactly the connect components of 
-          g.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mminpos(f, g, bc=None):
-    if bc is None: bc = mmsecross()
-    assert mmisbinary(f),'First parameter must be binary image'
-    fg = mmgray(mmneg(f),mmdatatype(g))
-    k1 = mmlimits(g)[1] - 1
-    y = mmsuprec(fg, mmintersec(mmunion(g, 1), k1, fg), bc)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mminfrecInf-reconstruction.
        mmwatershedWatershed detection.
        mmcwatershedDetection of watershed from markers.
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mminfrec]
-                
-                    [Up]
-                    
-                    [mmopenrec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mminterot.html b/python/plugins/sextante/pymorph/html/morph/morph/mminterot.html
deleted file mode 100644
index 2bef0bc1cf73..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mminterot.html
+++ /dev/null
@@ -1,187 +0,0 @@
-
-  
-    
-    mminterot
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmhomothin]
-              
-                  [Up]
-                  
-                  [mmintershow]
-              Intervals (hit-or-miss templates)
        
-    
        mminterot
-      
        
-      Rotate an interval
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Irot = 
-          mminterot(
-                  
-          Iab, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        IabInterval
        thetaDouble
        Degrees of rotation. Available values are multiple of 45 degrees.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or ' ANTI-CLOCKWISE'.
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        IrotInterval
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mminterot rotates the interval 
-          Iab by an angle 
-          theta.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b1 = mmendpoints()
        
-              
        
-              
        >>> b2 = mminterot(b1)
        
-              
        
-              
        >>> print mmintershow(b1)
        
-              
        . . . 
-0 1 0 
-0 0 0
        
-              
        >>> print mmintershow(b2)
        
-              
        0 . . 
-0 1 . 
-0 0 0
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      The rotation angles allowed are multiples of 45 degrees.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mminterot(Iab, theta=45, DIRECTION="CLOCKWISE"):
-    from string import upper
-    DIRECTION = upper(DIRECTION)
-    A,Bc = Iab
-    if DIRECTION != 'CLOCKWISE':
-        theta = 360 - theta
-    Irot = mmse2hmt(mmserot(A, theta),
-                    mmserot(Bc,theta))
-    return Irot
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmintershowVisualize an interval.
        mmserotRotate a structuring element.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmhomothin]
-                
-                    [Up]
-                    
-                    [mmintershow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmintersec.html b/python/plugins/sextante/pymorph/html/morph/morph/mmintersec.html
deleted file mode 100644
index 054dd846ab26..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmintersec.html
+++ /dev/null
@@ -1,289 +0,0 @@
-
-  
-    
-    mmintersec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmaddm]
-              
-                  [Up]
-                  
-                  [mmsubm]
-              Operations
        
-    
        mmintersec
-      
        
-      Intersection of images.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmintersec(
-                  
-          f1, 
-          f2, 
-          f3 = None, 
-          f4 = None, 
-          f5 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        f2Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant.
        f3Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant.
        Default: 
-                      None
-                    
        f4Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant.
        Default: 
-                      None
-                    
        f5Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmintersec creates the image 
-          y by taking the pixelwise minimum between the images 
-          f1, f2, f3, f4, and 
-          f5. When 
-          f1, f2, f3, f4, and 
-          f5 are binary images, 
-          y is the intersection of them.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example:
        
-          
        
-            
        
-              
        >>> f=uint8([255,  255,    0,   10,    0,   255,   250])
        
-              
        
-              
        >>> g=uint8([ 0,    40,   80,   140,  250,    10,    30])
        
-              
        
-              
        >>> print mmintersec(f, g)
        
-              
        [ 0 40  0 10  0 10 30]
        
-              
        >>> print mmintersec(f, 0)
        
-              
        Warning: Converting input image from int32 to uint8.
-[0 0 0 0 0 0 0]
        
-            
        
-          
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> a = mmreadgray('form-ok.tif')
        
-              
        
-              
        >>> b = mmreadgray('form-1.tif')
        
-              
        
-              
        >>> c = mmintersec(a,b)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-              
        >>> mmshow(c)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        c
        
-          
        
-          
        Gray scale image:
        
-          
        
-            
        
-              
        >>> d = mmreadgray('tplayer1.tif')
        
-              
        
-              
        >>> e = mmreadgray('tplayer2.tif')
        
-              
        
-              
        >>> f = mmreadgray('tplayer3.tif')
        
-              
        
-              
        >>> g = mmintersec(d,e,f)
        
-              
        
-              
        >>> mmshow(d)
        
-              
        
-              
        >>> mmshow(e)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        def
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        g
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        intersection:
        
-          
        
-            
-          
        
-          
        generalized intersection:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmintersec(f1, f2, f3=None, f4=None, f5=None):
-    from Numeric import minimum
-    y = minimum(f1,f2)
-    if f3 != None: y = minimum(y,f3)
-    if f4 != None: y = minimum(y,f4)
-    if f5 != None: y = minimum(y,f5)
-    y = y.astype(f1.typecode())
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmunionUnion of images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmaddm]
-                
-                    [Up]
-                    
-                    [mmsubm]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmintershow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmintershow.html
deleted file mode 100644
index 9e80c5d2dc15..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmintershow.html
+++ /dev/null
@@ -1,159 +0,0 @@
-
-  
-    
-    mmintershow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mminterot]
-              
-                  [Up]
-                  
-                  [mmse2interval]
-              Intervals (hit-or-miss templates)
        
-    
        mmintershow
-      
        
-      Visualize an interval.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        s = 
-          mmintershow(
-                  
-          Iab
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        IabInterval
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        sString
        ( representation of the interval).
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmintershow creates a representation for an interval using 0, 1 and . ( don't care).
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> print mmintershow(mmhomothin())
        
-              
        0 0 0 
-. 1 . 
-1 1 1
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmintershow(Iab):
-    from Numeric import array, product, reshape, choose
-    from string import join
-    assert (type(Iab) is tuple) and (len(Iab) == 2),'not proper fortmat of hit-or-miss template'
-    A,Bc = Iab
-    S = mmseunion(A,Bc)
-    Z = mmintersec(S,0)
-    n = product(S.shape)
-    one  = reshape(array(n*'1','c'),S.shape)
-    zero = reshape(array(n*'0','c'),S.shape)
-    x    = reshape(array(n*'.','c'),S.shape)
-    saux = choose( S + mmseunion(Z,A), ( x, zero, one))
-    s = ''
-    for i in range(saux.shape[0]):
-        s=s+(join(list(saux[i]))+' \n')
-    return s
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmendpointsInterval to detect end-points.
        mmhomothickInterval for homotopic thickening.
        mmhomothinInterval for homotopic thinning.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mminterot]
-                
-                    [Up]
-                    
-                    [mmse2interval]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmis.html b/python/plugins/sextante/pymorph/html/morph/morph/mmis.html
deleted file mode 100644
index bd8c7f603a84..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmis.html
+++ /dev/null
@@ -1,212 +0,0 @@
-
-  
-    
-    mmis
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcmp]
-              
-                  [Up]
-                  
-                  [mmisbinary]
-              Relations
        
-    
        mmis
-      
        
-      Verify if a relationship among images is true or false.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmis(
-                  
-          f1, 
-          oper, 
-          f2 = None, 
-          oper1 = None, 
-          f3 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        operString
        relationship from: '==', '~=', '<','<=', '>', '>=', 'binary', 'gray'.
        f2Image          Gray-scale (uint8 or uint16) or binary image.
-                                
        Default: 
-                      None
-                    
        oper1String
        relationship from: '==', '~=', '<','<=', '>', '>='.
        Default: 
-                      None
-                    
        f3Image          Gray-scale (uint8 or uint16) or binary image.
-                                
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yDouble
        Bool value: 0 or 1
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Verify if the property or relatioship between images is true or false. The result is true if the relationship is true for all the pixels in the image, and false otherwise. (Obs: This function replaces 
-          mmisequal, mmislesseq, mmisbinary).
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> fbin=mmbinary([0, 1])
        
-              
        
-              
        >>> f1=uint8([1, 2, 3])
        
-              
        
-              
        >>> f2=uint8([2, 2, 3])
        
-              
        
-              
        >>> f3=uint8([2, 3, 4])
        
-              
        
-              
        >>> mmis(fbin,'binary')
        
-              
        1.0
        
-              
        >>> mmis(f1,'gray')
        
-              
        1
        
-              
        >>> mmis(f1,'==',f2)
        
-              
        0.0
        
-              
        >>> mmis(f1,'<',f3)
        
-              
        1.0
        
-              
        >>> mmis(f1,'<=',f2)
        
-              
        1.0
        
-              
        >>> mmis(f1,'<=',f2,'<=',f3)
-            
        
-              
        1.0
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmis(f1, oper, f2=None, oper1=None, f3=None):
-    from string import upper
-    if f2 == None:
-        oper=upper(oper);
-        if   oper == 'BINARY': return mmisbinary(f1)
-        elif oper == 'GRAY'  : return not mmisbinary(f1)
-        else:
-            assert 0,'oper should be BINARY or GRAY, was'+oper
-    elif oper == '==':    y = mmisequal(f1, f2)
-    elif oper == '~=':    y = not mmisequal(f1,f2)
-    elif oper == '<=':    y = mmislesseq(f1,f2)
-    elif oper == '>=':    y = mmislesseq(f2,f1)
-    elif oper == '>':     y = mmisequal(mmneg(mmthreshad(f2,f1)),mmbinary(1))
-    elif oper == '<':     y = mmisequal(mmneg(mmthreshad(f1,f2)),mmbinary(1))
-    else:
-        assert 0,'oper must be one of: ==, ~=, >, >=, <, <=, it was:'+oper
-    if oper1 != None:
-        if   oper1 == '==': y = y and mmisequal(f2,f3)
-        elif oper1 == '~=': y = y and (not mmisequal(f2,f3))
-        elif oper1 == '<=': y = y and mmislesseq(f2,f3)
-        elif oper1 == '>=': y = y and mmislesseq(f3,f2)
-        elif oper1 == '>':  y = y and mmisequal(mmneg(mmthreshad(f3,f2)),mmbinary(1))
-        elif oper1 == '<':  y = y and mmisequal(mmneg(mmthreshad(f2,f3)),mmbinary(1))
-        else:
-            assert 0,'oper1 must be one of: ==, ~=, >, >=, <, <=, it was:'+oper1
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmcmpCompare two images pixelwisely.
        mmfreedomControl automatic data type conversion.
        mmbinaryConvert a gray-scale image into a binary image
        mmgrayConvert a binary image into a gray-scale image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcmp]
-                
-                    [Up]
-                    
-                    [mmisbinary]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmisbinary.html b/python/plugins/sextante/pymorph/html/morph/morph/mmisbinary.html
deleted file mode 100644
index a461d7256c4b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmisbinary.html
+++ /dev/null
@@ -1,149 +0,0 @@
-
-  
-    
-    mmisbinary
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmis]
-              
-                  [Up]
-                  
-                  [mmisequal]
-              Relations
        
-    
        mmisbinary
-      
        
-      Check for binary image
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        bool = 
-          mmisbinary(
-                  
-          f
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fImage
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        boolBoolean
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmisbinary returns 
-          TRUE(1) if the datatype of the input image is binary. A binary image has just the values 0 and 1.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a=uint8([0, 1, 0, 1])
        
-              
        
-              
        >>> print mmisbinary(a)
        
-              
        0.0
        
-              
        >>> b=(a)
        
-              
        
-              
        >>> print mmisbinary(b)
        
-              
        0.0
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmisbinary(f):
-    bool = type(f) is type(mmbinary([1]))
-    if bool:            
-       bool = f.typecode() == '1'
-    return bool
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmbinaryConvert a gray-scale image into a binary image
        mmgrayConvert a binary image into a gray-scale image.
        mmisVerify if a relationship among images is true or false.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmis]
-                
-                    [Up]
-                    
-                    [mmisequal]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmisequal.html b/python/plugins/sextante/pymorph/html/morph/morph/mmisequal.html
deleted file mode 100644
index 992dfae7f848..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmisequal.html
+++ /dev/null
@@ -1,182 +0,0 @@
-
-  
-    
-    mmisequal
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmisbinary]
-              
-                  [Up]
-                  
-                  [mmislesseq]
-              Relations
        
-    
        mmisequal
-      
        
-      Verify if two images are equal
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        bool = 
-          mmisequal(
-                  
-          f1, 
-          f2
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        f2Image          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        boolBoolean
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmisequal compares the images 
-          f1 and 
-          f2 and returns true (1), if 
-          f1(x)=f2(x) , for all pixel 
-          x, and false (0), otherwise.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f1 = uint8(arrayrange(4))
        
-              
        
-              
        >>> print f1
        
-              
        [0 1 2 3]
        
-              
        >>> f2 = uint8([9, 5, 3, 3])
        
-              
        
-              
        >>> print f2
        
-              
        [9 5 3 3]
        
-              
        >>> f3 = f1
        
-              
        
-              
        >>> mmisequal(f1,f2)
        
-              
        0.0
        
-              
        >>> mmisequal(f1,f3)
        
-              
        1.0
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmisequal(f1, f2, MSG=None):
-    from Numeric import ravel, alltrue, array
-    bool = alltrue(ravel(f1==f2))
-    bool1 = 1
-    if type(f1) is type(array([1])):
-        bool1 = type(f1) is type(f2)
-        bool1 = bool1 and ((f1.typecode() == f2.typecode()))
-    if MSG != None:
-        if bool:
-            if bool1:
-                print 'OK: ', MSG
-            else:
-                print 'WARNING:', MSG
-        else:
-            print 'ERROR: ', MSG
-    return bool
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmisVerify if a relationship among images is true or false.
        mmcmpCompare two images pixelwisely.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmisbinary]
-                
-                    [Up]
-                    
-                    [mmislesseq]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmislesseq.html b/python/plugins/sextante/pymorph/html/morph/morph/mmislesseq.html
deleted file mode 100644
index 759e0f64e9a1..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmislesseq.html
+++ /dev/null
@@ -1,166 +0,0 @@
-
-  
-    
-    mmislesseq
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmisequal]
-              
-                  [Up]
-                  
-                  [mmneg]
-              Relations
        
-    
        mmislesseq
-      
        
-      Verify if one image is less or equal another (is beneath)
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        bool = 
-          mmislesseq(
-                  
-          f1, 
-          f2
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        f2Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        boolBoolean
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmislesseq compares the images 
-          f1 and 
-          f2 and returns true (1), if 
-          f1(x) <=  f2(x), for every pixel 
-          x, and false (0), otherwise.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f1 = uint8([0, 1, 2, 3])
        
-              
        
-              
        >>> f2 = uint8([9, 5, 3, 3])
        
-              
        
-              
        >>> print mmislesseq(f1,f2)
        
-              
        1.0
        
-              
        >>> print mmislesseq(f2,f1)
        
-              
        0.0
        
-              
        >>> print mmislesseq(f1,f1)
        
-              
        1.0
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmislesseq(f1, f2, MSG=None):
-    from Numeric import ravel
-    bool = min(ravel(f1<=f2))
-    return bool
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmcmpCompare two images pixelwisely.
        mmisVerify if a relationship among images is true or false.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmisequal]
-                
-                    [Up]
-                    
-                    [mmneg]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmlabel.html b/python/plugins/sextante/pymorph/html/morph/morph/mmlabel.html
deleted file mode 100644
index 0746f6f325e0..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmlabel.html
+++ /dev/null
@@ -1,235 +0,0 @@
-
-  
-    
-    mmlabel
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmhistogram]
-              
-                  [Up]
-                  
-                  [mmblob]
-              Measurements
        
-    
        mmlabel
-      
        
-      Label a binary image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmlabel(
-                  
-          f, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        BcStructuring Element
        ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        If number of labels is less than 65535, the data type is uint16, otherwise it is int32.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmlabel creates the image 
-          y by labeling the connect components of a binary image 
-          f, according to the connectivity defined by the structuring element 
-          Bc. The background pixels (with value 0) are not labeled. The maximum label value in the output image gives the number of its connected components.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical Example
        
-          
        
-            
        
-              
        >>> f=mmbinary([
-   [0,1,0,1,1],
-   [1,0,0,1,0]])
        
-              
        
-              
        >>> g=mmlabel(f)
        
-              
        
-              
        >>> print g
        
-              
        [[0 1 0 2 2]
- [3 0 0 2 0]]
        
-            
        
-          
        
-          
        Image Example
        
-          
        The maximum label value gives the number of connected blobs in the image.
-
-          
        
-          
        
-            
        
-              
        >>> f = mmreadgray('blob3.tif')
        
-              
        
-              
        >>> g=mmlabel(f)
        
-              
        
-              
        >>> nblobs=mmstats(g,'max')
        
-              
        
-              
        >>> print nblobs
        
-              
        18.0
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmlblshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        Where 
-          H is the number of image rows, and 
-          y1 and 
-          y2 are the row and column coordinates respectively.
-                      
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmlabel(f, Bc=None):
-    from Numeric import allclose, ravel, nonzero, array
-    if Bc is None: Bc = mmsecross()
-    assert mmisbinary,'Can only label binary image'
-    zero = mmsubm(f,f)               # zero image
-    faux=f
-    r = array(zero)
-    label = 1
-    y = mmgray( f,'uint16',0)        # zero image (output)
-    while not allclose(faux,0):
-        x=nonzero(ravel(faux))[0]      # get first unlabeled pixel
-        fmark = array(zero)
-        fmark.flat[x] = 1              # get the first unlabeled pixel
-        r = mminfrec( fmark, faux, Bc) # detects all pixels connected to it
-        faux = mmsubm( faux, r)        # remove them from faux
-        r = mmgray( r,'uint16',label)  # label them with the value label
-        y = mmunion( y, r)             # merge them with the labeled image
-        label = label + 1
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmlabelflatLabel the flat zones of gray-scale images.
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmareaopenArea opening
        mmblobBlob measurements from a labeled image.
        mmgrainGray-scale statistics for each labeled region.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmhistogram]
-                
-                    [Up]
-                    
-                    [mmblob]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmlabelflat.html b/python/plugins/sextante/pymorph/html/morph/morph/mmlabelflat.html
deleted file mode 100644
index e0de5ef8dfab..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmlabelflat.html
+++ /dev/null
@@ -1,269 +0,0 @@
-
-  
-    
-    mmlabelflat
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmgrain]
-              
-                  [Up]
-                  
-                  [mmpatspec]
-              Measurements
        
-    
        mmlabelflat
-      
        
-      Label the flat zones of gray-scale images.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmlabelflat(
-                  
-          f, 
-          Bc = None, 
-          _lambda = 0
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        BcStructuring Element
        ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        _lambdaDouble
        Connectivity given by |f(q)-f(p)|<=_lambda.
        Default: 
-                      0
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        If number of labels is less than 65535, the data type is uint16, otherwise it is int32.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmlabelflat creates the image 
-          y by labeling the flat zones of 
-          f, according to the connectivity defined by the structuring element 
-          Bc. A flat zone is a connected region of the image domain in which all the pixels have the same gray-level (
-          lambda=0). When 
-          lambda is different than zero, a quasi-flat zone is detected where two neighboring pixels belong to the same region if their difference gray-levels is smaller or equal 
-          lambda. The minimum label of the output image is 1 and the maximum is the number of flat-zones in the image.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example
        
-          
        
-            
        
-              
        >>> f=uint8([
-   [5,5,8,3,0],
-   [5,8,8,0,2]])
        
-              
        
-              
        >>> g=mmlabelflat(f)
        
-              
        
-              
        >>> print g
        
-              
        [[1 1 2 3 4]
- [1 2 2 5 6]]
        
-              
        >>> g1=mmlabelflat(f,mmsecross(),2)
        
-              
        
-              
        >>> print g1
        
-              
        [[1 1 2 3 4]
- [1 2 2 4 4]]
        
-            
        
-          
        
-          
        Gray-scale image example
        A quantized distance transform image is built to be used to compute its flat zones. Note that the background and the hole in the bottom right area are also labeled. The number of the flat zones can be determined by the maximum label value.
-
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob.tif')
        
-              
        
-              
        >>> d=mmdist(f,mmsebox(),'euclidean')
        
-              
        
-              
        >>> g= d /8
        
-              
        
-              
        >>> mmshow(g)
        
-              
        Warning: Converting input image from int32 to uint16.
        
-              
        >>> fz=mmlabelflat(g,mmsebox());
        
-              
        Warning: Converting input image from int32 to uint16.
        
-              
        >>> mmlblshow(fz)
        
-              
        
-              
        >>> print mmstats(fz,'max')
        
-              
        13.0
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        gfz
        
-          
        
-          
        Quasi-flat zones
        In this case two pixels belong to the same quasi-flat zones if they are 8-neighbors (
-          mmsebox) and  if their gray-values difference is smaller or equal 3.
-
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('pcb_gray.tif')
        
-              
        
-              
        >>> g=mmlabelflat(f,mmsebox(),3)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmlblshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmlabelflat(f, Bc=None, _lambda=0):
-    from Numeric import allclose, ravel, nonzero, array
-    if Bc is None: Bc = mmsecross()
-    zero = mmbinary(mmsubm(f,f))       # zero image
-    faux = mmneg(zero)
-    r = array(zero)
-    label = 1
-    y = mmgray( zero,'uint16',0)          # zero image (output)
-    while not allclose(faux,0):
-        x=nonzero(ravel(faux))[0]        # get first unlabeled pixel
-        fmark = array(zero)
-        fmark.flat[x] = 1                # get the first unlabeled pixel
-        f2aux = mmcmp( f, '==', ravel(f)[x])
-        r = mminfrec( fmark, f2aux, Bc)  # detects all pixels connected to it
-        faux = mmsubm( faux, r)          # remove them from faux
-        r = mmgray( r,'uint16',label)    # label them with the value label
-        y = mmunion( y, r)               # merge them with the labeled image
-        label = label + 1
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmlabelLabel a binary image.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmgrainGray-scale statistics for each labeled region.
        mmblobBlob measurements from a labeled image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmgrain]
-                
-                    [Up]
-                    
-                    [mmpatspec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmlblshow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmlblshow.html
deleted file mode 100644
index e6024dcbdf8a..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmlblshow.html
+++ /dev/null
@@ -1,184 +0,0 @@
-
-  
-    
-    mmlblshow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdtshow]
-              
-                  [Up]
-                  
-                  [mmshow]
-              Visualization
        
-    
        mmlblshow
-      
        
-      Display a labeled image assigning a random color for each label.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmlblshow(
-                  
-          f, 
-          option = 'noborder'
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                          
        Labeled image.
        optionString
        BORDER or NOBORDER: includes or not a white border around each labeled region
        Default: 
-                      'noborder'
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Optionally return RGB uint8 image
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Displays the labeled image 
-          f (uint8 or uint16) with a pseudo color where each label appears with a random color. The image is displayed in the MATLAB figure only if no output parameter is given.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob3.tif')
        
-              
        
-              
        >>> f1=mmlabel(f,mmsebox())
        
-              
        
-              
        >>> mmshow(f1)
        
-              
        
-              
        >>> mmlblshow(f1)
        
-              
        
-              
        >>> mmlblshow(f1,'border')
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        f1f1f1,'border'
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmlblshow(f, option='noborder'):
-    import string
-    import adpil
-    if (mmisbinary(f)) or (len(f.shape) != 2):
-      print 'Error, mmlblshow: works only for grayscale labeled image'
-      return
-    option = string.upper(option);
-    if option == 'NOBORDER':
-      border = 0.0;
-    elif option == 'BORDER':
-      border = 1.0;
-    else:
-      print 'Error: option must be BORDER or NOBORDER'
-    y=mmglblshow(f, border);
-    adpil.adshow(y)
-    return
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmlabelLabel a binary image.
        mmlblshowDisplay a labeled image assigning a random color for each label.
        mmshowDisplay binary or gray-scale images and optionally overlay it with binary images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdtshow]
-                
-                    [Up]
-                    
-                    [mmshow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmlimits.html b/python/plugins/sextante/pymorph/html/morph/morph/mmlimits.html
deleted file mode 100644
index b0d4cd079622..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmlimits.html
+++ /dev/null
@@ -1,142 +0,0 @@
-
-  
-    
-    mmlimits
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmconcat]
-              
-                  [Up]
-                  
-                  [mmmaxleveltype]
-              Image Information and Manipulation
        
-    
        mmlimits
-      
        
-      Get the possible minimum and maximum of an image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmlimits(
-                  
-          f
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        Vector, the first element is the infimum, the second, the supremum.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The possible minimum and the possible maximum of an image depend on its data type. These values are important to compute many morphological operators (for instance, negate of an image). The output is a vector, where the first element is the possible minimum and the second, the possible maximum.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> print mmlimits(mmbinary([0, 1, 0]))
        
-              
        [0 1]
        
-              
        >>> print mmlimits(uint8([0, 1, 2]))
        
-              
        [  0 255]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmlimits(f):
-    from Numeric import array
-    code = f.typecode()
-    if   code == '1': y=array([0,1])
-    elif code == 'b': y=array([0,255])
-    elif code == 'w': y=array([0,65535])
-    elif code == 'i': y=array([-2147483647,2147483647])
-    else:
-        assert 0,'Does not accept this typecode:'+code
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmnegNegate an image.
        mmdatatypeReturn the image datatype string
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmconcat]
-                
-                    [Up]
-                    
-                    [mmmaxleveltype]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmmat2set.html b/python/plugins/sextante/pymorph/html/morph/morph/mmmat2set.html
deleted file mode 100644
index 233e941f53f2..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmmat2set.html
+++ /dev/null
@@ -1,175 +0,0 @@
-
-  
-    
-    mmmat2set
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdatatype]
-              
-                  [Up]
-                  
-                  [mmset2mat]
-              Image Information and Manipulation
        
-    
        mmmat2set
-      
        
-      Converts image representation from matrix to set
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        CV = 
-          mmmat2set(
-                  
-          A
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        AImage
        Image in matrix format, where the origin (0,0) is at the center of the matrix.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        CVImage
        Tuple with array of pixel coordinates and array of corresponding pixel values
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Return tuple with array of pixel coordinates and array of corresponding pixel values. The input image is in the matrix format, like the structuring element, where the origin (0,0) is at the center of the matrix.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=uint8([[1,2,3],[4,5,6],[7,8,9]])
        
-              
        
-              
        >>> i,v=mmmat2set(f)
        
-              
        
-              
        >>> print i
        
-              
        [[-1 -1]
- [-1  0]
- [-1  1]
- [ 0 -1]
- [ 0  0]
- [ 0  1]
- [ 1 -1]
- [ 1  0]
- [ 1  1]]
        
-              
        >>> print v
        
-              
        [1 2 3 4 5 6 7 8 9]
        
-            
        
-          
        When image size is even, the origin is at the nearest top-left neighbor pixel of the center of the matrix
-
-          
        
-            
        
-              
        >>> f=uint8([[1,2,3,4],[5,6,7,8]])
        
-              
        
-              
        >>> i,v=mmmat2set(f)
        
-              
        
-              
        >>> print i
        
-              
        [[ 0 -1]
- [ 0  0]
- [ 0  1]
- [ 0  2]
- [ 1 -1]
- [ 1  0]
- [ 1  1]
- [ 1  2]]
        
-              
        >>> print v
        
-              
        [1 2 3 4 5 6 7 8]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmmat2set(A):
-    from Numeric import take, ravel, nonzero, transpose, NewAxis
-    if len(A.shape) == 1: A = A[NewAxis,:]
-    offsets = nonzero(ravel(A) - mmlimits(A)[0])
-    if len(offsets) == 0: return ([],[])
-    (h,w) = A.shape
-    x = range(2)
-    x[0] = offsets/w - (h-1)/2
-    x[1] = offsets%w - (w-1)/2
-    x = transpose(x)
-    CV = x,take(ravel(A),offsets)
-    return CV
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmset2matConverts image representation from set to matrix
        mmseshowDisplay a structuring element as an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdatatype]
-                
-                    [Up]
-                    
-                    [mmset2mat]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmmaxleveltype.html b/python/plugins/sextante/pymorph/html/morph/morph/mmmaxleveltype.html
deleted file mode 100644
index 1273dfa9974b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmmaxleveltype.html
+++ /dev/null
@@ -1,103 +0,0 @@
-
-  
-    
-    mmmaxleveltype
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmlimits]
-              
-                  [Up]
-                  
-                  [mmdatatype]
-              Image Information and Manipulation
        
-    
        mmmaxleveltype
-      
        
-      Returns the maximum value associated to an image datatype
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        max = 
-          mmmaxleveltype(
-                  
-          TYPE = 'uint8'
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        TYPEString
           One of the strings 'uint8', 'uint16' or 'int32', specifying the image type
-                         
-                    
        Default: 
-                      'uint8'
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        max
        the maximum level value of type TYPE
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmmaxleveltype(TYPE='uint8'):
-    max = 0
-    if   TYPE == 'uint8'  : max=255
-    elif TYPE == 'binary' : max=1
-    elif TYPE == 'uint16' : max=65535
-    elif TYPE == 'int32'  : max=2147483647
-    else:
-        assert 0, 'does not support this data type:'+TYPE
-    return max
-    
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmlimits]
-                
-                    [Up]
-                    
-                    [mmdatatype]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmneg.html b/python/plugins/sextante/pymorph/html/morph/morph/mmneg.html
deleted file mode 100644
index 6569dbbcd604..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmneg.html
+++ /dev/null
@@ -1,213 +0,0 @@
-
-  
-    
-    mmneg
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmislesseq]
-              
-                  [Up]
-                  
-                  [mmtoggle]
-              Operations
        
-    
        mmneg
-      
        
-      Negate an image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmneg(
-                  
-          f
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmneg returns an image 
-          y that is the negation (i.e., inverse or involution) of the image 
-          f. In the binary case, 
-          y is the complement of 
-          f.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=uint8([255, 255, 0, 10, 20, 10, 0, 255, 255])
        
-              
        
-              
        >>> print mmneg(f)
        
-              
        [  0   0 255 245 235 245 255   0   0]
        
-              
        >>> print mmneg(uint8([0, 1]))
        
-              
        [255 254]
        
-              
        >>> print mmneg(int32([0, 1]))
        
-              
        [ 0 -1]
        
-            
        
-          
        
-          
        Binary image:
        
-          
        
-            
        
-              
        >>> a = mmreadgray('gear.tif')
        
-              
        
-              
        >>> b = mmneg(a)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-          
        Gray-scale image:
        
-          
        
-            
        
-              
        >>> c = mmreadgray('astablet.tif')
        
-              
        
-              
        >>> d = mmneg(c)
        
-              
        
-              
        >>> mmshow(c)
        
-              
        
-              
        >>> mmshow(d)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        cd
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmneg(f):
-    y = mmlimits(f)[0] + mmlimits(f)[1] - f
-    y = y.astype(f.typecode())
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsubmSubtraction of two images, with saturation.
        mmlimitsGet the possible minimum and maximum of an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmislesseq]
-                
-                    [Up]
-                    
-                    [mmtoggle]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmopen.html b/python/plugins/sextante/pymorph/html/morph/morph/mmopen.html
deleted file mode 100644
index 68b92071e12a..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmopen.html
+++ /dev/null
@@ -1,284 +0,0 @@
-
-  
-    
-    mmopen
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmclose]
-              
-                  [Up]
-                  
-                  [mmdist]
-              Morphological Filters
        
-    
        mmopen
-      
        
-      Morphological opening.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmopen(
-                  
-          f, 
-          b = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmopen creates the image 
-          y by the morphological opening of the image 
-          f by the structuring element 
-          b. In the binary case, the opening by the structuring element 
-          B  may be interpreted as the union of translations of 
-          B included in 
-          f. In the gray-scale case, there is a similar interpretation taking the functions umbra.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmbinary(mmreadgray('blob.tif'))
        
-              
        
-              
        >>> bimg=mmbinary(mmreadgray('blob1.tif'))
        
-              
        
-              
        >>> b=mmimg2se(bimg)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> mmshow(mmopen(f,b))
        
-              
        
-              
        >>> mmshow(mmopen(f,b),mmgradm(f))
-        
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fmmopen(f,b)
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        mmopen(f,b),mmgradm(f)
        
-          
        
-          
        
-            
        
-              
        >>> a=mmbinary(mmreadgray('pcb1bin.tif'))
        
-              
        
-              
        >>> b=mmopen(a,mmsebox(2))
        
-              
        
-              
        >>> c=mmopen(a,mmsebox(4))
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-              
        >>> mmshow(c)
-        
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        c
        
-          
        
-          
        
-            
        
-              
        >>> a=mmreadgray('astablet.tif')
        
-              
        
-              
        >>> b=mmopen(a,mmsedisk(18))
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
-        
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmopen(f, b=None):
-    if b is None: b = mmsecross()
-    y = mmdil(mmero(f,b),b)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmcloseMorphological closing.
        mmfreedomControl automatic data type conversion.
        mmimg2seCreate a structuring element from a pair of images.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmareaopenArea opening
        mmsesumN-1 iterative Minkowski  additions
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmclose]
-                
-                    [Up]
-                    
-                    [mmdist]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmopenrec.html b/python/plugins/sextante/pymorph/html/morph/morph/mmopenrec.html
deleted file mode 100644
index 02564080c4c1..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmopenrec.html
+++ /dev/null
@@ -1,168 +0,0 @@
-
-  
-    
-    mmopenrec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mminpos]
-              
-                  [Up]
-                  
-                  [mmregmax]
-              Connected Operators
        
-    
        mmopenrec
-      
        
-      Opening by reconstruction.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmopenrec(
-                  
-          f, 
-          bero = None, 
-          bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        beroStructuring Element
        (erosion).
        Default: 
-                      None (3x3 elementary cross)
-                    
        bcStructuring Element
        (connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        (same type of 
-                      f).
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmopenrec creates the image 
-          y by an inf-reconstruction of the image 
-          f from its erosion by 
-          bero, using the connectivity defined by 
-          Bc.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-          
        Binary image:
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmopenrec(f, bero=None, bc=None):
-    if bero is None: bero = mmsecross()
-    if bc is None: bc = mmsecross()
-    y = mminfrec(mmero(f,bero),f,bc)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmcloserecClosing by reconstruction.
        mmopenMorphological opening.
        mminfrecInf-reconstruction.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mminpos]
-                
-                    [Up]
-                    
-                    [mmregmax]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmopenrecth.html b/python/plugins/sextante/pymorph/html/morph/morph/mmopenrecth.html
deleted file mode 100644
index b008ef540fd8..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmopenrecth.html
+++ /dev/null
@@ -1,166 +0,0 @@
-
-  
-    
-    mmopenrecth
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmgradm]
-              
-                  [Up]
-                  
-                  [mmopenth]
-              Residues
        
-    
        mmopenrecth
-      
        
-      Open-by-Reconstruction Top-Hat.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmopenrecth(
-                  
-          f, 
-          bero = None, 
-          bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        beroStructuring Element
        (erosion)
        Default: 
-                      None (3x3 elementary cross)
-                    
        bcStructuring Element
        ( connectivity)
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        (same type of 
-                      f).
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmopenrecth creates the image 
-          y by subtracting the open by reconstruction of 
-          f, defined by the structuring elements 
-          bero e 
-          bc, of 
-          f itself.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmopenrecth(f, bero=None, bc=None):
-    if bero is None: bero = mmsecross()
-    if bc is None: bc = mmsecross()
-    y = mmsubm(f, mmopenrec( f, bero, bc))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmopenthOpening Top Hat.
        mmcloserecthClose-by-Reconstruction Top-Hat.
        mminfrecInf-reconstruction.
        mmopenMorphological opening.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmgradm]
-                
-                    [Up]
-                    
-                    [mmopenth]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmopenth.html b/python/plugins/sextante/pymorph/html/morph/morph/mmopenth.html
deleted file mode 100644
index 6e1036d12dfb..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmopenth.html
+++ /dev/null
@@ -1,190 +0,0 @@
-
-  
-    
-    mmopenth
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmopenrecth]
-              
-                  [Up]
-                  
-                  [mmskelm]
-              Residues
        
-    
        mmopenth
-      
        
-      Opening Top Hat.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmopenth(
-                  
-          f, 
-          b = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        bStructuring Element
        structuring element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        (same type of 
-                      f).
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmopenth creates the image 
-          y by subtracting the morphological opening of 
-          f by the structuring element 
-          b of 
-          f itself.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = mmreadgray('keyb.tif')
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> b = mmopenth(a,mmsebox(3))
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmopenth(f, b=None):
-    if b is None: b = mmsecross()
-    y = mmsubm(f, mmopen(f,b))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmclosethClosing Top Hat.
        mmopenrecthOpen-by-Reconstruction Top-Hat.
        mmgradmMorphological gradient.
        mmopenMorphological opening.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmopenrecth]
-                
-                    [Up]
-                    
-                    [mmskelm]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmopentransf.html b/python/plugins/sextante/pymorph/html/morph/morph/mmopentransf.html
deleted file mode 100644
index fc94590aacc4..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmopentransf.html
+++ /dev/null
@@ -1,353 +0,0 @@
-
-  
-    
-    mmopentransf
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmgdist]
-              
-                  [Up]
-                  
-                  [mmclohole]
-              Image Transforms
        
-    
        mmopentransf
-      
        
-      Open transform.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmopentransf(
-                  
-          f, 
-          type = 'OCTAGON', 
-          n = 65535, 
-          Bc = None, 
-          Buser = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        typeString
        Disk family: 'OCTAGON', 'CHESSBOARD', 'CITY-BLOCK', 'LINEAR-V', 'LINEAR-H', 'LINEAR-45R', 'LINEAR-45L', 'USER'.
        Default: 
-                      'OCTAGON'
-                    
        nDouble
        Maximum disk radii.
        Default: 
-                      65535
-                    
        BcStructuring Element
        Connectivity for the reconstructive opening. Used if '-REC' suffix is appended in the 'type' string.
        Default: 
-                      None (3x3 elementary cross)
-                    
        BuserStructuring Element
        User disk, used if 'type' is 'USER'.
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Compute the open transform of a binary image. The value of the pixels in the open transform gives the largest radii of the disk plus 1, where the open by it is not empty at that pixel. The disk sequence must satisfy the following: if r > s, rB is sB-open, i.e. rB open by sB is equal rB. Note that the Euclidean disk does not satisfy this property in the discrete grid. This function also computes the reconstructive open transform by adding the suffix '-REC' in the 'type' parameter.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f = mmbinary([
-              [0,0,0,0,0,0,0,0],
-              [0,0,1,1,1,1,0,0],
-              [0,0,1,1,1,1,1,0],
-              [0,1,0,1,1,1,0,0],
-              [1,1,0,0,0,0,0,0]])
        
-              
        
-              
        >>> print mmopentransf( f, 'city-block')
        
-              
        processing r= 0
-processing r= 1
-processing r= 2
-[[0 0 0 0 0 0 0 0]
- [0 0 1 2 2 2 0 0]
- [0 0 2 2 2 2 2 0]
- [0 1 0 2 2 2 0 0]
- [1 1 0 0 0 0 0 0]]
        
-              
        >>> print mmopentransf( f, 'linear-h')
        
-              
        processing r= 0
-processing r= 1
-processing r= 2
-processing r= 3
-[[0 0 0 0 0 0 0 0]
- [0 0 2 2 2 2 0 0]
- [0 0 3 3 3 3 3 0]
- [0 1 0 2 2 2 0 0]
- [2 2 0 0 0 0 0 0]]
        
-              
        >>> print mmopentransf( f, 'linear-45r')
        
-              
        processing r= 0
-processing r= 1
-processing r= 2
-processing r= 3
-processing r= 4
-[[0 0 0 0 0 0 0 0]
- [0 0 1 4 1 2 0 0]
- [0 0 4 1 2 1 1 0]
- [0 4 0 2 1 1 0 0]
- [4 1 0 0 0 0 0 0]]
        
-              
        >>> print mmopentransf( f, 'user',10,mmsecross(),mmbinary([0,1,1]))
        
-              
        processing r= 0
-processing r= 1
-processing r= 2
-processing r= 3
-processing r= 4
-[[0 0 0 0 0 0 0 0]
- [0 0 4 4 4 4 0 0]
- [0 0 5 5 5 5 5 0]
- [0 1 0 3 3 3 0 0]
- [2 2 0 0 0 0 0 0]]
        
-              
        >>> print mmopentransf( f, 'city-block-rec')
        
-              
        processing r= 0
-processing r= 1
-processing r= 2
-[[0 0 0 0 0 0 0 0]
- [0 0 2 2 2 2 0 0]
- [0 0 2 2 2 2 2 0]
- [0 1 0 2 2 2 0 0]
- [1 1 0 0 0 0 0 0]]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('numbers.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> g=mmopentransf(f,'OCTAGON')
        
-              
        processing r= 0
-processing r= 1
-processing r= 2
-processing r= 3
-processing r= 4
        
-              
        >>> mmshow(g)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        fg
        
-          
        
-          
        
-          
        The open transform stores all the openings by the disk with radii r
        
-          
        
-            
        
-              
        >>> b=mmsedisk(3,'2D','OCTAGON')
        
-              
        
-              
        >>> g1=mmopen(f,b)
        
-              
        
-              
        >>> mmshow(g1)
        
-              
        
-              
        >>> g2=mmcmp(g,'>',3)
        
-              
        
-              
        >>> print mmis(g1,'==',g2)
        
-              
        1.0
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        g1
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Sequence of convex structuring elements of increasing size
        
-          
        
-            
-          
        
-          
        Algorithm implemented
        
-          
        
-            
-          
        
-          
        
-          
        Interpretation
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      As this function may take a long time to execute, there is a printout notifying the status of the execution. The radii of the disk is informed for each open executed. Due to the behavior of the structuring element in the frame of the image, one may want to insert a zero border around the image.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmopentransf(f, type='OCTAGON', n=65535, Bc=None, Buser=None):
-    from Numeric import zeros
-    from string import find, upper
-    if Bc is None: Bc = mmsecross()
-    if Buser is None: Buser = mmsecross()
-    assert mmisbinary(f),'Error: input image is not binary'
-    type = upper(type)
-    rec_flag = find(type,'-REC')
-    if rec_flag != -1:
-        type = type[:rec_flag] # remove the -rec suffix
-    flag = not ((type == 'OCTAGON')  or
-                (type == 'CHESSBOARD') or
-                (type == 'CITY-BLOCK'))
-    if not flag:
-        n  = min(n,min(f.shape))
-    elif  type == 'LINEAR-H':
-        se = mmbinary([1, 1, 1])
-        n  = min(n,f.shape[1])
-    elif  type =='LINEAR-V':
-        se = mmbinary([[1],[1],[1]])
-        n  = min(n,f.shape[0])
-    elif  type == 'LINEAR-45R':
-        se = mmbinary([[0, 0, 1],[0, 1, 0],[1, 0, 0]])
-        n  = min(n,min(f.shape))
-    elif  type == 'LINEAR-45L':
-        se = mmbinary([[1, 0, 0],[0, 1, 0],[0, 0, 1]])
-        n  = min(n,min(f.shape))
-    elif  type == 'USER':
-        se = Buser
-        n  = min(n,min(f.shape))
-    else:
-        print 'Error: only accepts OCTAGON, CHESSBOARD, CITY-BLOCK, LINEAR-H, LINEAR-V, LINEAR-45R, LINEAR-45L, or USER as type, or with suffix -REC.'
-        return []
-    k = 0
-    y = uint16(zeros(f.shape))
-    a = mmbinary([1])
-    z = mmbinary([0])
-    while not (mmisequal(a,z) or (k>=n)):
-        print 'processing r=',k
-        if flag:
-            a = mmopen(f,mmsesum(se,k))
-        else:
-            a = mmopen(f,mmsedisk(k,'2D',type))
-        y = mmaddm(y, mmgray(a,'uint16',1))
-        k = k+1
-    if rec_flag != -1:
-        y = mmgrain(mmlabel(f,Bc),y,'max')
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmopenMorphological opening.
        mmsediskCreate a disk or a semi-sphere structuring element.
        mmpatspecPattern spectrum (also known as granulometric size density).
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmgdist]
-                
-                    [Up]
-                    
-                    [mmclohole]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmpad4n.html b/python/plugins/sextante/pymorph/html/morph/morph/mmpad4n.html
deleted file mode 100644
index 9ebc3acd212e..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmpad4n.html
+++ /dev/null
@@ -1,114 +0,0 @@
-
-  
-    
-    mmpad4n
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmadd4dil]
-              
-                  [Up]
-                  Python functions
        
-    
        mmpad4n
-      
        
-      mmpad4n
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmpad4n(
-                  
-          f, 
-          Bc, 
-          value, 
-          scale = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage
        BcStructuring Element
        ( connectivity).
        valueint.
        scaleint.
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        y
        The converted image
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmpad4n(f, Bc, value, scale=1):
-    from Numeric import ones, array
-    if type(Bc) is not array:
-      Bc = mmseshow(Bc)            
-    Bh, Bw = Bc.shape
-    assert Bh%2 and Bw%2, 'structuring element must be odd sized'
-    ch, cw = scale * Bh/2, scale * Bw/2
-    g = value * ones( f.shape + scale * (array(Bc.shape) - 1))
-    g[ ch: -ch, cw: -cw] = f
-    y = g.astype( f.typecode())
-    return y
-    
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmadd4dil]
-                
-                    [Up]
-                    Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmpatspec.html b/python/plugins/sextante/pymorph/html/morph/morph/mmpatspec.html
deleted file mode 100644
index bc7a96fc8828..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmpatspec.html
+++ /dev/null
@@ -1,170 +0,0 @@
-
-  
-    
-    mmpatspec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmlabelflat]
-              
-                  [Up]
-                  
-                  [mmstats]
-              Measurements
        
-    
        mmpatspec
-      
        
-      Pattern spectrum (also known as granulometric size density).
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        h = 
-          mmpatspec(
-                  
-          f, 
-          type = 'OCTAGON', 
-          n = 65535, 
-          Bc = None, 
-          Buser = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        typeString
        Disk family: 'OCTAGON', 'CHESSBOARD', 'CITY-BLOCK', 'LINEAR-V', 'LINEAR-H', 'LINEAR-45R', 'LINEAR-45L', 'USER'.
        Default: 
-                      'OCTAGON'
-                    
        nDouble
        Maximum disk radii.
        Default: 
-                      65535
-                    
        BcStructuring Element
        Connectivity for the reconstructive granulometry. Used if '-REC' suffix is appended in the 'type' string.
        Default: 
-                      None (3x3 elementary cross)
-                    
        BuserStructuring Element
        User disk, used if 'type' is 'USER'.
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        hImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        a 
-                      uint16 vector.
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Compute the Pattern Spectrum of a binary image. See Mara:89b. The pattern spectrum is the histogram of the open transform, not taking the zero values.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmpatspec(f, type='OCTAGON', n=65535, Bc=None, Buser=None):
-    if Bc is None: Bc = mmsecross()
-    if Buser is None: Buser = mmsecross()
-    assert mmisbinary(f),'Error: input image is not binary'
-    g=mmopentransf(f,type,n,Bc,Buser)
-    h=mmhistogram(g)
-    h=h[1:]
-    return h
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmopenMorphological opening.
        mmopentransfOpen transform.
        mmsediskCreate a disk or a semi-sphere structuring element.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmlabelflat]
-                
-                    [Up]
-                    
-                    [mmstats]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmplot.html b/python/plugins/sextante/pymorph/html/morph/morph/mmplot.html
deleted file mode 100644
index b62e1ecc4137..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmplot.html
+++ /dev/null
@@ -1,457 +0,0 @@
-
-  
-    
-    mmplot
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmbshow]
-              
-                  [Up]
-                  
-                  [mmvdome]
-              Visualization
        
-    
        mmplot
-      
        
-      Plot a function.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        fig = 
-          mmplot(
-                  
-          plotitems = [], 
-          options = [], 
-          outfig = -1, 
-          filename = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        plotitems
        List of plotitems.
        Default: 
-                      []
-                    
        options
        List of options.
        Default: 
-                      []
-                    
        outfig
        Integer. Figure number. 0 creates a new figure.
        Default: 
-                      -1
-                    
        filename
        String. Name of the PNG output file.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fig
        Figure number.
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmplot
-           plots a 2D function 
-          y=f(x)
-           with the help of the Gnuplot package.
-              
-          mmplot
-           may take four arguments.
-
-        
        
-        
          
-          
        • 
-            plotitems
-             argument is a list of plotitems: 
-            [plotitem_1, plotitem_2, ...]
-            , where each
-                    plotitem is a list containing the 
-            x
-             axis, the 
-            y
-             axis, the plot 
-            style
-                    (Gnuplot styles) and the function 
-            title
-            . A plotitem looks like 
-            "[x, y, style, title]"
-            ,
-                    where 
-            x
-             and 
-            y
-             are Numeric arrays, 
-            style
-             and 
-            title
-             are strings.
-                    Parameters 
-            y
-            , 
-            style
-             and 
-            title
-             are optionals. If 
-            y
-             is not specified,
-                    
-            "Numeric.range(x) vs. x"
-             will be plotted. If 
-            style
-             is not defined or is 
-            None
-            ,
-                    
-            mmplot
-             uses the global style, if it has been defined in 
-            options
-            , or 'lines' style, when there
-                    is no global style. 
-            plotitems
-             argument finally looks like
-                    
-            "[[x1, y1, 'a style', 'a title'], [x2], [x3, y3], [x4, y4, None, 'a title']"
-            .
-                
-          
          • 
-          
        • 
-            options
-             argument is a list of option tuples: 
-            [[option1, value1], [option2, value2], ...]
-                    Available options are:
-                    
-            
            
-              
          • 
-                'grid'
-                , adds a grid.
-              
            • 
-              
          • 
-                'title'
-                , adds a global title to the graph.
-              
            • 
-              
          • 
-                'xlabel'
-                , adds a label for X axis.
-              
            • 
-              
          • 
-                'ylabel'
-                , adds a label for Y axis.
-              
            • 
-              
          • 
-                'style'
-                , selects a global plot style. Accepts any Gnuplot style requiring no additional information. Gnuplot styles are: `lines`, `points`, `linespoints`, `impulses`, `dots`, `steps`, `fsteps`,
-                                `histeps`, `errorbars`, `xerrorbars`, `yerrorbars`, `xyerrorbars`, `errorlines`,
-                                `xerrorlines`, `yerrorlines`, `xyerrorlines`, `boxes`, `boxerrorbars`,
-                                `boxxyerrorbars`, `financebars`, `candlesticks` or `vector`. See Gnuplot help
-                                for these styles.
-              
            • 
-              
          • 
-                'replot'
-                , treat plotitems as additional plotitems to be plotted alongside the existing graph.
-                                      If replot is not specified, the graph will be cleared before the plot.
-              
            • 
-            
          
-          
          • 
-          
        • 
-            outfig
-             argument is the figure number to be plot. A list of figures is kept in global variable
-                    
-            __figs__
-             which is not supposed to be modified by the user. 
-            __figs__[0]
-             stores the
-                    number of the current figure (last figure accessed by 
-            mmplot
-            ). Each 
-            __figs__[i]
-             is a Gnuplot
-                    pointer for figure 
-            i
-            , 
-            i>0
-            . If figure 
-            outfig
-             already exists, data will be
-                    plotted in figure 
-            outfig
-             and 
-            outfig
-             is returned. If figure 
-            outfig
-             does not
-                    exist, nothing is done and 
-            0
-             is returned. If 
-            outfig == 0
-            , data will be plotted in a
-                    new figure and the new figure number is returned. If 
-            outfig
-             is not specified, data will be
-                    plotted in the current figure, if it already exists, or in a new figure, otherwise. The new figure
-                    number is then returned.
-                
-          
          • 
-          
        • 
-            filename
-             argument is the name of the PNG output file.
-                
-          
          • 
-        
        
-        
            There are also two special uses of 
-          mmplot
-          . When 
-          mmplot
-           is called with no args, the current figure is
-              replotted and its number is returned. If there is no current figure, nothing is done and 0 is returned.
-              
-          mmplot
-          ('reset') clears the figures table.
-
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> import Numeric
        
-              
        
-              
        >>> #
        
-              
        >>> x = Numeric.arange(0, 2*Numeric.pi, 0.1)
        
-              
        
-              
        >>> mmplot([[x]])
        
-              
        >>> y1 = Numeric.sin(x)
        
-              
        
-              
        >>> y2 = Numeric.cos(x)
        
-              
        
-              
        >>> opts = [['title', 'Example Plot'],\
-        ['grid'],\
-        ['style', 'linespoints'],\
-        ['xlabel', '"X values"'],\
-        ['ylabel', '"Y Values"']]
        
-              
        
-              
        >>> y1_plt = [x, y1, None,    'sin(X)']
        
-              
        
-              
        >>> y2_plt = [x, y2, 'lines', 'cos(X)']
        
-              
        
-              
        >>> #
        
-              
        >>> # plotting two graphs using one step
        
-              
        >>> fig1 = mmplot([y1_plt, y2_plt], opts, 0)
        
-              
        >>> #
        
-              
        >>> # plotting the same graphs using two steps
        
-              
        >>> fig2 = mmplot([y1_plt], opts, 0)
        
-              
        >>> fig2 = mmplot([y2_plt], opts, fig2)
        
-              
        >>> #
        
-              
        >>> # first function has been lost, lets recover it
        
-              
        >>> opts.append(['replot'])
        
-              
        
-              
        >>> fig2 = mmplot([y1_plt], opts, fig2)
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        [[x]][y1_plt, y2_plt], opts, 0
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        [y1_plt], opts, 0[y2_plt], opts, fig2
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        [y1_plt], opts, fig2
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmplot(plotitems=[], options=[], outfig=-1, filename=None):
-    import Gnuplot
-    import Numeric
-    newfig = 0
-    if (plotitems == 'reset'):
-        __figs__[0] = None
-        __figs__[1:] = []
-        return 0
-    if len(plotitems) == 0:
-        # no plotitems specified: replot current figure
-        if __figs__[0]:
-            outfig = __figs__[0]
-            g = __figs__[outfig]
-            g.replot()
-            return outfig
-        else:
-            #assert 0, "mmplot error: There is no current figure\n"
-            print "mmplot error: There is no current figure\n"
-            return 0
-    # figure to be plotted
-    if ((outfig < 0) and __figs__[0]):
-        # current figure
-        outfig = __figs__[0]
-    elif ( (outfig == 0) or ( (outfig == -1) and not __figs__[0] )  ):
-        # new figure
-        newfig = 1
-        outfig = len(__figs__)
-    elif outfig >= len(__figs__):
-        #assert 0, 'mmplot error: Figure ' + str(outfig) + 'does not exist\n'
-        print 'mmplot error: Figure ' + str(outfig) + 'does not exist\n'
-        return 0
-    #current figure
-    __figs__[0] = outfig
-    # Gnuplot pointer
-    if newfig:
-        if len(__figs__) > 20:
-            print '''mmplot error: could not create figure. Too many PlotItems in memory (20). Use
-                     mmplot('reset') to clear table'''
-            return 0
-        g = Gnuplot.Gnuplot()
-        __figs__.append(g)
-    else:
-        g = __figs__[outfig]
-    # options
-    try:
-        options.remove(['replot'])
-    except:
-        g.reset()
-    try:
-        #default style
-        g('set data style lines')
-        for option in options:
-            if option[0] == 'grid':
-                g('set grid')
-            elif option[0] == 'title':
-                g('set title "' + option[1] + '"')
-            elif option[0] == 'xlabel':
-                g('set xlabel ' + option[1])
-            elif option[0] == 'ylabel':
-                g('set ylabel ' + option[1])
-            elif option[0] == 'style':
-                g('set data style ' + option[1])
-            else:
-                print "mmplot warning: Unknown option: " + option[0]
-    except:
-        print "mmplot warning: Bad usage in options! Using default values. Please, use help.\n"
-    # Plot items: item[0]=x, item[1]=y, item[2]=style
-    for item in plotitems:
-        try:
-            title = None
-            style = None
-            x = Numeric.ravel(item[0])
-            if len(item) > 1:
-                # y axis specified
-                y = Numeric.ravel(item[1])
-                if len(item) > 2:
-                    # style specified
-                    style = item[2]
-                    if len(item) > 3:
-                        title = item[3]
-            else:
-                # no y axis specified
-                y = x
-                x = Numeric.arange(len(y))
-            g.replot(Gnuplot.Data(x, y, title=title, with=style))
-        except:
-            g.reset()
-            if newfig:
-                __figs__.pop()
-            #assert 0, "mmplot error: Bad usage in plotitems! Impossible to plot graph. Please, use help.\n"
-            print "mmplot error: Bad usage in plotitems! Impossible to plot graph. Please, use help.\n"
-            return 0
-    # PNG file
-    if filename:
-        g.hardcopy(filename, terminal='png', color=1)
-    fig = outfig
-    return fig
-    
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmbshow]
-                
-                    [Up]
-                    
-                    [mmvdome]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmreadgray.html b/python/plugins/sextante/pymorph/html/morph/morph/mmreadgray.html
deleted file mode 100644
index dfd95e74952f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmreadgray.html
+++ /dev/null
@@ -1,155 +0,0 @@
-
-  
-    
-    mmreadgray
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmset2mat]
-              
-                  [Up]
-                  
-                  [mmcmp]
-              Image file I/O
        
-    
        mmreadgray
-      
        
-      Read an image from a commercial file format and stores it as a gray-scale image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmreadgray(
-                  
-          filename
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        filenameString
        Name of file to read.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmreadgray reads the image in 
-          filename and stores it in 
-          y,  an uint8 gray-scale image (without colormap). If the input file is a color RGB image, it is converted to gray-scale using the equation: y = 0.2989 R + 0.587 G + 0.114 B. This functions uses de PIL module.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a=mmreadgray('cookies.tif')
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        a
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmreadgray(filename):
-    import adpil
-    import Numeric
-    y = adpil.adread(filename)
-    if (len(y.shape) == 3) and (y.shape[0] == 3):
-       if Numeric.alltrue(Numeric.alltrue(y[0,:,:] == y[1,:,:] and
-                                          y[0,:,:] == y[2,:,:])):
-          y = y[0,:,:]
-       else:
-          print 'Warning: converting true-color RGB image to gray'
-          y = mmubyte(0.2989 * y[0,:,:] + 
-                      0.5870 * y[1,:,:] + 
-                      0.1140 * y[2,:,:])
-    elif (len(y.shape) == 2):
-       pass
-    else:
-       raise ValueError, 'Error, it is not 2D image'
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-        
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmset2mat]
-                
-                    [Up]
-                    
-                    [mmcmp]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmregmax.html b/python/plugins/sextante/pymorph/html/morph/morph/mmregmax.html
deleted file mode 100644
index 870ad3957c47..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmregmax.html
+++ /dev/null
@@ -1,150 +0,0 @@
-
-  
-    
-    mmregmax
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmopenrec]
-              
-                  [Up]
-                  
-                  [mmregmin]
-              Connected Operators
        
-    
        mmregmax
-      
        
-      Regional Maximum.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmregmax(
-                  
-          f, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        BcStructuring Element
        (connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmregmax creates a binary image 
-          y by computing the regional maxima of 
-          f, according to the connectivity defined by the structuring element 
-          Bc. A regional maximum is a flat zone not surrounded by flat zones of higher gray values.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmregmax(f, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    y = mmregmin(mmneg(f),Bc)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmregminRegional Minimum (with generalized dynamics).
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmopenrec]
-                
-                    [Up]
-                    
-                    [mmregmin]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmregmin.html b/python/plugins/sextante/pymorph/html/morph/morph/mmregmin.html
deleted file mode 100644
index 6e3a7d05b655..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmregmin.html
+++ /dev/null
@@ -1,297 +0,0 @@
-
-  
-    
-    mmregmin
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmregmax]
-              
-                  [Up]
-                  
-                  [mmsuprec]
-              Connected Operators
        
-    
        mmregmin
-      
        
-      Regional Minimum (with generalized dynamics).
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmregmin(
-                  
-          f, 
-          Bc = None, 
-          option = "binary"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        BcStructuring Element
        (connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        optionString
        Choose one of: BINARY: output a binary image; VALUE: output a grayscale image with points at the regional minimum with the pixel values of the input image; DYNAMICS: output a grayscale image with points at the regional minimum with its dynamics; AREA-DYN: int32 image with the area-dynamics; VOLUME-DYN: int32 image with the volume-dynamics.
        Default: 
-                      "binary"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmregmin creates a binary image 
-          f by computing the regional minima of 
-          f, according to the connectivity defined by the structuring element 
-          Bc. A regional minimum is a flat zone not surrounded by flat zones of lower gray values. A flat zone is a maximal connected component of a gray-scale image with same pixel values. There are three output options: binary image; valued image; and generalized dynamics. The dynamics of a regional minima is the minimum height a pixel has to climb in a walk to reach another regional minima with a higher dynamics. The area-dyn is the minimum area a catchment basin has to raise to reach another regional minima with higher area-dynamics. The volume-dyn is the minimum volume a catchment basin has to raise to reach another regional minima with a higher volume dynamics.
-
-          
        The dynamics concept was first introduced in Grimaud:92 and it is the basic notion for the hierarchical or multiscale watershed transform.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example:
        
-          
        
-            
        
-              
        >>> a = uint8([
-    [10,  10,  10,  10,  10,  10,  10],
-    [10,   9,   6,  18,   6,   5,  10],
-    [10,   9,   6,  18,   6,   5,  10],
-    [10,   9,   9,  15,   4,   9,  10],
-    [10,   9,   9,  15,  12,  10,  10],
-    [10,  10,  10,  10,  10,  10,  10]])
        
-              
        
-              
        >>> print mmregmin(a)
        
-              
        [[0 0 0 0 0 0 0]
- [0 0 1 0 0 1 0]
- [0 0 1 0 0 1 0]
- [0 0 0 0 1 0 0]
- [0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0]]
        
-              
        >>> print mmregmin(a,mmsecross(),'value')
        
-              
        [[0 0 0 0 0 0 0]
- [0 0 6 0 0 5 0]
- [0 0 6 0 0 5 0]
- [0 0 0 0 4 0 0]
- [0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0]]
        
-              
        >>> print mmregmin(a,mmsecross(),'dynamics')
        
-              
        [[ 0  0  0  0  0  0  0]
- [ 0  0  4  0  0  1  0]
- [ 0  0  4  0  0  1  0]
- [ 0  0  0  0 14  0  0]
- [ 0  0  0  0  0  0  0]
- [ 0  0  0  0  0  0  0]]
        
-            
        
-          
        
-          
        Image example, filtering the regional minima:
        
-          
        Typically, the regional minima is very numerous in a real image. To filter the regional minima, one can use the 
-          mmhmin, 
-          mmclose, 
-          mmareaclose, or other functions that simplifies basins.
-
-          
        
-          
        
-            
        
-              
        >>> f1=mmreadgray('bloodcells.tif')
        
-              
        
-              
        >>> m1=mmregmin(f1,mmsebox())
        
-              
        
-              
        >>> mmshow(f1,m1)
        
-              
        
-              
        >>> f2=mmhmin(f1,70)
        
-              
        
-              
        >>> mmshow(f2)
        
-              
        
-              
        >>> m2=mmregmin(f2,mmsebox())
        
-              
        
-              
        >>> mmshow(f2,m2)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        f1,m1f2
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f2,m2
        
-          
        
-          
        Multiscale watershed
        
-          
        To build a pyramid of nested segmentations, use the marker for the watershed only the minima above a given dynamic. Two levels of this pyramid are build below, one with dynamic above 20 and the other, above 40.
-
-          
        
-          
        
-            
        
-              
        >>> f=mmreadgray('cameraman.tif')
        
-              
        
-              
        >>> g=mmgradm(f)
        
-              
        
-              
        >>> mh=mmregmin(g,mmsecross(),'dynamics')
        
-              
        
-              
        >>> ws1=mmcwatershed(g, mmbinary(mh, 20))
        
-              
        
-              
        >>> ws2=mmcwatershed(g, mmbinary(mh, 40))
        
-              
        
-              
        >>> mmshow(ws1)
        
-              
        
-              
        >>> mmshow(ws2)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ws1ws2
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmregmin(f, Bc=None, option="binary"):
-    if Bc is None: Bc = mmsecross()
-    fplus = mmaddm(f,1)
-    g = mmsubm(mmsuprec(fplus,f,Bc),f)
-    y = mmunion(mmthreshad(g,1),mmthreshad(f,0,0))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmregmaxRegional Maximum.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmhminRemove basins with contrast less than h.
        mmareacloseArea closing
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmregmax]
-                
-                    [Up]
-                    
-                    [mmsuprec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmse2hmt.html b/python/plugins/sextante/pymorph/html/morph/morph/mmse2hmt.html
deleted file mode 100644
index 7266d1e25417..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmse2hmt.html
+++ /dev/null
@@ -1,174 +0,0 @@
-
-  
-    
-    mmse2hmt
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmse2interval]
-              
-                  [Up]
-                  
-                  [mmthreshad]
-              Intervals (hit-or-miss templates)
        
-    
        mmse2hmt
-      
        
-      Create a Hit-or-Miss Template (or interval) from a pair of structuring elements.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Iab = 
-          mmse2hmt(
-                  
-          A, 
-          Bc
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        AStructuring Element
        Left extremity.
        BcStructuring Element
        Complement of the right extremity.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        IabInterval
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmse2hmt creates the Hit-or-Miss Template (HMT), also called interval 
-          [A,Bc] from the structuring elements 
-          A and 
-          Bc such that 
-          A is included in the complement of 
-          Bc. The only difference between this function and 
-          mmse2interval is that here the second structuring element is the complement of the one used in the other function. The advantage of this function over 
-          mmse2interval is that this one is more flexible in the use of the structuring elements as they are not required to have the same size.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat interval:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmse2hmt(A, Bc):
-    Iab = (A,Bc)
-    return Iab
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmendpointsInterval to detect end-points.
        mmhomothickInterval for homotopic thickening.
        mmhomothinInterval for homotopic thinning.
        mmthinImage transformation by thinning.
        mmthickImage transformation by thickening.
        mmsupcanonUnion of sup-generating or hit-miss operators.
        mminfcanonIntersection of inf-generating operators.
        mmintershowVisualize an interval.
        mmse2intervalCreate an interval from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmse2interval]
-                
-                    [Up]
-                    
-                    [mmthreshad]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmse2interval.html b/python/plugins/sextante/pymorph/html/morph/morph/mmse2interval.html
deleted file mode 100644
index a92f09334a50..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmse2interval.html
+++ /dev/null
@@ -1,187 +0,0 @@
-
-  
-    
-    mmse2interval
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmintershow]
-              
-                  [Up]
-                  
-                  [mmse2hmt]
-              Intervals (hit-or-miss templates)
        
-    
        mmse2interval
-      
        
-      Create an interval from a pair of structuring elements.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Iab = 
-          mmse2interval(
-                  
-          a, 
-          b
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        aStructuring Element
        Left extremity.
        bStructuring Element
        Right extremity.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        IabInterval
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmse2interval creates the interval 
-          [a,b] from the structuring elements 
-          a and 
-          b such that 
-          a is less or equal 
-          b.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat interval:
        
-          
        
-            
-          
        Where W is a finite rectangle.
-
-          
        Non-flat interval:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      Both structuring elements must have the same size with odd dimensions. To avoid this limitation, use 
-          mmse2hmt.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmse2interval(a, b):
-    Iab = (a,mmneg(b))
-    return Iab
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        mmendpointsInterval to detect end-points.
        mmhomothickInterval for homotopic thickening.
        mmhomothinInterval for homotopic thinning.
        mmthinImage transformation by thinning.
        mmthickImage transformation by thickening.
        mmsupcanonUnion of sup-generating or hit-miss operators.
        mminfcanonIntersection of inf-generating operators.
        mmintershowVisualize an interval.
        mmfreedomControl automatic data type conversion.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmintershow]
-                
-                    [Up]
-                    
-                    [mmse2hmt]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsebox.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsebox.html
deleted file mode 100644
index fad29761cd58..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsebox.html
+++ /dev/null
@@ -1,180 +0,0 @@
-
-  
-    
-    mmsebox
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmimg2se]
-              
-                  [Up]
-                  
-                  [mmsecross]
-              Structuring Elements
        
-    
        mmsebox
-      
        
-      Create a box structuring element.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        B = 
-          mmsebox(
-                  
-          r = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        rDouble      Non-negative integer.
-                          
        Radius.
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsebox creates the structuring element 
-          B formed by 
-          r successive Minkowski additions of the elementary square (i.e., the 3x3 square centered at the origin) with itself. If 
-          R=0, B is the unitary set that contains the origin. If 
-          R=1, B is the elementary square itself.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b1 = mmsebox()
        
-              
        
-              
        >>> mmseshow(b1)
        
-              
        array([[1, 1, 1],
-       [1, 1, 1],
-       [1, 1, 1]],'1')
        
-              
        >>> b2 = mmsebox(2)
        
-              
        
-              
        >>> mmseshow(b2)
-        
        
-              
        array([[1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1]],'1')
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsebox(r=1):
-    B = mmsesum(mmbinary([[1,1,1],
-                          [1,1,1],
-                          [1,1,1]]),r)
-    return B
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmsediskCreate a disk or a semi-sphere structuring element.
        mmseshowDisplay a structuring element as an image.
        mmdilDilate an image by a structuring element.
        mmselineCreate a line structuring element.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmimg2se]
-                
-                    [Up]
-                    
-                    [mmsecross]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsecross.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsecross.html
deleted file mode 100644
index 9d7bcf566d2c..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsecross.html
+++ /dev/null
@@ -1,179 +0,0 @@
-
-  
-    
-    mmsecross
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsebox]
-              
-                  [Up]
-                  
-                  [mmsedisk]
-              Structuring Elements
        
-    
        mmsecross
-      
        
-      Diamond structuring element and elementary 3x3 cross.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        B = 
-          mmsecross(
-                  
-          r = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        rDouble
        (radius).
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsecross creates the structuring element 
-          B formed by 
-          r successive Minkowski additions of the elementary cross (i.e., the 3x3 cross centered at the origin) with itself. If 
-          r=0, B is the unitary set that contains the origin. If 
-          r=1, 
-          B is the elementary cross itself.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b1 = mmsecross()
        
-              
        
-              
        >>> print mmseshow(b1)
        
-              
        [[0 1 0]
- [1 1 1]
- [0 1 0]]
        
-              
        >>> b2 = mmsecross(2)
        
-              
        
-              
        >>> print mmseshow(b2)
        
-              
        [[0 0 1 0 0]
- [0 1 1 1 0]
- [1 1 1 1 1]
- [0 1 1 1 0]
- [0 0 1 0 0]]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsecross(r=1):
-    B = mmsesum(mmbinary([[0,1,0],
-                          [1,1,1],
-                          [0,1,0]]),r)
-    return B
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmseshowDisplay a structuring element as an image.
        mmdilDilate an image by a structuring element.
        mmsediskCreate a disk or a semi-sphere structuring element.
        mmselineCreate a line structuring element.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsebox]
-                
-                    [Up]
-                    
-                    [mmsedisk]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsedil.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsedil.html
deleted file mode 100644
index 7fdb30cb7d50..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsedil.html
+++ /dev/null
@@ -1,198 +0,0 @@
-
-  
-    
-    mmsedil
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsereflect]
-              
-                  [Up]
-                  
-                  [mmseunion]
-              Structuring Elements
        
-    
        mmsedil
-      
        
-      Dilate one structuring element by another
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Bo = 
-          mmsedil(
-                  
-          B1, 
-          B2
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        B1Structuring Element
        B2Structuring Element
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BoStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsedil dilates an structuring element by another. The main difference between this dilation and 
-          mmdil is that the dilation between structuring elements are not bounded, returning another structuring element usually larger than anyone of them. This gives the composition of the two structuring elements by Minkowski addition.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b1 = mmseline(5)
        
-              
        
-              
        >>> mmseshow(b1)
        
-              
        array([0, 0, 0, 0, 1, 1, 1, 1, 1],'1')
        
-              
        >>> b2 = mmsedisk(2)
        
-              
        
-              
        >>> mmseshow(b2)
        
-              
        array([[0, 1, 1, 1, 0],
-       [1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1],
-       [0, 1, 1, 1, 0]],'1')
        
-              
        >>> b3 = mmsedil(b1,b2)
        
-              
        
-              
        >>> mmseshow(b3)
-        
        
-              
        array([[0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0],
-       [0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 1, 1],
-       [0, 0, 0, 0, 0, 1, 1, 1, 1, 1, 1, 1, 0]],'1')
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsedil(B1, B2):
-    from Numeric import NewAxis, array
-    assert ((mmdatatype(B1) == 'binary') or (mmdatatype(B1) == 'int32')) and (
-            (mmdatatype(B2) == 'binary') or (mmdatatype(B2) == 'int32')),'SE must be binary or int32'
-    if len(B1.shape) == 1: B1 = B1[NewAxis,:]
-    if len(B2.shape) == 1: B2 = B2[NewAxis,:]
-    if (mmdatatype(B1) == 'int32') or (mmdatatype(B2) == 'int32'):
-       Bo = int32([mmlimits(int32([0]))[0]])
-       if mmdatatype(B1) == 'binary':
-          B1 = mmgray(B1,'int32',0)
-       if mmdatatype(B2) == 'binary':
-          B2 = mmgray(B2,'int32',0)
-    else:
-       Bo = mmbinary([0])
-    x,v = mmmat2set(B2)
-    if len(x):
-        for i in range(x.shape[0]):
-            s = mmadd4dil(B1,v[i])
-            st= mmsetrans(s,x[i])
-            Bo = mmseunion(Bo,st)
-    return Bo
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdilDilate an image by a structuring element.
        mmseshowDisplay a structuring element as an image.
        mmeroErode an image by a structuring element.
        mmsesumN-1 iterative Minkowski  additions
        mmseunionUnion of structuring elements
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsereflect]
-                
-                    [Up]
-                    
-                    [mmseunion]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsedisk.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsedisk.html
deleted file mode 100644
index 566f99d4eb94..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsedisk.html
+++ /dev/null
@@ -1,374 +0,0 @@
-
-  
-    
-    mmsedisk
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsecross]
-              
-                  [Up]
-                  
-                  [mmseline]
-              Structuring Elements
        
-    
        mmsedisk
-      
        
-      Create a disk or a semi-sphere structuring element.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        B = 
-          mmsedisk(
-                  
-          r = 3, 
-          DIM = "2D", 
-          METRIC = "EUCLIDEAN", 
-          FLAT = "FLAT", 
-          h = 0
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        rDouble      Non-negative integer.
-                          
        Disk radius.
        Default: 
-                      3
-                    
        DIMString
        '1D', '2D, or '3D'.
        Default: 
-                      "2D"
-                    
        METRICString
        'EUCLIDEAN', ' CITY-BLOCK', 'OCTAGON', or ' CHESSBOARD'.
        Default: 
-                      "EUCLIDEAN"
-                    
        FLATString
        'FLAT' or 'NON-FLAT'.
        Default: 
-                      "FLAT"
-                    
        hDouble
        Elevation of the center of the semi-sphere.
        Default: 
-                      0
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsedisk creates a flat structuring element 
-          B that is disk under the metric METRIC , centered at the origin and with radius 
-          r or a non-flat structuring element that is a semi-sphere under the metric METRIC, centered at 
-          (0, h) and with radius 
-          r. This structuring element can be created on the 1D, 2D or 3D space.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Examples of flat structuring elements.
        
-          
        
-          
        
-            
        
-              
        >>> a=mmseshow(mmsedisk(10,'2D','CITY-BLOCK'))
        
-              
        
-              
        >>> b=mmseshow(mmsedisk(10,'2D','EUCLIDEAN'))
        
-              
        
-              
        >>> c=mmseshow(mmsedisk(10,'2D','OCTAGON'))
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-              
        >>> mmshow(c)
-        
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        abc
        
-          
        
-          
        
-          
        Examples of non flat structuring elements.
        
-          
        
-          
        
-            
        
-              
        >>> d=mmseshow(mmsedisk(10,'2D','CITY-BLOCK','NON-FLAT'))
        
-              
        
-              
        >>> e=mmseshow(mmsedisk(10,'2D','EUCLIDEAN','NON-FLAT'))
        
-              
        
-              
        >>> f=mmseshow(mmsedisk(10,'2D','OCTAGON','NON-FLAT'))
        
-              
        
-              
        >>> mmshow(d)
        
-              
        Warning: Converting input image from int32 to uint16.
        
-              
        >>> mmshow(e)
        
-              
        Warning: Converting input image from int32 to uint16.
        
-              
        >>> mmshow(f)
-        
        
-              
        Warning: Converting input image from int32 to uint16.
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        def
        
-          
        
-          
        
-            
        
-              
        >>> g=mmsedisk(3,'2D','EUCLIDEAN','NON-FLAT')
        
-              
        
-              
        >>> mmseshow(g)
        
-              
        array([[-2147483647, -2147483647,           1,           1,           1, -2147483647,
-             -2147483647],
-       [-2147483647,           2,           2,           2,           2,           2,
-             -2147483647],
-       [          1,           2,           3,           3,           3,           2,
-                       1],
-       [          1,           2,           3,           3,           3,           2,
-                       1],
-       [          1,           2,           3,           3,           3,           2,
-                       1],
-       [-2147483647,           2,           2,           2,           2,           2,
-             -2147483647],
-       [-2147483647, -2147483647,           1,           1,           1, -2147483647,
-             -2147483647]],'i')
        
-              
        >>> h=mmsedisk(3,'2D','EUCLIDEAN','NON-FLAT',5)
        
-              
        
-              
        >>> mmseshow(h)
-        
        
-              
        array([[-2147483647, -2147483647,           6,           6,           6, -2147483647,
-             -2147483647],
-       [-2147483647,           7,           7,           7,           7,           7,
-             -2147483647],
-       [          6,           7,           8,           8,           8,           7,
-                       6],
-       [          6,           7,           8,           8,           8,           7,
-                       6],
-       [          6,           7,           8,           8,           8,           7,
-                       6],
-       [-2147483647,           7,           7,           7,           7,           7,
-             -2147483647],
-       [-2147483647, -2147483647,           6,           6,           6, -2147483647,
-             -2147483647]],'i')
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        Euclidean distance:
        
-          
        
-            
-          
        
-          
        City block distance (4-connectivity):
        
-          
        
-            
-          
        
-          
        Chess board distance (8-connectivity):
        
-          
        
-            
-          
        
-          
        Octagon distance:
        
-          
        
-            
-          
        
-          
        Non-flat structuring element:
        
-          
        Euclidean distance:
        
-          
        
-            
-          
        
-          
        city block distance:
        
-          
        
-            
-          
        
-          
        chess board distance:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsedisk(r=3, DIM="2D", METRIC="EUCLIDEAN", FLAT="FLAT", h=0):
-    from string import upper
-    from Numeric import resize, transpose, arange
-    from Numeric import sqrt, arange, transpose, maximum
-    METRIC = upper(METRIC)
-    FLAT   = upper(FLAT)            
-    assert DIM=='2D','Supports only 2D structuring elements'
-    if FLAT=='FLAT': y = mmbinary([1])
-    else:            y = int32([h])
-    if r==0: return y
-    if METRIC == 'CITY-BLOCK':
-        if FLAT == 'FLAT':
-            b = mmsecross(1)
-        else:
-            b = int32([[-2147483647, 0,-2147483647],
-                       [          0, 1,          0],
-                       [-2147483647, 0,-2147483647]])
-        return mmsedil(y,mmsesum(b,r))
-    elif METRIC == 'CHESSBOARD':
-        if FLAT == 'FLAT':
-            b = mmsebox(1)
-        else:
-            b = int32([[1,1,1],
-                       [1,1,1],
-                       [1,1,1]])
-        return mmsedil(y,mmsesum(b,r))
-    elif METRIC == 'OCTAGON':
-        if FLAT == 'FLAT':
-            b1,b2 = mmsebox(1),mmsecross(1)
-        else:
-            b1 = int32([[1,1,1],[1,1,1],[1,1,1]])
-            b2 = int32([[-2147483647, 0,-2147483647],
-                        [          0, 1,          0],
-                        [-2147483647, 0,-2147483647]])
-        if r==1: return b1
-        else:    return mmsedil( mmsedil(y,mmsesum(b1,r/2)) ,mmsesum(b2,(r+1)/2))
-    elif METRIC == 'EUCLIDEAN':
-        v = arange(-r,r+1)
-        x = resize(v, (len(v), len(v)))
-        y = transpose(x)
-        Be = mmbinary(sqrt(x*x + y*y) <= (r+0.5))
-        if FLAT=='FLAT':
-            return Be
-        be = h + int32( sqrt( maximum((r+0.5)*(r+0.5) - (x*x) - (y*y),0)))
-        be = mmintersec(mmgray(Be,'int32'),be)
-        return be
-    else:
-        assert 0,'Non valid metric'
-    return B
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmselineCreate a line structuring element.
        mmimg2seCreate a structuring element from a pair of images.
        mmseshowDisplay a structuring element as an image.
        mmdilDilate an image by a structuring element.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsecross]
-                
-                    [Up]
-                    
-                    [mmseline]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmseline.html b/python/plugins/sextante/pymorph/html/morph/morph/mmseline.html
deleted file mode 100644
index eb2132225a60..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmseline.html
+++ /dev/null
@@ -1,222 +0,0 @@
-
-  
-    
-    mmseline
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsedisk]
-              
-                  [Up]
-                  
-                  [mmserot]
-              Structuring Elements
        
-    
        mmseline
-      
        
-      Create a line structuring element.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        B = 
-          mmseline(
-                  
-          l = 3, 
-          theta = 0
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        lDouble      Non-negative integer.
-                                
        Default: 
-                      3
-                    
        thetaDouble
        (degrees, clockwise)
        Default: 
-                      0
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmseline creates a structuring element 
-          B that is a line segment that has an extremity at the origin, length 
-          l and angle 
-          theta (0 degrees is east direction, clockwise). If 
-          l=0, it generates the origin.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> mmseshow(mmseline())
        
-              
        array([0, 0, 1, 1, 1],'1')
        
-              
        >>> b1 = mmseline(4,45)
        
-              
        
-              
        >>> mmseshow(b1)
        
-              
        array([[0, 0, 0, 0, 0],
-       [0, 0, 0, 0, 0],
-       [0, 0, 1, 0, 0],
-       [0, 0, 0, 1, 0],
-       [0, 0, 0, 0, 1]],'1')
        
-              
        >>> b2 = mmseline(4,-180)
        
-              
        
-              
        >>> mmseshow(b2)
        
-              
        array([1, 1, 1, 1, 0, 0, 0],'1')
        
-              
        >>> a=mmtext('Line')
        
-              
        
-              
        >>> b=mmdil(a,b1)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
-        
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmseline(l=3, theta=0):
-    from Numeric import pi, tan, cos, sin, sign, floor, arange, transpose, array, ones
-    theta = pi*theta/180
-    if abs(tan(theta)) <= 1:
-        s  = sign(cos(theta))
-        x0 = arange(0, l * cos(theta)-(s*0.5),s)
-        x1 = floor(x0 * tan(theta) + 0.5)
-    else:
-        s  = sign(sin(theta))
-        x1 = arange(0, l * sin(theta) - (s*0.5),s)
-        x0 = floor(x1 / tan(theta) + 0.5)
-    x = int32(transpose(array([x1,x0])))
-    B = mmset2mat((x,mmbinary(ones((x.shape[1],1)))))
-    return B
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsediskCreate a disk or a semi-sphere structuring element.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmimg2seCreate a structuring element from a pair of images.
        mmdilDilate an image by a structuring element.
        mmseshowDisplay a structuring element as an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsedisk]
-                
-                    [Up]
-                    
-                    [mmserot]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsereflect.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsereflect.html
deleted file mode 100644
index f0eb0c93d4eb..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsereflect.html
+++ /dev/null
@@ -1,169 +0,0 @@
-
-  
-    
-    mmsereflect
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsetrans]
-              
-                  [Up]
-                  
-                  [mmsedil]
-              Structuring Elements
        
-    
        mmsereflect
-      
        
-      Reflect a structuring element
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Bo = 
-          mmsereflect(
-                  
-          Bi
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BiStructuring Element
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BoStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsereflect reflects a structuring element by rotating it 180 degrees.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b1 = mmseline(5,30)
        
-              
        
-              
        >>> print mmseshow(b1)
        
-              
        [[0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0]
- [0 0 0 1 0 0 0]
- [0 0 0 0 1 1 0]
- [0 0 0 0 0 0 1]]
        
-              
        >>> b2 = mmsereflect(b1)
        
-              
        
-              
        >>> print mmseshow(b2)
        
-              
        [[1 0 0 0 0 0 0]
- [0 1 1 0 0 0 0]
- [0 0 0 1 0 0 0]
- [0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0]]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsereflect(Bi):
-    Bo = mmserot(Bi, 180)
-    return Bo
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdilDilate an image by a structuring element.
        mmseshowDisplay a structuring element as an image.
        mmeroErode an image by a structuring element.
        mmsesumN-1 iterative Minkowski  additions
        mmseunionUnion of structuring elements
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsetrans]
-                
-                    [Up]
-                    
-                    [mmsedil]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmserot.html b/python/plugins/sextante/pymorph/html/morph/morph/mmserot.html
deleted file mode 100644
index 2fb8affe3da7..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmserot.html
+++ /dev/null
@@ -1,205 +0,0 @@
-
-  
-    
-    mmserot
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmseline]
-              
-                  [Up]
-                  
-                  [mmseshow]
-              Structuring Elements
        
-    
        mmserot
-      
        
-      Rotate a structuring element.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        BROT = 
-          mmserot(
-                  
-          B, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        thetaDouble
        Degrees of rotation. Available values are multiple of 45 degrees.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or ' ANTI-CLOCKWISE'.
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BROTStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmserot rotates a structuring element 
-          B of  an angle 
-          theta.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b = mmimg2se(mmbinary([[0, 0, 0], [0, 1, 1], [0, 0, 0]]));
        
-              
        
-              
        >>> mmseshow(b)
        
-              
        array([0, 1, 1],'1')
        
-              
        >>> mmseshow(mmserot(b))
        
-              
        array([[0, 0, 0],
-       [0, 1, 0],
-       [0, 0, 1]],'1')
        
-              
        >>> mmseshow(mmserot(b,45,'ANTI-CLOCKWISE'))
-        
        
-              
        array([[0, 0, 1],
-       [0, 1, 0],
-       [0, 0, 0]],'1')
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        where
-
-          
        
-            
-          
        Reflection is given by
-
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      Only 2-D structuring elements can be rotated. The rotation angles allowed are multiples of 45 degrees.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmserot(B, theta=45, DIRECTION="CLOCKWISE"):
-    from string import upper
-    from Numeric import array, sin, cos, transpose
-    from Numeric import cos, sin, pi, concatenate, transpose, array
-    DIRECTION = upper(DIRECTION)            
-    if DIRECTION == "ANTI-CLOCKWISE":
-       theta = -theta
-    SA = mmmat2set(B)
-    theta = pi * theta/180
-    (y,v)=SA
-    if len(y)==0: return mmbinary([0])
-    x0 = y[:,1] * cos(theta) - y[:,0] * sin(theta)
-    x1 = y[:,1] * sin(theta) + y[:,0] * cos(theta)
-    x0 = int32((x0 +0.5)*(x0>=0) + (x0-0.5)*(x0<0))
-    x1 = int32((x1 +0.5)*(x1>=0) + (x1-0.5)*(x1<0))
-    x = transpose(array([transpose(x1),transpose(x0)]))
-    BROT = mmset2mat((x,v))
-    return BROT
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmseshowDisplay a structuring element as an image.
        mmimg2seCreate a structuring element from a pair of images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmseline]
-                
-                    [Up]
-                    
-                    [mmseshow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmseshow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmseshow.html
deleted file mode 100644
index 1dcf46067bc0..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmseshow.html
+++ /dev/null
@@ -1,234 +0,0 @@
-
-  
-    
-    mmseshow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmserot]
-              
-                  [Up]
-                  
-                  [mmsesum]
-              Structuring Elements
        
-    
        mmseshow
-      
        
-      Display a structuring element as an image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmseshow(
-                  
-          B, 
-          option = "NORMAL"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        optionString
        'NORMAL', ' EXPAND' or ' NON-FLAT'
        Default: 
-                      "NORMAL"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmseshow used with the option EXPAND generates an image 
-          y that is a suitable graphical representation of the structuring element 
-          B. This function is useful to convert a structuring element to an image. The origin of the structuring element is at the center of the image. If 
-          B is flat, 
-          y is binary, otherwise, 
-          y is signed int32 image. When using the option NON-FLAT, the output 
-          y is always a signed int32 image.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Flat structuring element
        
-          
        
-            
        
-              
        >>> b=mmsecross(3);
        
-              
        
-              
        >>> print mmseshow(b)
        
-              
        [[0 0 0 1 0 0 0]
- [0 0 1 1 1 0 0]
- [0 1 1 1 1 1 0]
- [1 1 1 1 1 1 1]
- [0 1 1 1 1 1 0]
- [0 0 1 1 1 0 0]
- [0 0 0 1 0 0 0]]
        
-              
        >>> a = mmseshow(b,'EXPAND')
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> print mmseshow(b,'NON-FLAT')
        
-              
        [[-2147483647 -2147483647 -2147483647           0 -2147483647 -2147483647
-       -2147483647]
- [-2147483647 -2147483647           0           0           0 -2147483647
-       -2147483647]
- [-2147483647           0           0           0           0           0
-       -2147483647]
- [          0           0           0           0           0           0
-                 0]
- [-2147483647           0           0           0           0           0
-       -2147483647]
- [-2147483647 -2147483647           0           0           0 -2147483647
-       -2147483647]
- [-2147483647 -2147483647 -2147483647           0 -2147483647 -2147483647
-       -2147483647]]
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        a
        
-          
        
-          
        Non flat structuring element
        
-          
        
-            
        
-              
        >>> b=mmsedisk(2,'2D','EUCLIDEAN','NON-FLAT')
        
-              
        
-              
        >>> print mmseshow(b)
        
-              
        [[-2147483647           1           1           1 -2147483647]
- [          1           2           2           2           1]
- [          1           2           2           2           1]
- [          1           2           2           2           1]
- [-2147483647           1           1           1 -2147483647]]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmseshow(B, option="NORMAL"):
-    from string import upper
-    option = upper(option)            
-    if option=='NON-FLAT': 
-        y=int32([0])
-        if mmisbinary(B):
-            B = mmintersec(mmgray(B,'int32'),0)
-    elif option=='NORMAL':
-        if mmisbinary(B):    y=mmbinary([1])
-        else:
-           y=int32([0])
-    elif option=='EXPAND':
-        assert mmisbinary(B), 'This option is only available with flat SE'
-        y = mmsedil(mmbinary([1]),B)
-        b1= mmbinary(y>=0)
-        b0= mmero(y,B)
-        y = mmbshow(b1,y,b0)
-        return y
-    else:
-        print 'mmseshow: not a valid flag: NORMAL, EXPAND or NON-FLAT'
-    y = mmsedil(y,B)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmimg2seCreate a structuring element from a pair of images.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmsediskCreate a disk or a semi-sphere structuring element.
        mmselineCreate a line structuring element.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmserot]
-                
-                    [Up]
-                    
-                    [mmsesum]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsesum.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsesum.html
deleted file mode 100644
index e49894e0a723..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsesum.html
+++ /dev/null
@@ -1,209 +0,0 @@
-
-  
-    
-    mmsesum
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmseshow]
-              
-                  [Up]
-                  
-                  [mmsetrans]
-              Structuring Elements
        
-    
        mmsesum
-      
        
-      N-1 iterative Minkowski  additions
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        NB = 
-          mmsesum(
-                  
-          B = None, 
-          N = 1
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        NDouble      Non-negative integer.
-                                
        Default: 
-                      1
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        NBStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsesum creates the structuring element 
-          NB from  N - 1 iterative  Minkowski additions with  the structuring element 
-          B.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b = mmimg2se(mmbinary([[1, 1, 1], [1, 1, 1], [0, 1, 0]]))
        
-              
        
-              
        >>> mmseshow(b)
        
-              
        array([[1, 1, 1],
-       [1, 1, 1],
-       [0, 1, 0]],'1')
        
-              
        >>> b3 = mmsesum(b,3)
        
-              
        
-              
        >>> mmseshow(b3)
        
-              
        array([[1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1],
-       [0, 1, 1, 1, 1, 1, 0],
-       [0, 0, 1, 1, 1, 0, 0],
-       [0, 0, 0, 1, 0, 0, 0]],'1')
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> b = mmsedisk(1,'2D','CITY-BLOCK','NON-FLAT');
        
-              
        
-              
        >>> mmseshow(b)
        
-              
        array([[-2147483647,           0, -2147483647],
-       [          0,           1,           0],
-       [-2147483647,           0, -2147483647]],'i')
        
-              
        >>> mmseshow(mmsesum(b,2))
        
-              
        array([[-2147483647, -2147483647,           0, -2147483647, -2147483647],
-       [-2147483647,           0,           1,           0, -2147483647],
-       [          0,           1,           2,           1,           0],
-       [-2147483647,           0,           1,           0, -2147483647],
-       [-2147483647, -2147483647,           0, -2147483647, -2147483647]],'i')
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsesum(B=None, N=1):
-    if B is None: B = mmsecross()
-    if N==0:
-        if mmisbinary(B): return mmbinary([1])
-        else:             return int32([0]) # identity
-    NB = B
-    for i in range(N-1):
-        NB = mmsedil(NB,B)
-    return NB
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdilDilate an image by a structuring element.
        mmseshowDisplay a structuring element as an image.
        mmopenMorphological opening.
        mmcloseMorphological closing.
        mmeroErode an image by a structuring element.
        mmseunionUnion of structuring elements
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmseshow]
-                
-                    [Up]
-                    
-                    [mmsetrans]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmset2mat.html b/python/plugins/sextante/pymorph/html/morph/morph/mmset2mat.html
deleted file mode 100644
index 9ef3f14ae6de..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmset2mat.html
+++ /dev/null
@@ -1,176 +0,0 @@
-
-  
-    
-    mmset2mat
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmmat2set]
-              
-                  [Up]
-                  
-                  [mmreadgray]
-              Image Information and Manipulation
        
-    
        mmset2mat
-      
        
-      Converts image representation from set to matrix
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        M = 
-          mmset2mat(
-                  
-          A
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        AImage
        Tuple with array of pixel coordinates and optional array of corresponding pixel values
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        MImage
        Image in matrix format, origin (0,0) at the matrix center
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Return an image in the matrix format built from a tuple of an array of pixel coordinates and a corresponding array of pixel values
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> coord=int32([
-  [ 0,0],
-  [-1,0],
-  [ 1,1]])
        
-              
        
-              
        >>> A=mmset2mat((coord,))
        
-              
        
-              
        >>> print A
        
-              
        [[0 1 0]
- [0 1 0]
- [0 0 1]]
        
-              
        >>> print mmdatatype(A)
        
-              
        binary
        
-              
        >>> vu = uint8([1,2,3])
        
-              
        
-              
        >>> f=mmset2mat((coord,vu))
        
-              
        
-              
        >>> print f
        
-              
        [[0 2 0]
- [0 1 0]
- [0 0 3]]
        
-              
        >>> print mmdatatype(f)
        
-              
        uint8
        
-              
        >>> vi = int32([1,2,3])
        
-              
        
-              
        >>> g=mmset2mat((coord,vi))
        
-              
        
-              
        >>> print g
        
-              
        [[-2147483647           2 -2147483647]
- [-2147483647           1 -2147483647]
- [-2147483647 -2147483647           3]]
        
-              
        >>> print mmdatatype(g)
        
-              
        int32
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmset2mat(A):
-    from MLab import max
-    from Numeric import put, ones, ravel, shape, NewAxis, array, asarray
-    if len(A) == 2:            
-        x, v = A
-        v = asarray(v)
-    elif len(A) == 1:
-        x = A[0]
-        v = ones((len(x),), '1')
-    else:
-        raise TypeError, 'Argument must be a tuple of length 1 or 2'
-    if len(x) == 0:  return array([0]).astype(v.typecode())
-    if len(x.shape) == 1: x = x[NewAxis,:]
-    dh,dw = max(abs(x))
-    h,w = (2*dh)+1, (2*dw)+1 
-    M=ones((h,w)) * mmlimits(v)[0]
-    offset = x[:,0] * w + x[:,1] + (dh*w + dw)
-    put(M,offset,v)
-    M = M.astype(v.typecode())
-    return M
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-          
-        
        mmmat2setConverts image representation from matrix to set
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmmat2set]
-                
-                    [Up]
-                    
-                    [mmreadgray]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsetrans.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsetrans.html
deleted file mode 100644
index aa50c5544e0b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsetrans.html
+++ /dev/null
@@ -1,173 +0,0 @@
-
-  
-    
-    mmsetrans
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsesum]
-              
-                  [Up]
-                  
-                  [mmsereflect]
-              Structuring Elements
        
-    
        mmsetrans
-      
        
-      Translate a structuring element
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        Bo = 
-          mmsetrans(
-                  
-          Bi, 
-          t
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        BiStructuring Element
        tImage coordinate
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BoStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsetrans translates a structuring element by a specific value.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b1 = mmseline(5)
        
-              
        
-              
        >>> mmseshow(b1)
        
-              
        array([0, 0, 0, 0, 1, 1, 1, 1, 1],'1')
        
-              
        >>> b2 = mmsetrans(b1,[2,-2])
        
-              
        
-              
        >>> mmseshow(b2)
-        
        
-              
        array([[0, 0, 0, 0, 0],
-       [0, 0, 0, 0, 0],
-       [0, 0, 0, 0, 0],
-       [0, 0, 0, 0, 0],
-       [1, 1, 1, 1, 1]],'1')
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsetrans(Bi, t):
-    x,v=mmmat2set(Bi)
-    Bo = mmset2mat((x+t,v))
-    Bo = Bo.astype(Bi.typecode())
-    return Bo
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdilDilate an image by a structuring element.
        mmseshowDisplay a structuring element as an image.
        mmeroErode an image by a structuring element.
        mmsesumN-1 iterative Minkowski  additions
        mmseunionUnion of structuring elements
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsesum]
-                
-                    [Up]
-                    
-                    [mmsereflect]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmseunion.html b/python/plugins/sextante/pymorph/html/morph/morph/mmseunion.html
deleted file mode 100644
index 9fe4a1d97257..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmseunion.html
+++ /dev/null
@@ -1,207 +0,0 @@
-
-  
-    
-    mmseunion
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsedil]
-              
-                  [Up]
-                  
-                  [mmcdil]
-              Structuring Elements
        
-    
        mmseunion
-      
        
-      Union of structuring elements
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        B = 
-          mmseunion(
-                  
-          B1, 
-          B2
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        B1Structuring Element
        B2Structuring Element
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        BStructuring Element
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmseunion creates a structuring element from the union of two structuring elements.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> b1 = mmseline(5)
        
-              
        
-              
        >>> mmseshow(b1)
        
-              
        array([0, 0, 0, 0, 1, 1, 1, 1, 1],'1')
        
-              
        >>> b2 = mmsedisk(3)
        
-              
        
-              
        >>> mmseshow(b2)
        
-              
        array([[0, 0, 1, 1, 1, 0, 0],
-       [0, 1, 1, 1, 1, 1, 0],
-       [1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1],
-       [1, 1, 1, 1, 1, 1, 1],
-       [0, 1, 1, 1, 1, 1, 0],
-       [0, 0, 1, 1, 1, 0, 0]],'1')
        
-              
        >>> b3 = mmseunion(b1,b2)
        
-              
        
-              
        >>> mmseshow(b3)
-        
        
-              
        array([[0, 0, 0, 1, 1, 1, 0, 0, 0],
-       [0, 0, 1, 1, 1, 1, 1, 0, 0],
-       [0, 1, 1, 1, 1, 1, 1, 1, 0],
-       [0, 1, 1, 1, 1, 1, 1, 1, 1],
-       [0, 1, 1, 1, 1, 1, 1, 1, 0],
-       [0, 0, 1, 1, 1, 1, 1, 0, 0],
-       [0, 0, 0, 1, 1, 1, 0, 0, 0]],'1')
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Flat structuring element:
        
-          
        
-            
-          
        
-          
        Non-flat structuring element:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmseunion(B1, B2):
-    from Numeric import maximum, ones, asarray, NewAxis
-    assert B1.typecode() == B2.typecode(), 'Cannot have different datatypes:'
-    type1 = B1.typecode()
-    if len(B1) == 0: return B2
-    if len(B1.shape) == 1: B1 = B1[NewAxis,:]
-    if len(B2.shape) == 1: B2 = B2[NewAxis,:]
-    if B1.shape <> B2.shape:
-        inf = mmlimits(B1)[0]
-        h1,w1 = B1.shape
-        h2,w2 = B2.shape
-        H,W = max(h1,h2),max(w1,w2)
-        Hc,Wc = (H-1)/2,(W-1)/2    # center
-        BB1,BB2 = asarray(B1),asarray(B2)
-        B1, B2  = inf * ones((H,W)), inf *ones((H,W))
-        dh1s , dh1e = (h1-1)/2 , (h1-1)/2 + (h1+1)%2 # deal with even and odd dimensions
-        dw1s , dw1e = (w1-1)/2 , (w1-1)/2 + (w1+1)%2
-        dh2s , dh2e = (h2-1)/2 , (h2-1)/2 + (h2+1)%2
-        dw2s , dw2e = (w2-1)/2 , (w2-1)/2 + (w2+1)%2
-        B1[ Hc-dh1s : Hc+dh1e+1  ,  Wc-dw1s : Wc+dw1e+1 ] = BB1
-        B2[ Hc-dh2s : Hc+dh2e+1  ,  Wc-dw2s : Wc+dw2e+1 ] = BB2
-    B = maximum(B1,B2).astype(type1)
-    return B
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdilDilate an image by a structuring element.
        mmseshowDisplay a structuring element as an image.
        mmeroErode an image by a structuring element.
        mmsesumN-1 iterative Minkowski  additions
        mmsetransTranslate a structuring element
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsedil]
-                
-                    [Up]
-                    
-                    [mmcdil]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmshow.html b/python/plugins/sextante/pymorph/html/morph/morph/mmshow.html
deleted file mode 100644
index b0bb00118139..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmshow.html
+++ /dev/null
@@ -1,225 +0,0 @@
-
-  
-    
-    mmshow
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmlblshow]
-              
-                  [Up]
-                  
-                  [mmbshow]
-              Visualization
        
-    
        mmshow
-      
        
-      Display binary or gray-scale images and optionally overlay it with binary images.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        
-          mmshow(
-                  
-          f, 
-          f1 = None, 
-          f2 = None, 
-          f3 = None, 
-          f4 = None, 
-          f5 = None, 
-          f6 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        f1Image          Binary image.
-                          
        Red overlay.
        Default: 
-                      None
-                    
        f2Image          Binary image.
-                          
        Green overlay.
        Default: 
-                      None
-                    
        f3Image          Binary image.
-                          
        Blue overlay.
        Default: 
-                      None
-                    
        f4Image          Binary image.
-                          
        Magenta overlay.
        Default: 
-                      None
-                    
        f5Image          Binary image.
-                          
        Yellow overlay.
        Default: 
-                      None
-                    
        f6Image          Binary image.
-                          
        Cyan overlay.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Displays the binary or gray-scale (uint8 or uint16) image 
-          f, and optionally overlay it with up to six binary images 
-          f1 to 
-          f6 in the following colors: 
-          f1 as red, 
-          f2 as green, 
-          f3 as blue, 
-          f4 as yellow, 
-          f5 as magenta, and 
-          f6 as cian. The image is displayed in the MATLAB figure only if no output parameter is given.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('mribrain.tif');
        
-              
        
-              
        >>> f150=mmthreshad(f,150);
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> f200=mmthreshad(f,200);
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> mmshow(f);
        
-              
        
-              
        >>> mmshow(f150);
        
-              
        
-              
        >>> mmshow(f,f150,f200);
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ff150
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f,f150,f200
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmshow(f, f1=None, f2=None, f3=None, f4=None, f5=None, f6=None):
-    import adpil
-    if len(f.shape) != 2:
-       print "Error, mmshow: can only process gray-scale and binary images."
-       return
-    if   f1 == None: y = mmgshow(f)
-    elif f2 == None: y = mmgshow(f,f1)
-    elif f3 == None: y = mmgshow(f,f1,f2)
-    elif f4 == None: y = mmgshow(f,f1,f2,f3)
-    elif f5 == None: y = mmgshow(f,f1,f2,f3,f4)
-    elif f6 == None: y = mmgshow(f,f1,f2,f3,f4,f5)
-    elif f6 == None: y = mmgshow(f,f1,f2,f3,f4,f5)
-    else:            y = mmgshow(f,f1,f2,f3,f4,f5,f6)
-    adpil.adshow(y)
-    return
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmlblshowDisplay a labeled image assigning a random color for each label.
        mmdtshowDisplay a distance transform image with an iso-line color table.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmlblshow]
-                
-                    [Up]
-                    
-                    [mmbshow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmskelm.html b/python/plugins/sextante/pymorph/html/morph/morph/mmskelm.html
deleted file mode 100644
index 094a21ba34b0..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmskelm.html
+++ /dev/null
@@ -1,263 +0,0 @@
-
-  
-    
-    mmskelm
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmopenth]
-              
-                  [Up]
-                  
-                  [mmskelmrec]
-              Residues
        
-    
        mmskelm
-      
        
-      Morphological skeleton (Medial Axis Transform).
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmskelm(
-                  
-          f, 
-          B = None, 
-          option = "binary"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        BStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        optionString
        Choose one of: binary: output a binary image (medial axis); value: output a grayscale image with values of the radius of the disk to reconstruct the original image (medial axis transform).
        Default: 
-                      "binary"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmskelm creates the image 
-          y by computing the morphological skeleton by 
-          B of the image 
-          f, when 
-          option is BINARY. In this case, the pixels of value 1 in 
-          y are center of maximal balls (generated from 
-          B) included in 
-          f. This is also called Medial Axis. If 
-          option is VALUE, the non zeros pixels in 
-          y are the radius plus 1 of the maximal balls. This is called Medial Axis Transform or valued morphological skeleton.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> from Numeric import ones
        
-              
        
-              
        >>> a=mmneg(mmframe(mmbinary(ones((7,9)))))
        
-              
        
-              
        >>> print a
        
-              
        [[0 0 0 0 0 0 0 0 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 0 0 0 0 0 0 0 0]]
        
-              
        >>> print mmskelm(a)
        
-              
        [[0 0 0 0 0 0 0 0 0]
- [0 1 0 0 0 0 0 1 0]
- [0 0 1 0 0 0 1 0 0]
- [0 0 0 1 1 1 0 0 0]
- [0 0 1 0 0 0 1 0 0]
- [0 1 0 0 0 0 0 1 0]
- [0 0 0 0 0 0 0 0 0]]
        
-              
        >>> print mmskelm(a,mmsebox())
        
-              
        [[0 0 0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0 0 0]
- [0 0 0 1 1 1 0 0 0]
- [0 0 0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0 0 0]
- [0 0 0 0 0 0 0 0 0]]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> a=mmreadgray('pcbholes.tif')
        
-              
        
-              
        >>> b=mmskelm(a)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-          
        
-          
        
-            
        
-              
        >>> c=mmskelm(a,mmsecross(),'value')
        
-              
        
-              
        >>> mmshow(c)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        c
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmskelm(f, B=None, option="binary"):
-    from string import upper
-    from Numeric import asarray
-    if B is None: B = mmsecross()
-    assert mmisbinary(f),'Input binary image only'
-    option = upper(option)
-    k1,k2 = mmlimits(f)
-    y = mmgray(mmintersec(f, k1),'uint16')
-    iszero = asarray(y)
-    nb = mmsesum(B,0)
-    for r in range(1,65535):
-        ero = mmero( f, nb)
-        if mmisequal(ero, iszero): break
-        f1 = mmopenth( ero, B)
-        nb = mmsedil(nb, B)
-        y = mmunion(y, mmgray(f1,'uint16',r))
-    if option == 'BINARY':
-        y = mmbinary(y)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmcbisectorN-Conditional bisector.
        mmthinImage transformation by thinning.
        mmskelmrecMorphological skeleton reconstruction (Inverse Medial Axis Transform).
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmopenth]
-                
-                    [Up]
-                    
-                    [mmskelmrec]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmskelmrec.html b/python/plugins/sextante/pymorph/html/morph/morph/mmskelmrec.html
deleted file mode 100644
index 8304532859fa..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmskelmrec.html
+++ /dev/null
@@ -1,176 +0,0 @@
-
-  
-    
-    mmskelmrec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmskelm]
-              
-                  [Up]
-                  
-                  [mmendpoints]
-              Residues
        
-    
        mmskelmrec
-      
        
-      Morphological skeleton reconstruction (Inverse Medial Axis Transform).
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmskelmrec(
-                  
-          f, 
-          B = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        BStructuring Element
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmskelmrec reconstructs the valued morphological skeleton to recover the original image.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> from Numeric import ones
        
-              
        
-              
        >>> a=mmneg(mmframe(mmbinary(ones((7,9)))))
        
-              
        
-              
        >>> print a
        
-              
        [[0 0 0 0 0 0 0 0 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 0 0 0 0 0 0 0 0]]
        
-              
        >>> b=mmskelm(a,mmsecross(),'value')
        
-              
        
-              
        >>> print b
        
-              
        [[0 0 0 0 0 0 0 0 0]
- [0 1 0 0 0 0 0 1 0]
- [0 0 2 0 0 0 2 0 0]
- [0 0 0 3 3 3 0 0 0]
- [0 0 2 0 0 0 2 0 0]
- [0 1 0 0 0 0 0 1 0]
- [0 0 0 0 0 0 0 0 0]]
        
-              
        >>> c=mmskelmrec(b,mmsecross())
        
-              
        
-              
        >>> print c
        
-              
        [[0 0 0 0 0 0 0 0 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 1 1 1 1 1 1 1 0]
- [0 0 0 0 0 0 0 0 0]]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmskelmrec(f, B=None):
-    from Numeric import ravel
-    if B is None: B = mmsecross()
-    y = mmbinary(mmintersec(f, 0))
-    for r in range(max(ravel(f)),1,-1):
-        y = mmdil(mmunion(y,mmbinary(f,r)), B)
-    y = mmunion(y, mmbinary(f,1))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmskelmMorphological skeleton (Medial Axis Transform).
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmskelm]
-                
-                    [Up]
-                    
-                    [mmendpoints]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmskiz.html b/python/plugins/sextante/pymorph/html/morph/morph/mmskiz.html
deleted file mode 100644
index a4d7611f7363..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmskiz.html
+++ /dev/null
@@ -1,219 +0,0 @@
-
-  
-    
-    mmskiz
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmcwatershed]
-              
-                  [Up]
-                  
-                  [mmswatershed]
-              Thinning And Thickening
        
-    
        mmskiz
-      
        
-      Skeleton of Influence Zone - also know as Generalized Voronoi Diagram
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmskiz(
-                  
-          f, 
-          Bc = None, 
-          LINEREG = "LINES", 
-          METRIC = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        BcStructuring Element
        Connectivity for the distance measurement.
        Default: 
-                      None (3x3 elementary cross)
-                    
        LINEREGString
        'LINES' or 'REGIONS'.
        Default: 
-                      "LINES"
-                    
        METRICString
        'EUCLIDEAN' if specified.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmskiz creates the image 
-          y by detecting the lines which are equidistant to two or more connected components of 
-          f, according to the connectivity defined by 
-          Bc. Depending on with the flag LINEREG, 
-          y will be a binary image with the skiz lines or a labeled image representing the zone of influence regions. When the connected objects of 
-          f are single points, the skiz is the Voronoi diagram.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Skiz:
        
-          
        
-            
        
-              
        >>> f=mmreadgray('blob2.tif')
        
-              
        
-              
        >>> y=mmskiz(f,mmsebox(),'LINES','EUCLIDEAN')
        
-              
        
-              
        >>> mmshow(f,y)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f,y
        
-          
        
-          
        Voronoi diagram:
        
-          
        
-            
        
-              
        >>> from Numeric import zeros
        
-              
        
-              
        >>> f=mmbinary(zeros((100,100)))
        
-              
        
-              
        >>> f[30,25],f[20,75],f[50,50],f[70,30],f[80,70] = 1,1,1,1,1
        
-              
        
-              
        >>> y = mmskiz(f,mmsebox(),'LINES','EUCLIDEAN')
        
-              
        
-              
        >>> mmshow(f,y)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f,y
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      For Euclidean metric, please see 
-          mmdist.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmskiz(f, Bc=None, LINEREG="LINES", METRIC=None):
-    from string import upper
-    if Bc is None: Bc = mmsecross()
-    LINEREG = upper(LINEREG)
-    if METRIC is not None: METRIC = upper(METRIC)
-    d = mmdist( mmneg(f), Bc, METRIC)
-    return mmcwatershed(d,f,Bc,LINEREG)
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmdistDistance transform.
        mmcwatershedDetection of watershed from markers.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmcwatershed]
-                
-                    [Up]
-                    
-                    [mmswatershed]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmstats.html b/python/plugins/sextante/pymorph/html/morph/morph/mmstats.html
deleted file mode 100644
index 2645751c6c33..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmstats.html
+++ /dev/null
@@ -1,153 +0,0 @@
-
-  
-    
-    mmstats
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmpatspec]
-              
-                  [Up]
-                  
-                  [mmglblshow]
-              Measurements
        
-    
        mmstats
-      
        
-      Find global image statistics.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmstats(
-                  
-          f, 
-          measurement
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage
        measurementString
        Choose the measure to compute: 'max', 'min', 'median', 'mean', 'sum', 'std', 'std1'.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yDouble
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      Compute global image statistics: 'max' - maximum gray-scale value in image; 'min' - minimum gray-scale value in image; 'sum' - sum of all pixel values; 'median' - median value of all pixels in image; 'mean' - mean value of all pixels in image; 'std' - standard deviation of all pixels (normalized by N-1); 'std1' - idem, normalized by N.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmstats(f, measurement):
-    from string import upper
-    from Numeric import ravel
-    from MLab import mean, median, std
-    measurement = upper(measurement)
-    if measurement == 'MAX':
-        y = max(ravel(f))
-    elif measurement == 'MIN':
-        y = min(ravel(f))
-    elif measurement == 'MEAN':
-        y = mean(ravel(f))
-    elif measurement == 'MEDIAN':
-        y = median(ravel(f))
-    elif measurement == 'STD':
-        y = std(ravel(f))
-    else:
-        assert 0,'Not a valid measurement'
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmhistogramFind the histogram of the image f.
        mmblobBlob measurements from a labeled image.
        mmgrainGray-scale statistics for each labeled region.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmpatspec]
-                
-                    [Up]
-                    
-                    [mmglblshow]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsubm.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsubm.html
deleted file mode 100644
index 6b13cad9ec37..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsubm.html
+++ /dev/null
@@ -1,226 +0,0 @@
-
-  
-    
-    mmsubm
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmintersec]
-              
-                  [Up]
-                  
-                  [mmsymdif]
-              Operations
        
-    
        mmsubm
-      
        
-      Subtraction of two images, with saturation.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmsubm(
-                  
-          f1, 
-          f2
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        f2Image          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                          
        Or constant.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsubm creates the image 
-          y by pixelwise subtraction of the image 
-          f2 from the image 
-          f1. When the subtraction of the values of two pixels is negative, 0 is taken as the result of the subtraction. When 
-          f1 and 
-          f2 are binary images, 
-          y represents the set subtraction of 
-          f2 from 
-          f1.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f = uint8([255,   255,    0,   10,   20,   10,    0,   255,  255])
        
-              
        
-              
        >>> g = uint8([10,     20,   30,   40,   50,   40,   30,    20,    10])
        
-              
        
-              
        >>> print mmsubm(f, g)
        
-              
        [245 235   0   0   0   0   0 235 245]
        
-              
        >>> print mmsubm(f, 100)
        
-              
        Warning: Converting input image from int32 to uint8.
-[155 155   0   0   0   0   0 155 155]
        
-              
        >>> print mmsubm(100, f)
        
-              
        Warning: Converting input image from uint8 to int32.
-[-155 -155  100   90   80   90  100 -155 -155]
        
-            
        
-          
        
-          
        Gray scale image:
        
-          
        
-            
        
-              
        >>> a = mmreadgray('boxdrill-C.tif')
        
-              
        
-              
        >>> b = mmreadgray('boxdrill-B.tif')
        
-              
        
-              
        >>> c = mmsubm(a,b)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-              
        >>> mmshow(c)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        abc
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsubm(f1, f2):
-    from Numeric import array, minimum, maximum
-    if type(f2) is array:
-        assert f1.typecode() == f2.typecode(), 'Cannot have different datatypes:'
-    y = minimum(maximum(f1.astype('d')-f2, mmlimits(f1)[0]), mmlimits(f1)[1])
-    y = y.astype(f1.typecode())
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmaddmAddition of two images, with saturation.
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmaddmAddition of two images, with saturation.
        mmlimitsGet the possible minimum and maximum of an image.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmintersec]
-                
-                    [Up]
-                    
-                    [mmsymdif]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsupcanon.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsupcanon.html
deleted file mode 100644
index d7b612bb86c7..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsupcanon.html
+++ /dev/null
@@ -1,179 +0,0 @@
-
-  
-    
-    mmsupcanon
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mminfgen]
-              
-                  [Up]
-                  
-                  [mmsupgen]
-              Sup-generating And Inf-generating
        
-    
        mmsupcanon
-      
        
-      Union of sup-generating or hit-miss operators.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmsupcanon(
-                  
-          f, 
-          Iab, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        IabInterval
        thetaDouble
        Degrees of rotation: 45, 90, or 180.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or ' ANTI-CLOCKWISE'
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsupcanon creates the image 
-          y by computing the union of transformations of the image 
-          f by sup-generating operators. These hit-miss operators are characterized by rotations (in the clockwise or anti-clockwise direction) of 
-          theta degrees of the interval 
-          Iab.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsupcanon(f, Iab, theta=45, DIRECTION="CLOCKWISE"):
-    from string import upper
-    DIRECTION = upper(DIRECTION)            
-    y = mmintersec(f,0)
-    for t in range(0,360,theta):
-        Irot = mminterot( Iab, t, DIRECTION )
-        y = mmunion( y, mmsupgen(f, Irot))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsupgenSup-generating (hit-miss).
        mmthinImage transformation by thinning.
        mmendpointsInterval to detect end-points.
        mmhomothickInterval for homotopic thickening.
        mmhomothinInterval for homotopic thinning.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mminfgen]
-                
-                    [Up]
-                    
-                    [mmsupgen]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsupgen.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsupgen.html
deleted file mode 100644
index e9d9d23efa96..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsupgen.html
+++ /dev/null
@@ -1,223 +0,0 @@
-
-  
-    
-    mmsupgen
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsupcanon]
-              
-                  [Up]
-                  
-                  [mmcthick]
-              Sup-generating And Inf-generating
        
-    
        mmsupgen
-      
        
-      Sup-generating (hit-miss).
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmsupgen(
-                  
-          f, 
-          INTER
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        INTERInterval
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsupgen creates the binary image 
-          y by computing the transformation of the image 
-          f by the sup-generating operator characterized by the interval 
-          Iab.  The sup-generating operator is just a relaxed template matching, where the criterion to keep a shape is that it be inside the interval 
-          Iab. Note that we have the classical template matching when 
-          a=b. Note yet that the sup-generating operator is equivalent to the classical hit-miss operator.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example:
        
-          
        
-            
        
-              
        >>> f=mmbinary([
-   [0,0,1,0,0,1,1],
-   [0,1,0,0,1,0,0],
-   [0,0,0,1,1,0,0]])
        
-              
        
-              
        >>> i=mmendpoints()
        
-              
        
-              
        >>> print mmintershow(i)
        
-              
        . . . 
-0 1 0 
-0 0 0
        
-              
        >>> g=mmsupgen(f,i)
        
-              
        
-              
        >>> print g
        
-              
        [[0 0 0 0 0 0 0]
- [0 1 0 0 0 0 0]
- [0 0 0 0 0 0 0]]
        
-            
        
-          
        
-          
        Image example
        
-          
        
-            
        
-              
        >>> a=mmreadgray('gear.tif')
        
-              
        
-              
        >>> b=mmsupgen(a,mmendpoints())
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(mmdil(b))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ammdil(b)
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsupgen(f, INTER):
-    A,Bc = INTER
-    y = mmintersec(mmero( f, A),
-                   mmero( mmneg(f), Bc))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mminfgenInf-generating.
        mmintershowVisualize an interval.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        mmendpointsInterval to detect end-points.
        mmhomothickInterval for homotopic thickening.
        mmhomothinInterval for homotopic thinning.
        mmsupcanonUnion of sup-generating or hit-miss operators.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsupcanon]
-                
-                    [Up]
-                    
-                    [mmcthick]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsuprec.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsuprec.html
deleted file mode 100644
index 65be314792e0..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsuprec.html
+++ /dev/null
@@ -1,165 +0,0 @@
-
-  
-    
-    mmsuprec
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmregmin]
-              
-                  [Up]
-                  
-                  [mmedgeoff]
-              Connected Operators
        
-    
        mmsuprec
-      
        
-      Sup-reconstruction.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmsuprec(
-                  
-          f, 
-          g, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Marker image.
        gImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Conditioning image.
        BcStructuring Element
        ( connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsuprec creates the image 
-          y by an infinite number of recursive iterations (iterations until stability) of the erosion of 
-          f by 
-          Bc conditioned to 
-          g. We say that 
-          y is the sup-reconstruction of 
-          g from the marker 
-          f.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsuprec(f, g, Bc=None):
-    from Numeric import product
-    if Bc is None: Bc = mmsecross()
-    n = product(f.shape)
-    y = mmcero(f,g,Bc,n);
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mminfrecInf-reconstruction.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmceroErode an image conditionally.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmregmin]
-                
-                    [Up]
-                    
-                    [mmedgeoff]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmswatershed.html b/python/plugins/sextante/pymorph/html/morph/morph/mmswatershed.html
deleted file mode 100644
index 64ad2845c33f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmswatershed.html
+++ /dev/null
@@ -1,195 +0,0 @@
-
-  
-    
-    mmswatershed
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmskiz]
-              
-                  [Up]
-                  
-                  [mmthick]
-              Thinning And Thickening
        
-    
        mmswatershed
-      
        
-      Detection of similarity-based watershed from markers.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmswatershed(
-                  
-          f, 
-          g, 
-          B = None, 
-          LINEREG = "LINES"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        gImage          Gray-scale (uint8 or uint16) or binary image.
-                          
        Marker image. If binary, each connected component is an object marker. If gray, it is assumed it is a labeled image.
        BStructuring Element
        (watershed connectivity)
        Default: 
-                      None (3x3 elementary cross)
-                    
        LINEREGString
        'LINES' or ' REGIONS'.
        Default: 
-                      "LINES"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmswatershed creates the image 
-          y by detecting the domain of the catchment basins of 
-          f indicated by 
-          g, according with the connectivity defined by 
-          B. This watershed is a modified version where each basin is defined by a similarity criterion between pixels. The original watershed is normally applied to the gradient of the image. In this case, the gradient is taken internally. According to the flag LINEREG 
-          y will be a labeled image of the catchment basins domain or just a binary image that presents the watershed lines. The implementation of this function is based on LotuFalc:00.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical
        
-          
        
-            
        
-              
        >>> f = uint8([
-    [0,  0,  0,  0,  0,  0,  0],
-    [0,  1,  0,  0,  0,  1,  0],
-    [0,  1,  0,  0,  0,  1,  0],
-    [0,  1,  1,  1,  1,  1,  0],
-    [0,  1,  0,  0,  0,  0,  0],
-    [0,  0,  0,  0,  0,  0,  0]])
        
-              
        
-              
        >>> m = uint8([
-    [0,  0,  0,  0,  0,  0,  0],
-    [0,  1,  0,  0,  0,  0,  0],
-    [0,  0,  0,  0,  0,  0,  0],
-    [0,  0,  0,  0,  0,  0,  0],
-    [0,  0,  0,  0,  0,  0,  0],
-    [0,  0,  0,  2,  0,  0,  0]])
        
-              
        
-              
        >>> print mmswatershed(f,m,mmsecross(),'REGIONS')
        
-              
        [[2 2 2 2 2 2 2]
- [2 1 2 2 2 1 2]
- [2 1 2 2 2 1 2]
- [2 1 1 1 1 1 2]
- [2 1 2 2 2 2 2]
- [2 2 2 2 2 2 2]]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmswatershed(f, g, B=None, LINEREG="LINES"):
-    if B is None: B = mmsecross()
-    print 'Not implemented yet'
-    return None
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmcwatershedDetection of watershed from markers.
        mmwatershedWatershed detection.
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmskiz]
-                
-                    [Up]
-                    
-                    [mmthick]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmsymdif.html b/python/plugins/sextante/pymorph/html/morph/morph/mmsymdif.html
deleted file mode 100644
index 72316f4c044f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmsymdif.html
+++ /dev/null
@@ -1,215 +0,0 @@
-
-  
-    
-    mmsymdif
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsubm]
-              
-                  [Up]
-                  
-                  [mmunion]
-              Operations
        
-    
        mmsymdif
-      
        
-      Symmetric difference between two images
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmsymdif(
-                  
-          f1, 
-          f2
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        f2Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        i
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmsymdif creates the image 
-          y by taken the union of the  subtractions of 
-          f1 from 
-          f2 and 
-          f2 from 
-          f1. When 
-          f1 and 
-          f2 are binary images, 
-          y represents the set of points that are in 
-          f1 and not in 
-          f2 or that are  in 
-          f2 and not in 
-          f1 .
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Gray scale image:
        
-          
        
-            
        
-              
        >>> a = uint8([1, 2, 3, 4, 5])
        
-              
        
-              
        >>> b = uint8([5, 4, 3, 2, 1])
        
-              
        
-              
        >>> print mmsymdif(a,b)
        
-              
        [4 2 0 2 4]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> c = mmreadgray('tplayer1.tif')
        
-              
        
-              
        >>> d = mmreadgray('tplayer2.tif')
        
-              
        
-              
        >>> e = mmsymdif(c,d)
        
-              
        
-              
        >>> mmshow(c)
        
-              
        
-              
        >>> mmshow(d)
        
-              
        
-              
        >>> mmshow(e)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        cde
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmsymdif(f1, f2):
-    y = mmunion(mmsubm(f1,f2),mmsubm(f2,f1))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmsubmSubtraction of two images, with saturation.
        mmunionUnion of images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsubm]
-                
-                    [Up]
-                    
-                    [mmunion]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmtext.html b/python/plugins/sextante/pymorph/html/morph/morph/mmtext.html
deleted file mode 100644
index 3ac7411a269f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmtext.html
+++ /dev/null
@@ -1,1544 +0,0 @@
-
-  
-    
-    mmtext
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmdrawv]
-              
-                  [Up]
-                  
-                  [mmconcat]
-              Image Creation
        
-    
        mmtext
-      
        
-      Create a binary image of a text.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmtext(
-                  
-          txt
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        txtString
        Text to be written.
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmtext creates the binary image 
-          y of the text 
-          txt. The background of 
-          y is 0, while its foreground is 1. The text should be composed only by lower and upper case letters.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmtext(txt):
-    from Numeric import reshape, array
-    FontDft = mmbinary([
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   1,   0,   0,   0,   0,
-     0,   1,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   1,   0,
-     0,   0,   0,   0,   1,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   1,   0,   0,   1,   0,   0,
-     0,   1,   0,   1,   0,   0,   1,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   1,   0,   0,
-     0,   0,   1,   0,   0,   1,   0,   1,   0,
-     0,   0,   1,   0,   0,   1,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   1,   1,   1,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   1,   1,   0,   0,
-     0,   0,   1,   1,   1,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   1,   1,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   1,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   1,   0,   0,
-     0,   0,   0,   0,   1,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   0,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   1,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   1,   1,   1,   0,
-     0,   1,   0,   1,   0,   0,   0,   1,   0,
-     0,   1,   0,   1,   0,   0,   1,   1,   0,
-     0,   1,   0,   0,   1,   1,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   0,   0,
-     0,   1,   0,   0,   1,   0,   0,   0,   0,
-     0,   1,   1,   1,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   1,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   0,   0,   0,   1,   1,   0,
-     0,   1,   0,   1,   0,   1,   0,   1,   0,
-     0,   1,   0,   1,   0,   1,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   1,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   1,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   1,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   1,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   1,   0,   1,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-    55,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   1,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   1,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   1,   1,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   1,   0,
-     0,   0,   0,   1,   0,   0,   0,   1,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   1,   1,   0,   0,
-     0,   1,   0,   1,   1,   0,   0,   0,   0,
-     0,   1,   1,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   1,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   0,   1,   1,   0,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   1,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   1,   1,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   1,   1,   1,   0,   0,
-     0,   0,   1,   1,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   1,   1,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   0,   1,   0,   0,   1,   0,
-     0,   1,   0,   1,   0,   1,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   1,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   0,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   1,   1,   0,   0,
-     0,   0,   1,   1,   1,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   1,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   1,   1,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   1,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   1,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   1,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   1,   1,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   1,   1,   1,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   1,   1,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   1,   0,   0,   0,
-     0,   0,   0,   0,   1,   1,   0,   0,   0,
-     0,   0,   0,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   0,   0,   0,   1,   0,   0,   0,   0,
-     0,   1,   1,   1,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0,
-     0,   0,   0,   0,   0,   0,   0,   0,   0])
-    FIRST_CHAR =  32
-    LAST_CHAR  = 126
-    N_CHARS    = LAST_CHAR - FIRST_CHAR
-    WIDTH_DFT  =   9
-    HEIGHT_DFT =  15
-    FontDft = reshape(FontDft,(HEIGHT_DFT * N_CHARS, WIDTH_DFT))
-    txt_i = array(txt,'l') - FIRST_CHAR
-    for i in range(len(txt_i)):
-      ind = txt_i[i]
-      assert ind < (LAST_CHAR-FIRST_CHAR),'mmtext, code not allowed'
-      if i == 0:
-        y = FontDft[ind*HEIGHT_DFT:(ind+1)*HEIGHT_DFT,:]
-      else:
-        y = mmconcat('w',y,FontDft[ind*HEIGHT_DFT:(ind+1)*HEIGHT_DFT,:])
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmdrawv]
-                
-                    [Up]
-                    
-                    [mmconcat]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmthick.html b/python/plugins/sextante/pymorph/html/morph/morph/mmthick.html
deleted file mode 100644
index 1fac898552ce..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmthick.html
+++ /dev/null
@@ -1,193 +0,0 @@
-
-  
-    
-    mmthick
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmswatershed]
-              
-                  [Up]
-                  
-                  [mmthin]
-              Thinning And Thickening
        
-    
        mmthick
-      
        
-      Image transformation by thickening.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmthick(
-                  
-          f, 
-          Iab = None, 
-          n = -1, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        IabInterval
        Default: 
-                      None (mmhomothick)
-                    
        nDouble      Non-negative integer.
-                          
        Number of iterations.
        Default: 
-                      -1
-                    
        thetaDouble
        Degrees of rotation: 45, 90, or 180.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or ' ANTI-CLOCKWISE'
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmthick creates the binary image 
-          y by performing a thickening of the binary image 
-          f. The number of iterations of the thickening is 
-          n and each iteration is performed by union of 
-          f with the points that are detected in 
-          f by the hit-miss operators characterized by rotations of 
-          theta degrees of the interval 
-          Iab.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmthick(f, Iab=None, n=-1, theta=45, DIRECTION="CLOCKWISE"):
-    from Numeric import product
-    from string import upper
-    if Iab is None: Iab = mmhomothick()
-    DIRECTION = upper(DIRECTION)            
-    assert mmisbinary(f),'f must be binary image'
-    if n == -1: n = product(f.shape)
-    y = f
-    zero = mmintersec(f,0)
-    for i in range(n):
-        aux = zero
-        for t in range(0,360,theta):
-            sup = mmsupgen( y, mminterot(Iab, t, DIRECTION))
-            aux = mmunion( aux, sup)
-            y = mmunion( y, sup)
-        if mmisequal(aux,zero): break
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmcthickImage transformation by conditional thickening.
        mmthinImage transformation by thinning.
        mmhomothickInterval for homotopic thickening.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmswatershed]
-                
-                    [Up]
-                    
-                    [mmthin]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmthin.html b/python/plugins/sextante/pymorph/html/morph/morph/mmthin.html
deleted file mode 100644
index 2f9a25969907..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmthin.html
+++ /dev/null
@@ -1,234 +0,0 @@
-
-  
-    
-    mmthin
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmthick]
-              
-                  [Up]
-                  
-                  [mmwatershed]
-              Thinning And Thickening
        
-    
        mmthin
-      
        
-      Image transformation by thinning.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmthin(
-                  
-          f, 
-          Iab = None, 
-          n = -1, 
-          theta = 45, 
-          DIRECTION = "CLOCKWISE"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Binary image.
-                        
        IabInterval
        Default: 
-                      None (mmhomothin)
-                    
        nDouble      Non-negative integer.
-                          
        Number of iterations.
        Default: 
-                      -1
-                    
        thetaDouble
        Degrees of rotation: 45, 90, or 180.
        Default: 
-                      45
-                    
        DIRECTIONString
        'CLOCKWISE' or ' ANTI-CLOCKWISE'
        Default: 
-                      "CLOCKWISE"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmthin creates the binary image 
-          y by performing a thinning of the binary image 
-          f. The number of iterations of the thinning is 
-          n and each iteration is performed by subtracting the points that are detect in 
-          f by hit-miss operators characterized by rotations of 
-          theta of the interval 
-          Iab. When 
-          n is infinite and the interval is 
-          mmhomothin (default conditions), 
-          mmthin gives the skeleton by thinning.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('scissors.tif')
        
-              
        
-              
        >>> f1=mmthin(f)
        
-              
        
-              
        >>> mmshow(f,f1) # skeleton
        
-              
        
-              
        >>> f2=mmthin(f1,mmendpoints(),15) # prunning 15 pixels
        
-              
        
-              
        >>> mmshow(f,f2) # prunned skeleton
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        f,f1f,f2
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmthin(f, Iab=None, n=-1, theta=45, DIRECTION="CLOCKWISE"):
-    from Numeric import product
-    from string import upper
-    if Iab is None: Iab = mmhomothin()
-    DIRECTION = upper(DIRECTION)            
-    assert mmisbinary(f),'f must be binary image'
-    if n == -1: n = product(f.shape)
-    y = f
-    zero = mmintersec(f,0)
-    for i in range(n):
-        aux = zero
-        for t in range(0,360,theta):
-            sup = mmsupgen( y, mminterot(Iab, t, DIRECTION))
-            aux = mmunion( aux, sup)
-            y = mmsubm( y, sup)
-        if mmisequal(aux,zero): break
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmcthinImage transformation by conditional thinning.
        mmthickImage transformation by thickening.
        mmendpointsInterval to detect end-points.
        mmhomothinInterval for homotopic thinning.
        mmse2hmtCreate a Hit-or-Miss Template (or interval) from a pair of structuring elements.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmthick]
-                
-                    [Up]
-                    
-                    [mmwatershed]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmthreshad.html b/python/plugins/sextante/pymorph/html/morph/morph/mmthreshad.html
deleted file mode 100644
index 5ef74ded934f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmthreshad.html
+++ /dev/null
@@ -1,213 +0,0 @@
-
-  
-    
-    mmthreshad
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmse2hmt]
-              
-                  [Up]
-                  
-                  [mminfcanon]
-              Sup-generating And Inf-generating
        
-    
        mmthreshad
-      
        
-      Threshold (adaptive)
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmthreshad(
-                  
-          f, 
-          f1, 
-          f2 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        f1Image          Gray-scale (uint8 or uint16) image.
-                          
        lower value
        f2Image          Gray-scale (uint8 or uint16) image.
-                          
        upper value
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmthreshad creates the image 
-          y as the threshold of the image 
-          f by the images 
-          f1 and 
-          f2. A pixel in 
-          y has the value 1 when the value of the corresponding pixel in 
-          f is between the values of the corresponding pixels in 
-          f1 and 
-          f2.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = mmreadgray('keyb.tif')
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> b = mmthreshad(a,uint8(10), uint8(50))
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-              
        >>> c = mmthreshad(a,238)
        
-              
        Warning: Converting input image from int32 to uint8.
        
-              
        >>> mmshow(c)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        c
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmthreshad(f, f1, f2=None):
-    if f2 is None: 
-      y = mmbinary(f1 <= f)
-    else:
-      y = mmbinary((f1 <= f) & (f <= f2))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmgrayConvert a binary image into a gray-scale image.
        mmbinaryConvert a gray-scale image into a binary image
        mmcmpCompare two images pixelwisely.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmse2hmt]
-                
-                    [Up]
-                    
-                    [mminfcanon]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmtoggle.html b/python/plugins/sextante/pymorph/html/morph/morph/mmtoggle.html
deleted file mode 100644
index ca48e2a17950..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmtoggle.html
+++ /dev/null
@@ -1,272 +0,0 @@
-
-  
-    
-    mmtoggle
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmneg]
-              
-                  [Up]
-                  
-                  [mmaddm]
-              Operations
        
-    
        mmtoggle
-      
        
-      Image contrast enhancement or classification by the toggle operator.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmtoggle(
-                  
-          f, 
-          f1, 
-          f2, 
-          OPTION = "GRAY"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        f1Image          Gray-scale (uint8 or uint16) image.
-                        
        f2Image          Gray-scale (uint8 or uint16) image.
-                        
        OPTIONString
        Values: 'BINARY' or 'GRAY'.
        Default: 
-                      "GRAY"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        binary image if option is 'BINARY' or same type as 
-                      f
-                    
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmtoggle creates the image 
-          y that is an enhancement or classification of the image 
-          f by the toggle operator, with parameters 
-          f1 and 
-          f2. If the OPTION is 'GRAY', it performs an enhancement and, if the OPTION is 'BINARY', it performs a binary classification. In the enhancement, a pixel takes the value of the corresponding pixel in 
-          f1 or 
-          f2, according to a minimum distance criterion from 
-          f to 
-          f1 or 
-          f to 
-          f2. In the classification, the pixels in 
-          f nearest to 
-          f1 receive the value 0 , while the ones nearest to 
-          f2 receive the value 1.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Gray-scale option:
        
-          
        
-            
        
-              
        >>> f = uint8([0,1,2,3,4,5,6])
        
-              
        
-              
        >>> print f
        
-              
        [0 1 2 3 4 5 6]
        
-              
        >>> f1 = uint8([0,0,0,0,0,0,0])
        
-              
        
-              
        >>> print f1
        
-              
        [0 0 0 0 0 0 0]
        
-              
        >>> f2 = uint8([6,6,6,6,6,6,6])
        
-              
        
-              
        >>> print f2
        
-              
        [6 6 6 6 6 6 6]
        
-              
        >>> print mmtoggle(f,f1,f2)
        
-              
        [0 0 0 6 6 6 6]
        
-            
        
-          
        
-          
        
-            
        
-              
        >>> a = mmreadgray('angiogr.tif')
        
-              
        
-              
        >>> b = mmero(a,mmsedisk(2))
        
-              
        
-              
        >>> c = mmdil(a,mmsedisk(2))
        
-              
        
-              
        >>> d = mmtoggle(a,b,c)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(d)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ad
        
-          
        
-          
        Binary option:
        
-          
        
-            
        
-              
        >>> e = mmreadgray('lenina.tif')
        
-              
        
-              
        >>> f = mmero(e,mmsedisk(2))
        
-              
        
-              
        >>> g = mmdil(e,mmsedisk(2))
        
-              
        
-              
        >>> h = mmtoggle(e,f,g,'BINARY')
        
-              
        
-              
        >>> mmshow(e)
        
-              
        
-              
        >>> mmshow(h)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        eh
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        Gray-scale option
        
-          
        
-            
-          
        
-          
        Binary option
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-          f1 must be less or equal 
-          f and 
-          f must be less or equal 
-          f2.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmtoggle(f, f1, f2, OPTION="GRAY"):
-    from string import upper
-    y=mmbinary(mmsubm(f,f1),mmsubm(f2,f))
-    if upper(OPTION) == 'GRAY':
-        t=mmgray(y)
-        y=mmunion(mmintersec(mmneg(t),f1),mmintersec(t,f2))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmthreshadThreshold (adaptive)
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmneg]
-                
-                    [Up]
-                    
-                    [mmaddm]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmunion.html b/python/plugins/sextante/pymorph/html/morph/morph/mmunion.html
deleted file mode 100644
index 34e6d35aaae1..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmunion.html
+++ /dev/null
@@ -1,336 +0,0 @@
-
-  
-    
-    mmunion
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmsymdif]
-              
-                  [Up]
-                  
-                  [mmimg2se]
-              Operations
        
-    
        mmunion
-      
        
-      Union of images.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmunion(
-                  
-          f1, 
-          f2, 
-          f3 = None, 
-          f4 = None, 
-          f5 = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f1Image          Gray-scale (uint8 or uint16) or binary image.
-                        
        f2Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant
        f3Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant.
        Default: 
-                      None
-                    
        f4Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant.
        Default: 
-                      None
-                    
        f5Image          Gray-scale (uint8 or uint16) or binary image.
-                          
        Or constant.
        Default: 
-                      None
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmunion creates the image 
-          y by taking the pixelwise maximum between the images 
-          f1, f2, f3, f4, and 
-          f5. When 
-          f1, f2, f3, f4, and 
-          f5 are binary images, 
-          y represents the union of them.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example:
        
-          
        
-            
        
-              
        >>> f=uint8([255, 255,  0,  10,   0, 255, 250])
        
-              
        
-              
        >>> print 'f=',f
        
-              
        f= [255 255   0  10   0 255 250]
        
-              
        >>> g=uint8([  0,  40, 80, 140, 250,  10,  30])
        
-              
        
-              
        >>> print 'g=',g
        
-              
        g= [  0  40  80 140 250  10  30]
        
-              
        >>> print mmunion(f, g)
        
-              
        [255 255  80 140 250 255 250]
        
-              
        >>> print mmunion(f, 255)
        
-              
        Warning: Converting input image from int32 to uint8.
-[255 255 255 255 255 255 255]
        
-            
        
-          
        
-          
        Binary image
        
-          
        
-            
        
-              
        >>> a = mmreadgray('form-ok.tif')
        
-              
        
-              
        >>> b = mmreadgray('form-1.tif')
        
-              
        
-              
        >>> c = mmunion(a,b)
        
-              
        
-              
        >>> mmshow(a)
        
-              
        
-              
        >>> mmshow(b)
        
-              
        
-              
        >>> mmshow(c)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ab
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        c
        
-          
        
-          
        Binary with gray-scale image:
        
-          
        
-            
        
-              
        >>> d = mmreadgray('danaus.tif')
        
-              
        
-              
        >>> e = mmcmp(d,'<',80)
        
-              
        
-              
        >>> f = mmunion(d,mmgray(e))
        
-              
        
-              
        >>> mmshow(d)
        
-              
        
-              
        >>> mmshow(e)
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        de
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        f
        
-          
        
-          
        Gray scale image:
        
-          
        
-            
        
-              
        >>> g = mmreadgray('tplayer1.tif')
        
-              
        
-              
        >>> h = mmreadgray('tplayer2.tif')
        
-              
        
-              
        >>> i = mmreadgray('tplayer3.tif')
        
-              
        
-              
        >>> j = mmunion(g,h,i)
        
-              
        
-              
        >>> mmshow(g)
        
-              
        
-              
        >>> mmshow(h)
        
-              
        
-              
        >>> mmshow(i)
        
-              
        
-              
        >>> mmshow(j)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                  
-                
-              
-            
        ghi
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        j
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Equation
        
-      
        
-        
        
-          
        union:
        
-          
        
-            
-          
        
-          
        generalized union:
        
-          
        
-            
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmunion(f1, f2, f3=None, f4=None, f5=None):
-    from Numeric import maximum
-    y = maximum(f1,f2)
-    if f3: y = maximum(y,f3)
-    if f4: y = maximum(y,f4)
-    if f5: y = maximum(y,f5)
-    y = y.astype(f1.typecode())
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmfreedomControl automatic data type conversion.
        mmintersecIntersection of images.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmsymdif]
-                
-                    [Up]
-                    
-                    [mmimg2se]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmvdome.html b/python/plugins/sextante/pymorph/html/morph/morph/mmvdome.html
deleted file mode 100644
index d15b7d260d07..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmvdome.html
+++ /dev/null
@@ -1,120 +0,0 @@
-
-  
-    
-    mmvdome
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmplot]
-              
-                  [Up]
-                  
-                  [mmadd4dil]
-              Obsolete
        
-    
        mmvdome
-      
        
-      Obsolete, use mmvmax.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmvdome(
-                  
-          f, 
-          v = 1, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        vDouble
        Volume parameter.
        Default: 
-                      1
-                    
        BcStructuring Element
        Structuring element (connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-                      The correct name for this operator 
-          mmvdome is mmvmax.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmvdome(f, v=1, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    y = mmhmax(f,v,Bc);
-    return y
-    
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmplot]
-                
-                    [Up]
-                    
-                    [mmadd4dil]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmvmax.html b/python/plugins/sextante/pymorph/html/morph/morph/mmvmax.html
deleted file mode 100644
index cbd70094e87f..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmvmax.html
+++ /dev/null
@@ -1,216 +0,0 @@
-
-  
-    
-    mmvmax
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmhmin]
-              
-                  [Up]
-                  
-                  [mmhmax]
-              Connected Operators
        
-    
        mmvmax
-      
        
-      Remove domes with volume less than v.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmvmax(
-                  
-          f, 
-          v = 1, 
-          Bc = None
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) image.
-                        
        vDouble
        Volume parameter.
        Default: 
-                      1
-                    
        BcStructuring Element
        Structuring element (connectivity).
        Default: 
-                      None (3x3 elementary cross)
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmvmax This operator removes connected domes with volume less than 
-          v. This function is very similar to 
-          mmhmax, but instead of using a gray scale criterion (contrast) for the dome, it uses a volume criterion.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        Numerical example:
        
-          
        
-            
        
-              
        >>> a = uint8([
-    [4,  3,  6,  1,  3,  5,  2],
-    [2,  9,  6,  1,  6,  7,  3],
-    [8,  9,  3,  2,  4,  9,  4],
-    [3,  1,  2,  1,  2,  4,  2]])
        
-              
        
-              
        >>> print mmvmax(a,10,mmsebox())
        
-              
        [[4 3 6 1 3 5 2]
- [2 6 6 1 5 5 3]
- [6 6 3 2 4 5 4]
- [3 1 2 1 2 4 2]]
        
-            
        
-          
        
-          
        Signal example:
        
-          
        Image example:
        
-          
        
-            
        
-              
        >>> f = mmreadgray('astablet.tif')
        
-              
        
-              
        >>> mmshow(f)
        
-              
        
-              
        >>> fb = mmvmax(f,80000)
        
-              
        
-              
        >>> mmshow(fb)
        
-              
        
-              
        >>> mmshow(mmregmax(fb))
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        ffb
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        mmregmax(fb)
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmvmax(f, v=1, Bc=None):
-    if Bc is None: Bc = mmsecross()
-    print 'Not implemented yet'
-    return None
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmfreedomControl automatic data type conversion.
        mmhminRemove basins with contrast less than h.
        mmareaopenArea opening
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmhmin]
-                
-                    [Up]
-                    
-                    [mmhmax]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/mmwatershed.html b/python/plugins/sextante/pymorph/html/morph/morph/mmwatershed.html
deleted file mode 100644
index 47f4ed75818b..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/mmwatershed.html
+++ /dev/null
@@ -1,213 +0,0 @@
-
-  
-    
-    mmwatershed
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [mmthin]
-              
-                  [Up]
-                  
-                  [mmhistogram]
-              Thinning And Thickening
        
-    
        mmwatershed
-      
        
-      Watershed detection.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        y = 
-          mmwatershed(
-                  
-          f, 
-          Bc = None, 
-          LINEREG = "LINES"
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        fImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        BcStructuring Element
        ( connectivity)
        Default: 
-                      None (3x3 elementary cross)
-                    
        LINEREGString
        'LINES' or ' REGIONS'.
        Default: 
-                      "LINES"
-                    
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        yImage          Gray-scale (uint8 or uint16) or binary image.
-                        
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          mmwatershed creates the image 
-          y by detecting the domain of the catchment basins of 
-          f, according to the connectivity defined by 
-          Bc. According to the flag LINEREG 
-          y will be a labeled image of the catchment basins domain or just a binary image that presents the watershed lines. The implementation of this function is based on VincSoil:91.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> f=mmreadgray('astablet.tif')
        
-              
        
-              
        >>> grad=mmgradm(f)
        
-              
        
-              
        >>> w1=mmwatershed(grad,mmsebox())
        
-              
        
-              
        >>> w2=mmwatershed(grad,mmsebox(),'REGIONS')
        
-              
        
-              
        >>> mmshow(grad)
        
-              
        
-              
        >>> mmshow(w1)
        
-              
        
-              
        >>> mmlblshow(w2)
        
-              
        
-            
        
-            
-              
-                
-                  
-                  
-                  
-                
-                
-                  
-                  
-                  
-                
-              
-            
        gradw1
        
-            
-              
-                
-                  
-                  
-                
-                
-                  
-                  
-                
-              
-            
        w2
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Limitations
        
-      
        
-        
        
-                      The structuring elements allowed are the elementary cross (4-connected) and the elementary square (8-connected).
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def mmwatershed(f, Bc=None, LINEREG="LINES"):
-    from string import upper
-    if Bc is None: Bc = mmsecross()
-    return mmcwatershed(f,mmregmin(f,Bc),upper(LINEREG))
-    return y
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        mmcwatershedDetection of watershed from markers.
        mmfreedomControl automatic data type conversion.
        mmseboxCreate a box structuring element.
        mmsecrossDiamond structuring element and elementary 3x3 cross.
        mmswatershedDetection of similarity-based watershed from markers.
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [mmthin]
-                
-                    [Up]
-                    
-                    [mmhistogram]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/uint16.html b/python/plugins/sextante/pymorph/html/morph/morph/uint16.html
deleted file mode 100644
index aa4e78d95286..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/uint16.html
+++ /dev/null
@@ -1,139 +0,0 @@
-
-  
-    
-    uint16
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [uint8]
-              
-                  [Up]
-                  
-                  [mmframe]
-              Data Type Conversion
        
-    
        uint16
-      
        
-      Convert an image to a uint16 image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        img = 
-          uint16(
-                  
-          f
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fImage
        Any image
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        imgImage
        The converted image
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          uint16 clips the input image between the values 0 and 65535 and converts it to the unsigned 16-bit datatype.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = int32([-3,0,8,100000])
        
-              
        
-              
        >>> print uint16(a)
        
-              
        [    0     0     8 65535]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def uint16(f):
-    from Numeric import array, clip
-    img = array(clip(f,0,65535)).astype('w')
-    return img
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        int32Convert an image to an int32 image.
        uint8Convert an image to an uint8 image.
        mmdatatypeReturn the image datatype string
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [uint8]
-                
-                    [Up]
-                    
-                    [mmframe]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/morph/uint8.html b/python/plugins/sextante/pymorph/html/morph/morph/uint8.html
deleted file mode 100644
index 039ea065f9b4..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/morph/uint8.html
+++ /dev/null
@@ -1,140 +0,0 @@
-
-  
-    
-    uint8
-    
-  
-  
-    
-      
-        
-        
-      
-    
        
-                  [int32]
-              
-                  [Up]
-                  
-                  [uint16]
-              Data Type Conversion
        
-    
        uint8
-      
        
-      Convert an image to an uint8 image.
-
-    
        
-    
        
-      
        Synopsis
        
-      
        
-        
        img = 
-          uint8(
-                  
-          f
-                  )
-        
        
-        
        Implemented in 
-          Python.
-        
        
-        
        
-          
        Input
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        fImage
        Any image
        
-          
        
-        
        
-        
        
-          
        Output
        
-          
        
-            
-              
-                
-                  
-                  
-                
-              
-            
        imgImage          Gray-scale uint8 image.
-                          
        The converted image
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Description
        
-      
        
-        
        
-          uint8 clips the input image between the values 0 and 255 and converts it to the unsigned 8-bit datatype.
-                  
-        
        
-      
        
-    
        
-    
        
-      
        Examples
        
-      
        
-        
        
-          
        
-            
        
-              
        >>> a = int32([-3,0,8,600])
        
-              
        
-              
        >>> print uint8(a)
        
-              
        [  0   0   8 255]
        
-            
        
-          
        
-        
        
-      
        
-    
        
-    
        
-      
        Source Code
        
-      
        
-        
        -def uint8(f):
-    from Numeric import array, clip
-    img = array(clip(f,0,255)).astype('b')
-    return img
-    
        
-      
        
-    
        
-    
        
-      
        See also
        
-      
        
-        
-          
-            
-              
-              
-            
-            
-              
-              
-            
-            
-              
-              
-            
-          
-        
        uint16Convert an image to a uint16 image.
        int32Convert an image to an int32 image.
        mmdatatypeReturn the image datatype string
        
-      
        
-    
        
-    
        
-      
-        
-          
-          
-        
-        
-          
-        
-      
        
-                    [int32]
-                
-                    [Up]
-                    
-                    [uint16]
-                Python
        Copyright (c) 2003, Roberto A. Lotufo, UNICAMP-University of Campinas; Rubens C. Machado, CenPRA-Renato Archer Research Center.
        
-    
        
-  
-
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/html/morph/tbxdok.css b/python/plugins/sextante/pymorph/html/morph/tbxdok.css
deleted file mode 100644
index a986fa6f45d7..000000000000
--- a/python/plugins/sextante/pymorph/html/morph/tbxdok.css
+++ /dev/null
@@ -1,291 +0,0 @@
-
-BODY {
-	color: #000000;
-	background: white none;
-	text-decoration: none;
-	font-family: sans-serif;
-	font-style: normal;
-	font-size: 10pt;
-}
-P {
-	margin: 0 0 0 0;		/* top right bottom left */
-}
-
-/*
- * --------------------------------------------------------
- *		Navigation
- * --------------------------------------------------------
- */
-table.topNav {
-	width: 100% 
-	border: 0 
-	padding: 2mm 0 2mm 1mm;
-	background: silver none;
-	font-style: normal;
-	font-size: small;
-}
-table.topNav tr td.title {
-	text-align: right;
-	font-weight: bold;
-	font-style: italic;
-	font-size: medium;
-	color:   #FFFFFF;
-	padding: 1mm 1mm 1mm 1mm;
-}
-
-table.botNav {
-	border-top: 2 ridge blue;
-	width: 80% 
-	border: 0 
-	padding: 0 0 0 0;
-	margin: 10mm 0 0 0;		/* top right bottom left */
-}
-table.botNav tr td.index {
-	text-align: center;
-}
-table.botNav tr td.xhtml {
-	text-align: right;
-}
-table.botNav tr td.sponsor {
-	text-align: right;
-}
-table.botNav tr td.copyright {
-	text-align: center;
-	font-style: italic;
-	font-size: small;
-}
-
-table.biblio {
-	margin: 0 0 5mm 0;
-}
-table.biblio tr td.key {
-	padding: 0 10px 0 0;
-	text-align: right;
-	font-weight: bold;
-	font-family: monospace;
-	font-size: 9pt;
-	width: 10% 
-}
-
-/*
- * --------------------------------------------------------
- *		Headers
- * --------------------------------------------------------
- */
-H1 {
-	text-align: center;
-	color:   #993300;
-	padding: 0 0 0 0;
-}
-H1 span.subtitle {
-	color:   #993300;
-	font-style: italic;
-	font-weight: normal;
-	font-size: smaller;
-}
-H2 {
-	color:   #993300;
-	margin: 5px 0 3px 0;		/* top right bottom left */
-	padding: 2mm 0 0 0;
-}
-H2.index, H2.fulllist {
-	border-top: 2 ridge blue;
-	font-size: large;
-	font-style: italic;
-	margin: 0 0 0 0;		/* top right bottom left */
-	padding: 2mm 0 0 0;
-}
-H3 {
-	color:   #993300;
-	margin: 5px 0 2px 0;		/* top right bottom left */
-	padding: 2mm 0 0 0;
-}
-H4 {
-	color:   #993300;
-	margin: 5px 0 2px 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-
-ol {
-	margin: 5px 0 0 10mm;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-ol li {
-	margin: 5px 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-ul {
-	margin: 5px 0 0 10mm;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-ul li {
-	margin: 5px 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-p {
-	margin: 5px 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-
-/*
- * --------------------------------------------------------
- *		Blocks
- * --------------------------------------------------------
- */
-
-div.h1 {
-	margin: 0 0 0 0;		/* top right bottom left */
-}
-div.h2 {
-	margin: 0 0 5mm 5mm;		/* top right bottom left */
-}
-div.h3 {
-	margin: 0 0 0 0;		/* top right bottom left */
-}
-div.h4 {
-	margin: 0 0 0 2mm;		/* top right bottom left */
-}
-
-table.deflist {
-	margin: 0 0 0 5mm;
-	padding: 0 0 0 0;
-	width: 100%;
-}
-table.deflist tbody tr {
-	margin: 0 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-table.deflist tbody tr td.term {
-	margin: 0 0 0 0;		/* top right bottom left */
-	padding: 0 3mm 0 0;
-	width: 15mm;
-}
-table.deflist tbody tr td.def {
-	margin: 0 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-
-table.images {
-	margin:  0 0 0 0;			/* top right bottom left */
-}
-table.images tbody tr td.spare {
-	width: 100%;
-}
-table.images tbody tr.image td {
-	padding: 2mm 2mm 2mm 2mm;
-}
-table.images tbody tr.title {
-	text-align: center;
-	font-family: monospace;
-}
-
-div.prototype {
-	margin: 2mm 0 2mm 0;		/* top right bottom left */
-	font-family: monospace;
-	font-weight: bold;
-	font-size: 10pt;
-}
-div.example {
-	background: #ffff99;
-	padding: 2mm 3mm 2mm 3mm;
-	margin:  0 0 1mm 0;			/* top right bottom left */
-	font-size:  9pt;
-}
-div.example pre.computer {
-	color:   red;
-}
-div.example pre.user {
-	font-weight: bold;
-	color:   black;
-}
-div.example pre {
-	margin:  0 0 0 0;				/* top right bottom left */
-	padding: 0 0 0 0;
-}
-div.input, div.output {
-	font-family: monospace;
-	font-size: 9pt;
-}
-
-div.eqfig {
-	border-top: 1 ridge #ffff99;
-	border-bottom: 1 ridge #ffff99;
-	border-left: 1 ridge #ffff99;
-	border-right: 1 ridge #ffff99;
-	width: 100%;
-	margin: 2mm 0 2mm 0;
-	padding: 2mm 2mm 2mm 2mm;
-}
-div.figure {
-	margin: 2mm 0 2mm 0;
-	padding: 2mm 2mm 2mm 2mm;
-}
-
-div.bridge {
-	font-weight: bold;
-	padding: 0 0 0 0;
-	margin: 2mm 0 1mm 0;
-}
-
-pre.listing {
-	background: #ffff99;
-	padding: 2mm 3mm 2mm 3mm;
-	margin:  2mm 3mm 2mm 0;			/* top right bottom left */
-	font-size:  9pt;
-}
-
-span.par {
-	font-family: monospace;
-	font-size: 10pt;
-	font-weight: bold;
-}
-span.fun {
-	font-family: monospace;
-	font-size: 10pt;
-	font-weight: bold;
-}
-span.type {
-	font-family: monospace;
-	font-weight: normal;
-}
-
-/*
- * --------------------------------------------------------
- *		Links
- * --------------------------------------------------------
- */
-A:link {
-	color: blue;
-	text-decoration: underline;
-}
-A:visited {
-	color: purple;
-	text-decoration: underline;
-}
-A:active {
-	color: red;
-	text-decoration: underline;
-}
-/*
- * --------------------------------------------------------
- *		Without class
- * --------------------------------------------------------
- */
-table {
-	margin: 0 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-	width: 100%;
-}
-table tr {
-	margin: 0 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-table tr td {
-	margin: 0 0 0 0;		/* top right bottom left */
-	padding: 0 0 0 0;
-}
-
-dl dd {
-	margin: 0 0 0 5mm;		/* top right bottom left */
-}
-
diff --git a/python/plugins/sextante/pymorph/mmorph.py b/python/plugins/sextante/pymorph/mmorph.py
deleted file mode 100644
index bb58bb097cd0..000000000000
--- a/python/plugins/sextante/pymorph/mmorph.py
+++ /dev/null
@@ -1,4517 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    mmorph.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-from __future__ import division
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-"""
-==============
-Module pymorph
-==============
-
-pymorph a powerful collection of state-of-the-art gray-scale morphological
-tools that can be applied to image segmentation, non-linear filtering,
-pattern recognition and image analysis.
-
-- `add4dilate()`   : Addition for dilation
-- `addm()`         : Addition of two images, with saturation.
-- `areaclose()`    : Area closing
-- `areaopen()`     : Area opening
-- `asf()`          : Alternating Sequential Filtering
-- `asfrec()`       : Reconstructive Alternating Sequential Filtering
-- `bench()`        : benchmarking main functions of the toolbox.
-- `binary()`       : Convert a gray-scale image into a binary image
-- `blob()`         : Blob measurements from a labeled image.
-- `bshow()`        : Generate a graphical representation of overlaid binary images.
-- `cbisector()`    : N-Conditional bisector.
-- `cdilate()`      : Dilate an image conditionally.
-- `center()`       : Center filter.
-- `cerode()`       : Erode an image conditionally.
-- `close_holes()`  : Close holes of binary and gray-scale images.
-- `close()`        : Morphological closing.
-- `closerec()`     : Closing by reconstruction.
-- `closerecth()`   : Close-by-Reconstruction Top-Hat.
-- `closeth()`      : Closing Top Hat.
-- `concat()`       : Concatenate two or more images along width, height or depth.
-- `cthick()`       : Image transformation by conditional thickening.
-- `cthin()`        : Image transformation by conditional thinning.
-- `cwatershed()`   : Detection of watershed from markers.
-- `datatype()`     : Return the image datatype string
-- `dilate()`       : Dilate an image by a structuring element.
-- `dist()`         : Distance transform.
-- `drawv()`        : Superpose points, rectangles and lines on an image.
-- `edgeoff()`      : Eliminate the objects that hit the image frame.
-- `endpoints()`    : Interval to detect end-points.
-- `erode()`        : Erode an image by a structuring element.
-- `flood()`        : Flooding filter- h,v,a-basin and dynamics (depth, area, volume)
-- `frame()`        : Create a frame image.
-- `freedom()`      : Control automatic data type conversion.
-- `gdist()`        : Geodesic Distance Transform.
-- `gradm()`        : Morphological gradient.
-- `grain()`        : Gray-scale statistics for each labeled region.
-- `gray()`         : Convert a binary image into a gray-scale image.
-- `gshow()`        : Apply binary overlays as color layers on a binary or gray-scale image
-- `histogram()`    : Find the histogram of the image f.
-- `hmax()`         : Remove peaks with contrast less than h.
-- `hmin()`         : Remove basins with contrast less than h.
-- `homothick()`    : Interval for homotopic thickening.
-- `homothin()`     : Interval for homotopic thinning.
-- `img2se()`       : Create a structuring element from a pair of images.
-- `infcanon()`     : Intersection of inf-generating operators.
-- `infgen()`       : Inf-generating.
-- `infrec()`       : Inf-reconstruction.
-- `inpos()`        : Minima imposition.
-- `interot()`      : Rotate an interval
-- `intersec()`     : Intersection of images.
-- `intershow()`    : Visualize an interval.
-- `isbinary()`     : Check for binary image
-- `isolines()`     : Apply an iso-line color table to a gray-scale image.
-- `label()`        : Label a binary image.
-- `labelflat()`    : Label the flat zones of gray-scale images.
-- `lastero()`      : Last erosion.
-- `lblshow()`      : Display a labeled image assigning a random color for each label.
-- `limits()`       : Get the possible minimum and maximum of an image.
-- `mat2set()`      : Converts image representation from matrix to set
-- `maxleveltype()` : Returns the maximum value associated to an image datatype
-- `neg()`          : Negate an image.
-- `open()`         : Morphological opening.
-- `openrec()`      : Opening by reconstruction.
-- `openrecth()`    : Open-by-Reconstruction Top-Hat.
-- `openth()`       : Opening Top Hat.
-- `opentransf()`   : Open transform.
-- `pad4n()`        : pad4n
-- `patspec()`      : Pattern spectrum (also known as granulometric size density).
-- `plot()`         : Plot a function.
-- `randomcolor()`  : Apply a random color table to a gray-scale image.
-- `regmax()`       : Regional Maximum.
-- `regmin()`       : Regional Minimum (with generalized dynamics).
-- `se2hmt()`       : Create a Hit-or-Miss Template (or interval) from a pair of structuring elements.
-- `se2interval()`  : Create an interval from a pair of structuring elements.
-- `sebox()`        : Create a box structuring element.
-- `secross()`      : Diamond structuring element and elementary 3x3 cross.
-- `sedilate()`     : Dilate one structuring element by another
-- `sedisk()`       : Create a disk or a semi-sphere structuring element.
-- `seline()`       : Create a line structuring element.
-- `sereflect()`    : Reflect a structuring element
-- `serot()`        : Rotate a structuring element.
-- `seshow()`       : Display a structuring element as an image.
-- `sesum()`        : N-1 iterative Minkowski additions
-- `set2mat()`      : Converts image representation from set to matrix
-- `setrans()`      : Translate a structuring element
-- `seunion()`      : Union of structuring elements
-- `skelm()`        : Morphological skeleton (Medial Axis Transform).
-- `skelmrec()`     : Morphological skeleton reconstruction (Inverse Medial Axis Transform).
-- `skiz()`         : Skeleton of Influence Zone - also know as Generalized Voronoi Diagram
-- `subm()`         : Subtraction of two images, with saturation.
-- `supcanon()`     : Union of sup-generating or hit-miss operators.
-- `supgen()`       : Sup-generating (hit-miss).
-- `suprec()`       : Sup-reconstruction.
-- `symdiff()`       : Symmetric difference between two images
-- `text()`         : Create a binary image of a text.
-- `thick()`        : Image transformation by thickening.
-- `thin()`         : Image transformation by thinning.
-- `threshad()`     : Threshold (adaptive)
-- `toggle()`       : Image contrast enhancement or classification by the toggle operator.
-- `union()`        : Union of images.
-- `watershed()`    : Watershed detection.
-- `to_int32()`     : Convert an image to an int32 image.
-- `to_uint16()`    : Convert an image to a uint16 image.
-- `to_uint8()`     : Convert an image to an uint8 image.
-
-"""
-from pymorph_version import __version__, __version_info__
-
-import sys, os
-from PyQt4.uic.Compiler.qtproxies import QtGui
-
-mydir = os.path.dirname(__file__)
-try:
-    sys.imagepath += [os.path.join(mydir, 'data')]
-except:
-    sys.imagepath = [os.path.join(mydir, 'data')]
-
-__all__ = \
-    ['concat'
-    ,'limits'
-    ,'center'
-    ,'close_holes'
-    ,'dist'
-    ,'cdist'
-    ,'edgeoff'
-    ,'frame'
-    ,'randomcolor'
-    ,'isolines'
-    ,'overlay'
-    ,'histogram'
-    ,'label'
-    ,'neg'
-    ,'threshad'
-    ,'toggle'
-    ,'addm'
-    ,'areaclose'
-    ,'areaopen'
-    ,'asf'
-    ,'asfrec'
-    ,'binary'
-    ,'blob'
-    ,'cbisector'
-    ,'cdilate'
-    ,'cerode'
-    ,'close'
-    ,'closerec'
-    ,'closerecth'
-    ,'closeth'
-    ,'cthick'
-    ,'cthin'
-    ,'cwatershed'
-    ,'dilate'
-    ,'drawv'
-    ,'endpoints'
-    ,'erode'
-    ,'gdist'
-    ,'gradm'
-    ,'grain'
-    ,'gray'
-    ,'hmin'
-    ,'hmax'
-    ,'homothick'
-    ,'homothin'
-    ,'img2se'
-    ,'infcanon'
-    ,'infgen'
-    ,'infrec'
-    ,'inpos'
-    ,'interot'
-    ,'intersec'
-    ,'intershow'
-    ,'isbinary'
-    ,'asbinary'
-    ,'isequal'
-    ,'labelflat'
-    ,'lastero'
-    ,'open'
-    ,'openrec'
-    ,'openrecth'
-    ,'openth'
-    ,'opentransf'
-    ,'patspec'
-    ,'regmax'
-    ,'regmin'
-    ,'se2interval'
-    ,'se2hmt'
-    ,'se2flatidx'
-    ,'sebox'
-    ,'secross'
-    ,'sedisk'
-    ,'seline'
-    ,'serot'
-    ,'seshow'
-    ,'sesum'
-    ,'setrans'
-    ,'sereflect'
-    ,'sedilate'
-    ,'seunion'
-    ,'skelm'
-    ,'skelmrec'
-    ,'skiz'
-    ,'subm'
-    ,'supcanon'
-    ,'supgen'
-    ,'suprec'
-    ,'bshow'
-    ,'symdif'
-    ,'symdiff'
-    ,'thick'
-    ,'thin'
-    ,'union'
-    ,'watershed'
-    ,'maxleveltype'
-    ,'to_int32'
-    ,'to_uint8'
-    ,'to_uint16'
-    ,'to_gray'
-    ,'datatype'
-    ,'add4dilate'
-    ,'mat2set'
-    ,'set2mat'
-    ,'pad4n'
-    ]
-
-
-def concat(dim, *imgs):
-    """
-    img = concat(dim, img0, img1, ...)
-
-    Concatenate two or more images along width, height or depth.
-
-    Concatenate two or more images in any of the dimensions: width,
-    height or depth. If the images do not match the dimension, a
-    larger image is create with zero pixels to accommodate them. The
-    images must have the same datatype.
-
-    Parameters
-    ----------
-    dim : {'width', 'heigh', 'depth', 'w', 'h', 'd' }
-        Dimension along which to concatenate.
-    img0, img1, ... : Images to concatenate
-
-    Returns
-    -------
-    img : resulting image (of the same type as inputs).
-
-    """
-    import numpy as np
-    import string
-    dimcode = string.lower(dim)[0]
-    if not imgs:
-        raise ValueError, 'pymorph.concat: received empty image list'
-    shapes = np.array([img.shape for img in imgs])
-    varies = shapes.var(0).astype(bool)
-    if  (dimcode == 'w' and varies[0]) or \
-        (dimcode == 'h' and varies[1]) or \
-        (dimcode == 'd' and varies.any()):
-        max0,max1 = shapes.max(1)
-        imgs = list(imgs)
-        for (i,img),(s0,s1) in zip(enumerate(imgs), shapes):
-            if dimcode == 'w':
-                imgs[i] = np.zeros((s0,max1), img.dtype)
-            elif dimcode == 'h':
-                imgs[i] = np.zeros((max0,s1), img.dtype)
-            else:
-                imgs[i] = np.zeros((max0,max1), img.dtype)
-            imgs[i][:s0,:s1] = img
-    if dimcode == 'w':
-        return np.hstack(imgs)
-    elif dimcode == 'h':
-        return np.vstack(imgs)
-    elif dimcode == 'd':
-        return np.dstack(imgs)
-    else:
-        raise ValueError, 'pymorph.concat: Unknown direction "%s"' % dim
-
-
-def limits(f):
-    """
-    y = limits(f)
-
-    Get the possible minimum and maximum of an image.
-    The possible minimum and the possible maximum of an image depend
-    on its data type. These values are important to compute many
-    morphological operators (for instance, negate of an image). The
-    output is a vector, where the first element is the possible
-    minimum and the second, the possible maximum.
-
-    Parameters
-    ----------
-    f : Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-
-    Returns
-    -------
-    y : Two element vector
-        the first element is the infimum, the second, the supremum.
-    """
-    from numpy import array, bool, uint8, uint16, int32, int64
-    code = f.dtype
-    if code == bool: return array([0,1])
-    if code == uint8: return array([0,255])
-    if code == uint16: return array([0,65535])
-    if code == int32: return array([-2147483647,2147483647])
-    if code == int64: return array([-2**63,2**63-1])
-
-    raise ValueError('pymorph.limits: does not accept this typecode: %s' % code)
-
-
-def center(f, b=None):
-    """
-    centered = center(f, b={3x3 cross})
-
-    Center filter.
-
-    center() computes the morphological center of f w.r.t. to the
-    structuring element b.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    b : Structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Image
-    """
-
-    if b is None: b = secross()
-    while True:
-        beta1 = asf(f,'COC',b,1)
-        beta2 = asf(f,'OCO',b,1)
-
-        prev = f
-        f = union(intersec(y,beta1),beta2)
-        if isequal(prev,f):
-            return f
-
-
-def close_holes(f, Bc=None):
-    """
-    y = close_holes(f, Bc={3x3 cross})
-
-    Close holes of binary and gray-scale images.
-
-    `close_holes` creates the image `y` by closing the holes of the image
-    `f`, according with the connectivity defined by the structuring
-    element `Bc`.The images can be either binary or gray-scale.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) or binary image.
-    Bc : Connectivity (default: 3x3 cross).
-
-    Returns
-    -------
-    y : image (ndarray) of same type as `f`.
-    """
-
-    if Bc is None: Bc = secross()
-    delta_f = frame(f)
-    return neg(infrec(delta_f, neg(f), Bc))
-
-
-def dist(f, Bc=None, metric='euclidean'):
-    """
-    y = dist(f, Bc={3x3 cross}, metric='euclidean')
-
-    Distance transform.
-
-    `dist` creates the distance image y of the binary image `f`. The
-    value of `y` at the pixel `x` is the distance of x to the complement
-    of f, that is, the distance of `x` to nearest point in the
-    complement of `f`. The distances available are based on the
-    Euclidean metrics and on metrics generated by a a regular graph,
-    that is characterized by a connectivity rule defined by the
-    structuring element `Bc`. The implementation of the Euclidean
-    algorithm is based on LotuZamp:01 .
-
-    Parameters
-    ----------
-    f : ndarray of type bool
-        Input image
-    Bc : ndarray, optional
-        Connectivity structure element (default: 3x3 cross)
-    metric : {'euclidean' [default], 'euclidean2'}, optional
-        Metric to use.
-
-    Returns
-    -------
-    y : ndarray
-        distance image in uint16, or, if metric=='euclidean2', in int32
-
-    See Also
-    --------
-    cdist : conditional distance transform
-    mahotas.distance : in mahotas package, faster C++ implementation
-    scipy.ndimage.distance_transform_edt : in scipy, faster C implementation
-    """
-    return cdist(f=f,g=None,Bc=Bc,metric=metric)
-
-def cdist(f, g=None, Bc=None,metric=None):
-    """
-    y = cdist(f, g, Bc=None, metric=None)
-
-    Conditional (geodesic) distance transform.
-
-    `cdist` creates the conditional distance image `y` of the binary image `f`.
-
-    y[y,x] = distance of (y,x) to foreground in a path through complement(c)
-    y[y,x] = 0, if f[y,x] == 0 or c[y,x] == 1
-
-    The distances available are based on the
-    Euclidean metrics and on metrics generated by a a regular graph,
-    that is characterized by a connectivity rule defined by the
-    structuring element Bc. The implementation of the Euclidean
-    algorithm is based on LotuZamp:01 .
-
-    Parameters
-    ----------
-    f :      Binary image.
-    g :      Binary image.
-    Bc :     Structuring Element Default: None (3x3 elementary
-            cross). (connectivity)
-    metric : Metric to use, one of ('euclidean', 'euclidean2'), 'euclidean' by default.
-
-    Returns
-    -------
-    y : ndarray
-        distance image in uint16, or, if metric=='euclidean2', in int32
-    """
-    from string import lower
-    import numpy
-    from numpy import zeros, sqrt
-    if Bc is None: Bc = secross()
-    if metric is not None:
-       metric = lower(metric)
-    f = gray(f,'uint16')
-    y = intersec(f,0)
-    if g is not None:
-        g = (~g)*255
-    if (metric == 'euclidean') or (metric == 'euc2') or (metric == 'euclidean2'):
-        i=1
-        while not isequal(f,y):
-            a4 = -4*i+2
-            a2 = -2*i+1
-            b = to_int32([[a4,a2,a4],
-                          [a2, 0,a2],
-                          [a4,a2,a4]])
-            y=f
-            i+=1
-            if g is not None:
-                f = union(erode(f,b),g)
-            else:
-                f = erode(f,b)
-        if metric == 'euclidean':
-            f = to_uint16(sqrt(f)+0.5)
-    else:
-        if isequal(Bc, secross()):
-            b = to_int32([[-2147483647,  -1, -2147483647],
-                          [         -1,   0,          -1],
-                          [-2147483647,  -1, -2147483647]])
-        elif isequal(Bc, sebox()):
-            b = to_int32([[-1,-1,-1],
-                          [-1, 0,-1],
-                          [-1,-1,-1]])
-        else: b = Bc # This seems wrong, but it's the original code
-        while not isequal(f,y):
-            y=f
-            f = union(erode(f,b),g)
-    if g is not None:
-        return y * (g==0)
-    return y
-
-
-def edgeoff(f, Bc=None):
-    """
-    y = edgeoff(f, Bc={3x3 cross})
-
-    Eliminate the objects that hit the image frame.
-
-    `edgeoff` creates the binary image `y` by eliminating the objects
-    (connected components) of the binary image `f` that hit the image
-    frame, according to the connectivity defined by the structuring
-    element `Bc`.
-
-    Parameters
-    ----------
-    f :  Binary image.
-    Bc : Structuring element (default: 3x3 cross)
-
-    Returns
-    -------
-    y : Binary image.
-    """
-
-    if Bc is None: Bc = secross()
-    edge = frame(f)
-    return subm(f, infrec(edge, f, Bc))
-
-
-def frame(f, Ht=1, Wt=1, Dt=0, framevalue=None, bgvalue=None):
-    """
-    y = frame(f, Dt=1, Wt=1, Dt=0, framevalue={max of f.dtype}, bgvalue={min of f.dtype})
-
-    Create a frame image.
-
-    `frame creates an image `y`, with the same dimensions (W,H,D)
-    and same pixel type of the image `f`, such that the value of the
-    pixels in the image frame is `framevalue` and the value of the other
-    pixels is k2 . The thickness of the image frame is given by the
-    `HT`, `WT`, and `DT` parameters.
-
-    Parameters
-    ----------
-    f :  Input image
-    Ht : Height thickness (default 1)
-    Wt : Width thickness (default 1)
-    Dt : Depth thickness (default 0)
-    framevalue : Frame grey-level (default: max of f.dtype)
-    bgvalue : Background grey-level (default: min of f.dtype)
-
-    Returns
-    -------
-    y : image of same type as f .
-    """
-    minf, maxf = limits(f)
-    if framevalue is None: framevalue = maxf
-    if bgvalue is None: bgvalue  = minf
-    y = union(intersec(f, minf), bgvalue)
-    y[  : , :Wt] = framevalue
-    y[  : ,-Wt:] = framevalue
-    y[ :Ht,  : ] = framevalue
-    y[-Ht:,  : ] = framevalue
-    if len(f.shape) == 3:
-        y[:,:, :Dt] = framevalue
-        y[:,:,-Dt:] = framevalue
-    return y
-
-
-def randomcolor(X):
-    """
-    y = randomcolor(X)
-
-    Apply a random color table to a gray-scale image.
-
-    Zero is guaranteed to be mapped to black (i.e., (0,0,0) triplet)
-
-    Parameters
-    ----------
-    X : 2d-array of uint8 of shape (h,w)
-        Labeled image.
-
-    Returns
-    -------
-    y : 3d-array of uint8 of shape (h, w, 3)
-        Color image.
-    """
-    from numpy import take, reshape, shape, dstack
-    from numpy.random import rand
-
-    mmin = X.min()
-    mmax = X.max()
-    ncolors = mmax - mmin + 1
-    R = to_int32(rand(ncolors)*255)
-    G = to_int32(rand(ncolors)*255)
-    B = to_int32(rand(ncolors)*255)
-    if mmin == 0:
-       R[0],G[0],B[0] = 0,0,0
-    r = reshape(take(R, X.ravel() - mmin),X.shape)
-    g = reshape(take(G, X.ravel() - mmin),X.shape)
-    b = reshape(take(B, X.ravel() - mmin),X.shape)
-    return dstack((r,g,b))
-
-
-def isolines(X, N=10):
-    """
-    Y = isolines(X, N=10)
-
-    Apply an iso-contour color table to a gray-scale image.
-
-    Parameters
-    ----------
-    X : 2d-array
-        Distance transform image.
-    N : integer, optional
-        Number of iso-contours (default: 10).
-
-    Returns
-    -------
-    Y : Gray-scale (uint8 or uint16) or binary image.
-    """
-    from numpy import newaxis, ravel, ceil, zeros, ones, transpose, repeat, concatenate, arange, reshape, floor
-
-    def apply_lut(img, lut):
-        h,w=img.shape
-        return reshape(map(lut.__getitem__, img.ravel()),(h,w,3))
-    np = 1  # number of pixels by isoline
-    if len(X.shape) == 1: X = X[newaxis,:]
-    maxi, mini = X.max(), X.min()
-    d = int(ceil(256./N))
-    m = zeros(256)
-    m[0:256:d] = 1
-    m = transpose([m,m,m])
-    # lut gray
-    gray = floor(arange(N)*255. // (N-1) + 0.5).astype('B')
-    gray = repeat(gray, d)[0:256]
-    gray = transpose([gray,gray,gray])
-    # lut jet
-    r = concatenate((range(126,0,-4),zeros(64),range(0,255,4),255*ones(64),range(255,128,-4)))
-    g = concatenate((zeros(32),range(0,255,4),255*ones(64),range(255,0,-4),zeros(32)))
-    b = 255 - r
-    jet = transpose([r,g,b])
-    # apply lut
-    XX  = floor((X-mini)*255. // maxi + 0.5).astype('B')
-    lut = (1-m)*gray + m*jet
-    return apply_lut(XX, lut)
-
-
-def overlay(X, red=None, green=None, blue=None, magenta=None, yellow=None, cyan=None):
-    """
-    Y = overlay(X, red=None, green=None, blue=None, magenta=None, yellow=None, cyan=None)
-
-    Apply binary overlays as color layers on a binary or gray-scale image
-
-    Parameters
-    ----------
-    X :  Gray-scale (uint8 or uint16) or binary image.
-    red : Red overlay, binary image(default: None)
-    green : Green overlay, binary image (default: None)
-    blue : blue overlay, binary image (default: None)
-    magenta : magenta overlay, binary image (default: None)
-    yellow : yellow overlay, binary image (default: None)
-    cyan : cyan overlay, binary image (default: None)
-
-    Returns
-    -------
-    Y : Color image (in HxWx3 format)
-    """
-    from numpy import dstack
-    if isbinary(X): X = gray(X,'uint8')
-    r = X
-    g = X
-    b = X
-    if red is not None: # red 1 0 0
-      red = gray(asbinary(red),'uint8')
-      r = union(r,red)
-      g = intersec(g,neg(red))
-      b = intersec(b,neg(red))
-    if green is not None: # green 0 1 0
-      green = gray(asbinary(green),'uint8')
-      r = intersec(r,neg(green))
-      g = union(g,green)
-      b = intersec(b,neg(green))
-    if blue is not None: # blue 0 0 1
-      blue = gray(asbinary(blue),'uint8')
-      r = intersec(r,neg(blue))
-      g = intersec(g,neg(blue))
-      b = union(b,blue)
-    if magenta is not None: # magenta 1 0 1
-      magenta = gray(magenta,'uint8')
-      r = union(r,magenta)
-      g = intersec(g,neg(magenta))
-      b = union(b,magenta)
-    if yellow is not None: # yellow 1 1 0
-      #assert isbinary(yellow),'yellow must be binary overlay'
-      yellow = gray(asbinary(yellow),'uint8')
-      r = union(r,yellow)
-      g = union(g,yellow)
-      b = intersec(b,neg(yellow))
-    if cyan is not None: # cyan 0 1 1
-      #assert isbinary(cyan),'cyan must be binary overlay'
-      cyan = gray(asbinary(cyan),'uint8')
-      r = intersec(r,neg(cyan))
-      g = union(g,cyan)
-      b = union(b,cyan)
-    return dstack((r,g,b))
-
-
-def histogram(f):
-    """
-    h = histogram(f)
-
-    Find the histogram of the image f.
-
-    Finds the histogram of the image `f`.
-
-    For binary image the vector size is 2. For gray-scale uint8 and
-    uint16 images, the vector size is the maximum pixel value plus
-    one. h[0] gives the number of pixels with value 0.
-
-    Parameters
-    ----------
-    f : Input image (of any integer type).
-
-    Returns
-    -------
-    h : Histogram in a uint16 or an int32 vector.
-    """
-    import numpy as np
-    return np.histogram(f, np.arange(f.max() + 2))[0]
-
-
-def label(f, Bc=None):
-    """
-    y = label(f, Bc={3x3 cross})
-
-    Label a binary image.
-
-    `label` creates the image `y` by labeling the connect components
-    of a binary image `f`, according to the connectivity defined by
-    the structuring element `Bc`. The background pixels (with value
-    0) are not labeled. The maximum label value in the output image
-    gives the number of its connected components.
-
-    Parameters
-    ----------
-    f :  Binary image.
-    Bc : Connectivity (default: 3x3 cross)
-
-    Returns
-    -------
-    y : Image of same size as `f`.
-        If number of labels is less than 65535, the data type
-        is uint16, otherwise it is int32.
-    """
-    if Bc is None: Bc = secross()
-    if not isbinary(f):
-        f = (f > 0)
-    f = pad4n(f, Bc, 0)
-    neighbours = se2flatidx(f,Bc)
-    labeled = f * 0
-    f = f.ravel()
-    labeledflat=labeled.ravel()
-    label = 1
-    queue = []
-    for i in xrange(f.size):
-        if f[i] and labeledflat[i] == 0:
-            labeledflat[i]=label
-            queue=[i+bi for bi in neighbours]
-            while queue:
-                ni=queue.pop()
-                if f[ni] and labeledflat[ni] == 0:
-                    labeledflat[ni]=label
-                    for n in neighbours+ni:
-                        queue.append(n)
-            label += 1
-    return labeled[1:-1,1:-1] # revert the pad4n() call above
-
-
-def neg(f):
-    """
-    y = neg(f)
-
-    Negate an image.
-
-    `neg` returns an image `y` that is the negation (i.e., inverse or
-    involution) of the image `f`. In the binary case, `y` is the
-    complement of `f`.
-
-    Parameters
-    ----------
-    f : Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-
-    Returns
-    -------
-    y : ndarray of same shape and dtype as `f`
-    """
-
-    y = limits(f)[0] + limits(f)[1] - f
-    return y.astype(f.dtype)
-
-
-def threshad(f, f1, f2=None):
-    """
-    y = threshad(f, f1, f2=None)
-
-    Threshold (adaptive)
-
-    `threshad` creates the image y as the threshold of the image f
-    by the images `f1` and `f2`. A pixel in `y` has the value 1 when the
-    value of the corresponding pixel in `f` is between the values of
-    the corresponding pixels in `f1` and `f2`.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) image.
-    f1 : Lower value.
-    f2 : Upper value.
-
-    Returns
-    -------
-    y : Binary image.
-    """
-
-    if f2 is None:
-        return f1 <= f
-    return (f1 <= f) & (f <= f2)
-
-
-def toggle(f, f1, f2, gray_mode=True):
-    """
-    y = toggle(f, f1, f2, gray_mode=True)
-
-    Toggle operator
-
-    Image contrast enhancement or classification by the toggle operator.
-
-    `toggle` creates the image `y` that is an enhancement or classification of
-    the image f by the toggle operator, with parameters `f1` and `f2`. If
-    `gray`, it performs an enhancement; otherwise, it performs a binary
-    classification.
-
-    In the enhancement, a pixel takes the value of the corresponding pixel in
-    `f1` or `f2`, according to a minimum distance criterion from `f` to `f1` or
-    `f` to `f2`. In the classification, the pixels in f nearest to `f1` receive
-    the value `0`, while the ones nearest to `f2` receive the value `1`.
-
-    Parameters
-    ----------
-    f :    Gray-scale (uint8 or uint16) image.
-    f1 :   Gray-scale (uint8 or uint16) image.
-    f2 :   Gray-scale (uint8 or uint16) image.
-    gray_mode : boolean, optional
-        Whether to work in grey mode (default: True)
-
-    Returns
-    -------
-    y : ndaimge of same shape and dtype as f
-    """
-
-    y = binary(subm(f,f1),subm(f2,f))
-    if gray_mode:
-        t = gray(y)
-        y = union(intersec(neg(t),f1),intersec(t,f2))
-    return y
-
-
-def addm(f1, f2):
-    """
-    y = addm(f1, f2)
-
-    Addition of two images, with saturation.
-
-    addm creates the image y by pixelwise addition of images f1
-    and f2 . When the addition of the values of two pixels saturates
-    the image data type considered, the greatest value of this type
-    is taken as the result of the addition.
-
-    Parameters
-    ----------
-    f1 : Unsigned gray-scale (uint8 or uint16), signed (int32) or
-        binary image.
-    f2 : Unsigned gray-scale (uint8 or uint16), signed (int32) or
-        binary image. Or constant.
-
-    Returns
-    -------
-    y: Unsigned gray-scale (uint8 or uint16), signed (int32) or
-       binary image.
-
-    Examples
-    --------
-    ::
-
-        f = to_uint8([255,   255,    0,   10,    0,   255,   250])
-        g = to_uint8([ 0,    40,   80,   140,  250,    10,    30])
-        print addm(f,g)
-        print addm(g, 100)
-
-    prints out
-
-    ::
-
-        [255 255  80 150 250 255 255]
-        [100 140 180 240 255 110 130]
-    """
-    from numpy import array, minimum, maximum
-
-    if type(f2) is array:
-        assert f1.dtype == f2.dtype, 'Cannot have different datatypes:'
-    y = maximum(minimum(f1.astype('d')+f2, limits(f1)[1]),limits(f1)[0])
-    return y.astype(f1.dtype)
-
-
-def areaclose(f, a, Bc=None):
-    """
-    y = areaclose(f, a, Bc={3x3 cross})
-
-    Area closing
-
-    `areaclose` removes any pore (i.e., background connected
-    component) with area less than `a` in binary image `f`. The
-    connectivity is given by the structuring element `Bc`. This
-    operator is generalized to gray-scale images by applying the
-    binary operator successively on slices of `f` taken from higher
-    threshold levels to lower threshold levels.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) or binary image.
-    a :  Non negative integer.
-    Bc : Structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Same type of f
-    """
-    if Bc is None: Bc = secross()
-    return neg(areaopen(neg(f),a,Bc))
-
-
-def areaopen(f, a, Bc=None):
-    """
-    y = areaopen(f, a, Bc=None)
-
-    Area opening
-
-    `areaopen` removes any grain (i.e., connected component) with
-    area less than `a` of a binary image `f`. The connectivity is given
-    by the structuring element `Bc`. This operator is generalized to
-    gray-scale images by applying the binary operator successively
-    on slices of `f` taken from higher threshold levels to lower
-    threshold levels.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) or binary image.
-    a :  Double non negative integer.
-    Bc : Structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Same type of f
-
-    Examples
-    --------
-
-    ::
-
-        f=binary(to_uint8([
-         [1, 1, 0, 0, 0, 0, 1],
-         [1, 0, 1, 1, 1, 0, 1],
-         [0, 0, 0, 0, 1, 0, 0]]))
-        y=areaopen(f,4,secross())
-        print y
-
-    example 2
-
-    ::
-
-        f=to_uint8([
-           [10,   11,   0,    0,   0,   0,  20],
-           [10,    0,   5,    8,   9,   0,  15],
-           [10,    0,   0,    0,  10,   0,   0]])
-        y=areaopen(f,4,secross())
-        print y
-
-    ::
-
-        a=readgray('form-1.tif')
-        b=areaopen(a,500)
-        show(a)
-        show(b)
-
-    ::
-
-        a=readgray('bloodcells.tif')
-        b=areaopen(a, 500)
-        show(a)
-        show(b)
-
-    """
-
-    if Bc is None: Bc = secross()
-    if isbinary(f):
-      fr = label(f,Bc)      # binary area open, use area measurement
-      g = blob(fr,'area')
-      y = threshad(g,a)
-    else:
-      y = intersec(f,0)
-      zero = binary(y)
-      k1 = f.min()
-      k2 = f.max()
-      for k in xrange(k1,k2+1):   # gray-scale, use thresholding decomposition
-        print float((k-k1)*100)/float(k2-k1)
-        fk = threshad(f,k)
-        fo = areaopen(fk,a,Bc)
-        if isequal(fo,zero):
-          break
-        y = union(y, gray(fo,datatype(f),k))
-    return y
-
-
-def asf(f, seq="OC", B=None, n=1):
-    """
-    y = asf(f, seq="OC", B={3x3 cross}, n=1)
-
-    Alternating Sequential Filtering
-
-    `asf` creates the image `y` by filtering the image `f` by n
-    iterations of the close and open alternating sequential filter
-    characterized by the structuring element `B`. The sequence of
-    opening and closing is controlled by the parameter `seq`. 'OC'
-    performs opening after closing, 'CO' performs closing after
-    opening, 'OCO' performs opening after closing after opening, and
-    'COC' performs closing after opening after closing.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    seq : Order of operations, one of ('OC', 'CO', 'OCO', 'COC'), default: 'OC'.
-    B : Structuring element (default: 3x3  cross).
-    n : integer, optional
-        Number of iterations (default: 1).
-
-    Returns
-    -------
-    y : Image
-    """
-    from string import upper
-    if B is None: B = secross()
-    seq = upper(seq)
-    ops = { 'O' : open, 'C' : close }
-    ops = map(ops.get, reversed(seq))
-
-    for i in xrange(n):
-        Bn = sesum(B, i+1)
-        for op in ops:
-            f = op(f, Bn)
-    return f
-
-
-def asfrec(f, seq="OC", B=None, Bc=None, N=1):
-    """
-    y = asfrec(f, seq="OC", B={3x3 cross}, Bc={3x3 cross}, N=1)
-
-    Reconstructive Alternating Sequential Filtering
-
-    `asf` creates the image `y` by filtering the image `f` by `n`
-    iterations of the close by reconstruction and open by
-    reconstruction alternating sequential filter characterized by
-    the structuring element `B`. The structure element `Bc` is used in
-    the reconstruction. The sequence of opening and closing is
-    controlled by the parameter `seq`. 'OC' performs opening after
-    closing, and 'CO' performs closing after opening.
-
-    Parameters
-    ----------
-    f :   Gray-scale (uint8 or uint16) or binary image.
-    seq : Order of operations, one of ('OC', 'CO'), default: 'OC'.
-    B :   Structuring element (default: 3x3 cross).
-    Bc :  Structuring element (default: 3x3 cross).
-    N :   Number of iterations (default: 1).
-
-    Returns
-    -------
-    y : Same type of f
-    """
-    from string import upper
-    if B is None: B = secross()
-    if Bc is None: Bc = secross()
-    seq = upper(seq)
-    assert seq in ('OC', 'CO'),'pymorph.asfrec: only accepts OC or CO for SEQ parameter'
-    firstop = closerec
-    secondop = openrec
-    if seq == 'CO':
-        firstop, secondop = secondop, firstop
-    for i in xrange(N):
-        Bn = sesum(B, i+1)
-        f = firstop(f, Bn, Bc)
-        f = secondop(f, Bn, Bc)
-    return f
-
-
-def binary(f, k=1):
-    """
-    y = binary(f, k=1)
-
-    Convert a gray-scale image into a binary image
-
-    `binary` converts a gray-scale image `f` into a binary image `y` by
-    a threshold rule. A pixel in `y` has the value 1 if and only if
-    the corresponding pixel in `f` has a value greater or equal to `k`.
-
-    Parameters
-    ----------
-    f :  Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-    k : integer, optional
-        Threshold used inclusively (default: 1)
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    from numpy import asanyarray
-    f = asanyarray(f)
-    return (f >= k)
-
-
-def blob(f, measurement, output="image"):
-    """
-    y = blob(f, measurement, output="image")
-
-    Blob measurements from a labeled image.
-
-    Take measurements from the labeled image f.
-
-    The measurements are:
-
-    - area,
-    - centroid,
-    - bounding rectangle.
-
-    `output` controls the output format:
-
-    image
-        the result is an image
-    data
-        the result is a double column vector with the measurement for each
-        blob.
-
-    The region with label zero is not measured as it is normally
-    the background. The measurement of region with label 1 appears
-    at the first row of the output.
-
-    Parameters
-    ----------
-    f :           Gray-scale (uint8 or uint16) image. Labeled image.
-    measurement : Measurement. One of ('area', 'centroid', 'boundingbox').
-    output : {'image' [default], 'data'}, optional
-            Output format: if 'image', returns a binary image; if 'data',
-            returns a vector of measurements
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) or binary image.
-    """
-    import numpy
-    from numpy import newaxis, ravel, zeros, sum, nonzero, array, asanyarray
-    from string import lower
-
-    measurement = lower(measurement)
-    output      = lower(output)
-    if len(f.shape) == 1: f = f[newaxis,:]
-    assert measurement in ('area', 'centroid', 'boundingbox'), 'pymorph.blob: Unknown measurement type \'%s\'' % measurement
-    if output == 'data':
-        y = []
-    elif measurement == 'centroid':
-        y = zeros(f.shape,numpy.bool)
-    else:
-        y = zeros(f.shape,numpy.int32)
-    for obj_id in xrange(f.max()):
-        blob = (f == (obj_id+1))
-        if measurement == 'area':
-            area = blob.sum()
-            if output == 'data': y.append(area)
-            else               : y += area*blob
-        elif measurement == 'centroid':
-            indy, indx  = nonzero(blob)
-            cy = sum(indy) // len(indy)
-            cx = sum(indx) // len(indx)
-            if output == 'data': y.append( (cy, cx) )
-            else               : y[cy, cx] = 1
-        elif measurement == 'boundingbox':
-            col, = nonzero(blob.any(0))
-            row, = nonzero(blob.any(1))
-            if output == 'data': y.append([col[0],row[0],col[-1]+1,row[-1]+1])
-            else:
-                y[row[0]:row[-1], col[0]] = 1
-                y[row[0]:row[-1],col[-1]] = 1
-                y[row[0], col[0]:col[-1]] = 1
-                y[row[-1],col[0]:col[-1]] = 1
-    return asanyarray(y)
-
-
-def cbisector(f, B, n):
-    """
-    y = cbisector(f, B, n)
-
-    N-Conditional bisector.
-
-    `cbisector` creates the binary image `y` by performing a filtering
-    of the morphological skeleton of the binary image `f`, relative
-    to the structuring element `B`. The strength of this filtering is
-    controlled by the parameter `n`. Particularly, if `n==0` , `y` is the
-    morphological skeleton of `f` itself.
-
-    Parameters
-    ----------
-    f : Binary image.
-    B : Structuring element
-    n : filtering rate (positive integer)
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    y = intersec(f,0)
-    for i in xrange(n):
-        nb = sesum(B,i)
-        nbp = sesum(B,i+1)
-        f1 = erode(f,nbp)
-        f2 = cdilate(f1,f,B,n)
-        f3 = subm(erode(f,nb),f2)
-        y  = union(y,f3)
-    return y
-
-
-def cdilate(f, g, Bc=None, n=1):
-    """
-    y = cdilate(f, g, Bc={3x3 cross}, n=1)
-
-    Conditional dilation
-
-    `cdilate` creates the image `y` by dilating the image `f` by the
-    structuring element `Bc` conditionally to the image `g`. This
-    operator may be applied recursively `n` times.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    g : Conditioning image. (Gray-scale or binary).
-    Bc : Structuring element (default: 3x3 cross)
-    n : Number of iterations (default: 1)
-
-    Returns
-    -------
-    y : Image
-    """
-
-    if Bc is None: Bc = secross()
-    f = intersec(f,g)
-    for i in xrange(n):
-        prev = f
-        f = intersec(dilate(f, Bc), g)
-        if isequal(f, prev): break
-    return f
-
-
-def cerode(f, g, Bc=None, n=1):
-    """
-    y = cerode(f, g, Bc=None, n=1)
-
-    Conditional erosion
-
-    `cerode` creates the image `y` by eroding the image `f` by the
-    structuring element `Bc` conditionally to `g`. This operator may be
-    applied recursively `n` times.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    g : Conditioning image.
-    Bc : Structuring element (default: 3x3 cross)
-    n : Number of iterations (default: 1)
-
-    Returns
-    -------
-    y : Image
-    """
-
-    if Bc is None: Bc = secross()
-    f = union(f,g)
-    for i in xrange(n):
-        prev = f
-        f = union(erode(f,Bc),g)
-        if isequal(f, prev): break
-    return f
-
-
-def close(f, Bc =None):
-    """
-    y = close(f, Bc={3x3 cross})
-
-    Morphological closing.
-
-    `close` creates the image `y` by the morphological closing of the
-    image `f` by the structuring element `Bc`. In the binary case, the
-    closing by a structuring element `Bc` may be interpreted as the
-    intersection of all the binary images that contain the image `f`
-    and have a hole equal to a translation of `Bc`. In the gray-scale
-    case, there is a similar interpretation taking the functions
-    umbra.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    Bc : Structuring Element Default: None (3x3 elementary cross).
-
-    Returns
-    -------
-    y : Image
-    """
-
-    if Bc  is None: Bc  = secross()
-    return erode(dilate(f,Bc ),Bc )
-
-
-def closerec(f, Bdil=None, Bc=None):
-    """
-    y = closerec(f, Bdil=None, Bc=None)
-
-    Closing by reconstruction.
-
-    `closerec()` creates the image `y` by a sup-reconstruction (with
-    the connectivity defined by the structuring element `Bc`) of the
-    image `f` from its dilation by `Bdil`.
-
-    Parameters
-    ----------
-    f :    Gray-scale (uint8 or uint16) or binary image
-    Bdil : Dilation structuring element (default 3x3 elementary cross)
-    Bc :  Connectivity structuring element (default: 3x3 elementary cross)
-
-    Returns
-    -------
-    y : Image (same type as f)
-    """
-
-    if Bdil is None: Bdil = secross()
-    if Bc is None: Bc = secross()
-    return suprec(dilate(f,Bdil),f,Bc)
-
-
-def closerecth(f, Bdil=None, Bc=None):
-    """
-    y = closerecth(f, Bdil=None, Bc=None)
-
-    Close-by-Reconstruction Top-Hat.
-
-    `closerecth` creates the image `y` by subtracting the image `f` of
-    its closing by reconstruction, defined by the structuring
-    elements `Bc` and `Bdil`.
-
-    Parameters
-    ----------
-    f :    Gray-scale (uint8 or uint16) or binary image.
-    Bdil : Dilation structuring element (default: 3x3 cross)
-    Bc :   Connectivity structuring element (default: 3x3 cross)
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) or binary image.
-    """
-
-    if Bdil is None: Bdil = secross()
-    if Bc is None: Bc = secross()
-    return subm(closerec(f, Bdil, Bc), f)
-
-
-def closeth(f, B=None):
-    """
-    y = closeth(f, B={3x3 cross})
-
-    Closing Top Hat.
-
-    `closeth` creates the image `y` by subtracting the image `f` of its
-    morphological closing by the structuring element `B`.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    B : Structuring Element Default: None (3x3 elementary cross).
-
-    Returns
-    -------
-    y : ndarray of same shape and dtype as `f`
-    """
-
-    if B is None: B = secross()
-    return subm(close(f, B), f)
-
-
-def cthick(f, g, Iab=None, n=-1, theta=45, direction="clockwise"):
-    """
-    y = cthick(f, g, Iab={Homothick interval}, n={infinite}, theta=45, direction="clockwise")
-
-    Image transformation by conditional thickening.
-
-    `cthick` creates the binary image `y` by performing a thickening
-    of the binary image `f` conditioned to the binary image `g`. The
-    number of iterations of the conditional thickening is `n` and in
-    each iteration the thickening is characterized by rotations of
-    `theta` of the interval `Iab`.
-
-    Parameters
-    ----------
-    f :         Binary image.
-    g :         Binary image.
-    Iab :       Interval (default: homothick).
-    n :         Number of iterations, -1 for infinite (default: -1)
-    theta :     Degrees of rotation, 45 (default), 90, or 180.
-    direction: 'clockwise' or 'anti-clockwise'.
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    from string import upper
-
-    if Iab is None: Iab = homothick()
-    if n == -1: n = f.size
-    assert isbinary(f), 'pymorph.cthick: f must be binary image'
-
-    direction = upper(direction)
-    for i in xrange(n):
-        prev = f
-        for t in xrange(0,360,theta):
-            sup = supgen(f, interot(Iab, t, direction))
-            f = intersec(union(f, sup),g)
-        if isequal(prev, f): break
-    return f
-
-
-def cthin(f, g, Iab=None, n=-1, theta=45, direction="clockwise"):
-    """
-    y = cthin(f, g, Iab={Homothin interval}, n={infinite}, theta=45, direction="clockwise")
-
-    Image transformation by conditional thinning.
-
-    `cthin` creates the binary image y by performing a thinning of
-    the binary image `f` conditioned to the binary image `g`. The
-    number of iterations of the conditional thinning is `n` and in
-    each iteration the thinning is characterized by rotations of
-    `theta` of the interval `Iab`.
-
-    Parameters
-    ----------
-    f :         Binary image.
-    g :         Binary image.
-    Iab :       Interval (default: homothin()).
-    n :         Number of iterations, -1 for infinite (default: -1)
-    theta :     Degrees of rotation, 45 (default), 90, or 180.
-    direction: 'clockwise' or 'anti-clockwise'.
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    from string import upper
-    if Iab is None: Iab = homothin()
-    assert isbinary(f),'f must be binary image'
-    direction = upper(direction)
-    if n == -1: n = f.size
-    for i in xrange(n):
-        prev = f
-        for t in xrange(0,360,theta):
-            sup = supgen(f, interot(iab, t, direction))
-            y = union(subm(f, sup),g)
-        if isequal(prev, f): break
-    return f
-
-
-def cwatershed(f, markers, Bc=None, return_lines=False,is_gvoronoi=False):
-    """
-    R = cwatershed(f, g, Bc=None, return_lines=False)
-    R,L = cwatershed(f, g, Bc=None, return_lines=True)
-
-    Detection of watershed from markers.
-
-    `cwatershed` creates the image `R` by detecting the domain of the
-    catchment basins of `f` indicated by the marker image `g`,
-    according to the connectivity defined by `Bc`.
-
-    If `return_lines`, `L` will be a labeled image of the catchment basins
-    domain or just a binary image that presents the watershed lines.
-    To know more about watershed and watershed from markers, see
-    BeucMeye:93. The implementation of this function is based on
-    LotuFalc:00.
-
-    WARNING: There is a common mistake related to the
-    marker image `g`. If this image contains only zeros and ones, but
-    it is not a binary image, the result will be an image with all
-    ones. If the marker image is binary, you have to set this
-    explicitly (e.g., `cwatershed(f,g>0)` or `cwatershed(f,g.astype(bool))`)
-
-    Parameters
-    ----------
-    f :       Gray-scale (uint8 or uint16) image.
-    markers : Gray-scale (uint8 or uint16) or binary image. marker
-                   image: binary or labeled.
-    Bc :      Watershed connectivity (default: 3x3 cross)
-    return_lines : Whether to return lines as well as regions (default: False)
-
-    Returns
-    -------
-    R : Gray-scale (uint8 or uint16) or binary image.
-    L : Binary line image
-
-    See Also
-    --------
-    mahotas.cwatershed : implementation of same interface in C++
-    """
-    from numpy import ones, zeros, nonzero, array, put, take, argmin, transpose, compress, concatenate, where, uint8
-    from heapq import heapify, heappush, heappop
-    if Bc is None: Bc = secross()
-    if isbinary(markers):
-        markers = label(markers,Bc)
-    status = pad4n(zeros(f.shape,uint8),Bc, 3)
-    f = pad4n(f,Bc,0)                       # pad input image with 0
-    y = pad4n(markers,Bc,0)                 # pad marker image with 0
-    if return_lines:
-        y1 = intersec(binary(y), 0)
-        y1flat=y1.ravel()
-    costM = limits(f)[1] * ones(f.shape)  # cummulative cost function image
-    # get 1D displacement neighborhood pixels
-    Bi=se2flatidx(f,Bc)
-    status=status.ravel()
-    f=f.ravel()
-    costM=costM.ravel()
-    yflat=y.ravel()
-
-    initial, = where(yflat > 0)
-    costM[initial]=f[initial]
-    # I sort in order of insertion for the simple reason that that's what
-    # the original code intended to do (although that code was not functional)
-    hqueue=[(costM[idx],i,idx) for i,idx in enumerate(initial)]
-    heapify(hqueue)
-    while hqueue:
-        cost,_,pi = heappop(hqueue)
-        status[pi]=1                                            # make it a permanent label
-        for qi in Bi+pi:                                        # for each neighbor of pi
-            if (status[qi] != 3):                               # not image border
-                if (status[qi] != 1):                           # if not permanent
-                    if is_gvoronoi:
-                        ncost=costM[pi]
-                    else:
-                        ncost=f[qi]
-                    if ncost < costM[qi]:
-                        costM[qi]=ncost
-                        yflat[qi] = yflat[pi]                   # propagate the label
-                        heappush(hqueue,(ncost,i,qi))
-                        i += 1
-                elif (return_lines  and
-                     (yflat[qi] != yflat[pi]) and
-                     (y1flat[qi] == 0)     ):
-                    y1flat[pi] = 1
-    y=y[1:-1,1:-1]
-    if return_lines:
-        y1=y1[1:-1,1:-1]
-        return y,y1
-    return y
-
-
-def dilate(f, B=None):
-    """
-    y = dilate(f, B={3x3 cross})
-
-    Dilate an image by a structuring element.
-
-    `dilate` performs the dilation of image `f` by the structuring
-    element `B`. Dilation is a neighbourhood operator that compares
-    locally `B` with `f`, according to an intersection rule. Since
-    Dilation is a fundamental operator to the construction of all
-    other morphological operators, it is also called an elementary
-    operator of Mathematical Morphology. When f is a gray-scale
-    image, `B` may be a flat or non-flat structuring element.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    B : Structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y: Same type as `f`
-    """
-    from numpy import maximum, newaxis, ones, int32
-    if B is None: B = secross()
-    if len(f.shape) == 1: f = f[newaxis,:]
-    if isbinary(f): B = asbinary(B)
-    h,w = f.shape
-    x,v = mat2set(B)
-    if len(x)==0:
-        y = (ones((h,w),int32) * limits(f)[0]).astype(f.dtype)
-    else:
-        if isbinary(v):
-            v = intersec(gray(v,'int32'),0)
-        mh,mw = max(abs(x)[:,0]),max(abs(x)[:,1])
-        y = (ones((h+2*mh,w+2*mw),int32) * limits(f)[0]).astype(f.dtype)
-        for i in xrange(x.shape[0]):
-            if v[i] > -2147483647:
-                y[mh+x[i,0]:mh+x[i,0]+h, mw+x[i,1]:mw+x[i,1]+w] = maximum(
-                    y[mh+x[i,0]:mh+x[i,0]+h, mw+x[i,1]:mw+x[i,1]+w], add4dilate(f,v[i]))
-        y = y[mh:mh+h, mw:mw+w]
-    return y
-
-
-def drawv(f, data, value, geometry):
-    """
-    y = drawv(f, data, value, geometry)
-
-    Superpose points, rectangles and lines on an image.
-
-    `drawv` creates the image `y` by a superposition of points,
-    rectangles and lines of gray-level `value` on the image `f`. The
-    parameters for each geometrical primitive are defined by each line
-    in the `data` parameter. For points, they are represented by 2-D
-    coordinates.  For lines, they are drawn with the same convention
-    used by points, with a straight line connecting them in the order
-    given by the data matrix. For rectangles and filled rectangles,
-    data should be an array of 2 x 2D points.
-
-    Parameters
-    ----------
-    f :        Gray-scale (uint8 or uint16) or binary image.
-    data :     Vector of coordinates.
-    value :    Gray value(s) for drawing.
-                  If it's a single value, then it will be used for all objects,
-                  otherwise, it should be an array of same length as `data`.
-    geometry :  { 'point', 'line', 'rect', 'frect' (filled rectangles)}
-
-    Returns
-    -------
-    y : Image of same type as `f`
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            f=to_uint8(zeros((3,5)))
-            pcoords=to_uint16([[0,2,4],
-                            [0,0,2]])
-            pvalue=to_uint16([1,2,3])
-            print drawv(f,pcoords,pvalue,'point')
-            print drawv(f,pcoords,pvalue,'line')
-            rectcoords=to_uint16([[0],
-                               [0],
-                               [3],
-                               [2]])
-            print drawv(f,rectcoords, to_uint16(5), 'rect')
-            #
-            #   example 2
-            #
-            f=readgray('blob3.tif')
-            pc=blob(label(f),'centroid','data')
-            lines=drawv(intersec(f,0),transpose(pc),to_uint8(1),'line')
-            show(f,lines)
-    """
-    from numpy import array, newaxis, zeros, put, ravel, arange, floor, int32, zeros_like
-    from string import lower
-    import itertools
-
-    geometry  = lower(geometry)
-    if len(f.shape) == 1: f = f[newaxis,:]
-    value     = array(value)
-    if value.shape == ():
-        value = itertools.repeat(value)
-    else:
-        assert (len(data) == len(value) or geometry == 'line'), \
-                'pymorph.drawv: Length of data does not match length of values'
-        assert ((len(data) == len(value)+1) or geometry != 'line'), \
-                'pymorph.drawv: Length of data does not match length of values -1 (for line option)'
-
-    res = zeros_like(f)
-    if geometry == 'point':
-        for (y,x), val in zip(data, value):
-            res[y,x] = val
-    elif geometry == 'line':
-        # Implement algorithm from
-        # http://en.wikipedia.org/wiki/Bresenham's_line_algorithm
-        # To match the Wikipedia version
-        # the coordinates are expressed in *x,y* convention!
-        for val,(x0,y0),(x1,y1) in itertools.izip(value,data[:-1], data[1:]):
-            steep = (abs(y1 - y0) > abs(x1 - x0))
-            if steep:
-                y0,x0 = x0,y0
-                y1,x1 = x1,y1
-            if x0 > x1:
-                x0,x1 = x1,x0
-                y0,y1 = y1,y0
-            deltax = x1 - x0
-            deltay = abs(y1 - y0)
-            error = deltax // 2
-            y = y0
-            ystep = (1 if y0 < y1 else -1)
-            for x in xrange(x0, x1+1):
-                if steep: res[y,x] = val
-                else: res[x,y] = val
-                error -= deltay
-                if error < 0:
-                    y += ystep
-                    error += deltax
-    elif geometry in ('frect', 'rect'):
-        for (y0,x0,y1,x1), val in zip(data, value):
-            assert y1 >= y0, 'pymorph.drawv: bad arguments'
-            assert x1 >= x0, 'pymorph.drawv: bad arguments'
-            if geometry == 'rect':
-                res[y0:y1+1,   x0  ] = val
-                res[y0:y1+1,   x1  ] = val
-                res[   y0  ,x0:x1+1] = val
-                res[   y1  ,x0:x1+1] = val
-            else:
-                res[y0:y1+1,x0:x1+1] = val
-    else:
-        assert False, "pymorph.drawv: geometry should be 'point', 'line', 'rect', or 'frect'."
-    return res
-
-
-def endpoints(option="loop"):
-    """
-    iab = endpoints(option="loop")
-
-    Interval to detect end-points.
-
-    `endpoints` creates an interval that is useful to detect
-    end-points of curves (i.e., one pixel thick connected
-    components) in binary images. It can be used to prune skeletons
-    and to mark objects transforming them in a single pixel or
-    closed loops if they have holes. There are two options
-    available: 'loop', deletes all points but preserves loops if used
-    in thin ; 'homotopic', deletes all points but preserves the last
-    single point or loops.
-
-    Parameters
-    ----------
-    option : {'loop' [default], 'homotopic'}
-        type of interval
-
-    Returns
-    -------
-    Iab : Interval
-    """
-    from string import lower
-    option = lower(option)
-    if option == 'loop':
-        return se2hmt(binary([[0,0,0],
-                              [0,1,0],
-                              [0,0,0]]),
-
-                      binary([[0,0,0],
-                              [1,0,1],
-                              [1,1,1]]))
-    elif option == 'homotopic':
-        return se2hmt(binary([[0,1,0],
-                              [0,1,0],
-                              [0,0,0]]),
-
-                      binary([[0,0,0],
-                              [1,0,1],
-                              [1,1,1]]))
-    from warnings import warn
-    warn('pymorph.endpoints: Did not understand argument "%s".' % option)
-    return None
-
-
-def erode(f, b=None):
-    """
-    y = erode(f, b={3x3 cross})
-
-    Erode an image by a structuring element.
-
-    `erode` performs the erosion of the image `f` by the structuring
-    element `b`. Erosion is a neighbourhood operator that compairs
-    locally `b` with `f`, according to an inclusion rule. Since erosion
-    is a fundamental operator to the construction of all other
-    morphological operators, it is called an elementary
-    operator of Mathematical Morphology. When `f` is a gray-scale
-    image, `b` may be a flat or non-flat structuring element.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    b : Structuring element (Default: 3x3 elementary cross).
-
-    Returns
-    -------
-    y : Image
-
-    See Also
-    --------
-    mahotas.erode : implementation of binary erosion
-    scipy.ndimage.grey_erosion : implementation of grey erosion
-    """
-
-    if b is None: b = secross()
-    return neg(dilate(neg(f),sereflect(b)))
-
-
-
-def gdist(f, g, Bc=None, metric=None):
-    """
-    y = gdist(f, g, Bc=None, metric=None)
-
-    Geodesic Distance Transform.
-
-    `gdist` creates the geodesic distance image y of the binary
-    image `f` relative to the binary image `g`. The value of `y` at the
-    pixel `x` is the length of the smallest path between `x` and `f`. The
-    distances available are based on the Euclidean metrics and on
-    metrics generated by a neighbourhood graph, that is
-    characterized by a connectivity rule defined by the structuring
-    element `Bc`. The connectivity for defining the paths is
-    consistent with the metrics adopted to measure their length. In
-    the case of the Euclidean distance, the space is considered
-    continuos and, in the other cases, the connectivity is the one
-    defined by `Bc`.
-
-    Parameters
-    ----------
-    f :      Binary image.
-    g :      Binary image. Marker image
-    Bc :     Structuring Element Default: None (3x3 elementary
-              cross). (metric for distance).
-    metric: string default: none. 'euclidean' if specified.
-
-    Returns
-    -------
-    y : uint16 (distance image).
-    """
-
-    if Bc is None: Bc = secross()
-    assert metric is None,'Does not support euclidean'
-    fneg,gneg = neg(f),neg(g)
-    y = gray(gneg,'uint16',1)
-    ero = intersec(y,0)
-    prev = y
-    i = 1
-    while not isequal(ero, prev):
-        prev = ero
-        ero = cerode(gneg,fneg,Bc,i)
-        y = addm(y,gray(ero,'uint16',1))
-        i += 1
-    return union(y,gray(ero,'uint16'))
-
-
-def gradm(f, Bdil=None, Bero=None):
-    """
-    y = gradm(f, Bdil={3x3 cross}, Bero={3x3 cross})
-
-    Morphological gradient.
-
-    `gradm` creates the image `y` by the subtraction of the erosion of
-    the image `f` by `Bero` of the dilation of `f` by `Bdil`.
-
-    Parameters
-    ----------
-    f :    Gray-scale (uint8 or uint16) or binary image.
-    Bdil : Structuring element for dilation (default: 3x3 cross).
-    Bero : Structuring element for erosion (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Image of same type as `f`.
-    """
-
-    if Bdil is None: Bdil = secross()
-    if Bero is None: Bero = secross()
-    return subm(dilate(f,Bdil),erode(f,Bero))
-
-
-def grain(f, labels, measurement, option="image"):
-    """
-    y = grain(f, labels, measurement, option="image")
-
-    Gray-scale statistics for each labeled region.
-
-    Computes gray-scale statistics of each grain in the image. The
-    grains regions are specified by the labeled image `labels` and the
-    gray-scale information is specified by the image `f`. The
-    statistics to compute is specified by the parameter measurement,
-    which has the same options as in function stats. The
-    parameter option defines the output format:
-
-    'image'
-        if the output is an uint16 image where each label value is changed to
-        the measurement value
-    'data'
-        a double column vector. In this case, the first element (index 0) is
-        the measurement of region 1. The region with label zero is not measure
-        as it is normally the background.
-
-    Parameters
-    ----------
-    f : ndarray (gray-scale)
-    labels : ndarray of integer dtype
-        Labeled image. As usual, label 0 is backaground.
-    measurement : {'max', 'min', 'median', 'mean', 'sum', 'std', 'std1' }
-        Which measure to compute.
-    option : {'image' [default], 'data' }
-        Output format: if 'image', results as a gray-scale mosaic image
-        (default): if 'data', results a column vector of measurements.
-
-    Returns
-    -------
-    y: Gray-scale (uint8 or uint16) image.
-        Or an array with gray-scale statistics per region
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            1#
-            f=to_uint8([range(6),range(6),range(6)])
-            labels=labelflat(f)
-            grain(labels,f,'sum','data')
-            grain(labels,f,'sum')
-            #
-            #   example 2
-            #
-            f=readgray('astablet.tif')
-            g=gradm(f)
-            marker=regmin(close(g))
-            ws=cwatershed(g,marker,sebox(),'regions')
-            g=grain(ws,f,'mean')
-            show(f)
-            show(g)
-    """
-    from numpy import zeros_like, asarray, zeros, float32
-    from string import lower
-
-    measurement = lower(measurement)
-    is_data = (lower(option) == 'data')
-    if is_data:
-        y = []
-    else:
-        type = f.dtype
-        if measurement in ('mean', 'std'):
-            type = float32
-        y = zeros(labels.shape)
-    fdata = f.ravel()
-    labelsravel = labels.ravel()
-    for obj_id in xrange(labelsravel.max()):
-        pixels = fdata[labelsravel == (obj_id + 1)]
-        if measurement == 'max':
-            val = pixels.max()
-        elif measurement == 'min':
-            val = pixels.min()
-        elif measurement == 'sum':
-            val = pixels.sum()
-        elif measurement == 'mean':
-            val = pixels.mean()
-        elif measurement == 'std':
-            val = pixels.std()
-        elif measurement == 'std1':
-            print "'std1' is not implemented"
-        else:
-            print "measurement should be 'max', 'min', 'mean', 'sum', 'std', 'std1'."
-        if is_data:
-            y.append(val)
-        else:
-            y += val*(labels == (obj_id+1))
-    return asarray(y)
-
-
-def gray(f, dtype="uint8", k=None):
-    """
-    y = gray(f, dtype="uint8", k=None)
-
-    Convert a binary image into a gray-scale image.
-
-    `gray` converts a binary image into a gray-scale image of a
-    specified data type. The value `k` is assigned to the 1 pixels of
-    `f`, while the `0` pixels are assigned to the minimum value
-    associated to the specified data type.
-
-    Parameters
-    ----------
-    f :      Binary image.
-    dtype :  { 'uint8' [default], 'uint16', 'int32' }
-    k : scalar, optional
-        Pixel value to assign to `True` pixels (default: max value for `dtype`).
-
-    Returns
-    -------
-    y : Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-    """
-    from numpy import array
-    if k is None: k = maxleveltype(dtype)
-    if type(f) is list: f = binary(f)
-    assert isbinary(f), 'f must be binary'
-    if   dtype == 'uint8' : y = to_uint8(f*k)
-    elif dtype == 'uint16': y = to_uint16(f*k)
-    elif dtype == 'int32' : y = to_int32(f*k) - to_int32(neg(f)*maxleveltype(dtype))
-    else:
-        assert 0, 'pymorph.gray: type not supported: %s' % dtype
-    return y
-
-
-def hmin(f, h=1, Bc=None):
-    """
-    y = hmin(f, h=1, Bc={3x3 cross})
-
-    Remove basins with contrast less than h.
-
-    `hmin` sup-reconstructs the gray-scale image `f` from the marker
-    created by the addition of the positive integer value `h` to `f`,
-    using the connectivity `Bc`. This operator removes connected
-    basins with contrast less than `h`. This function is very useful
-    for simplifying the basins of the image.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) image.
-    h :  Contrast (default: 1).
-    Bc : Connectivity structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) or binary image.
-    """
-    """
-    Examples
-      #
-      #   example 1
-      #
-      a = to_uint8([
-          [10,   3,   6,  18,  16,  15,  10],
-          [10,   9,   6,  18,   6,   5,  10],
-          [10,   9,   9,  15,   4,   9,  10],
-          [10,  10,  10,  10,  10,  10,  10]])
-      print hmin(a,1,sebox())
-      #
-      #   example 2
-      #
-      f = readgray('r4x2_256.tif')
-      show(f)
-      fb = hmin(f,70)
-      show(fb)
-      show(regmin(fb))
-    """
-
-    if Bc is None: Bc = secross()
-    g = addm(f, h)
-    return suprec(g, f, Bc);
-
-
-def hmax(f, h=1, Bc=None):
-    """
-    Remove peaks with contrast less than h.
-
-    y = hmax(f, h=1, Bc={3x3 cross})
-
-    `hmax` inf-reconstructs the gray-scale image f from the marker
-    created by the subtraction of the positive integer value h from
-    `f`, using connectivity `Bc`. This operator removes connected
-    peaks with contrast less than `h`.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) image.
-    h :  Contrast (default: 1).
-    Bc : Connectivity structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) or binary image.
-    """
-    """
-    Examples
-      #
-      #   example 1
-      #
-      a = to_uint8([
-          [4,   3,   6,  1,  3,  5,  2],
-          [2,   9,   6,  1,  6,  7,  3],
-          [8,   9,   3,  2,  4,  9,  4],
-          [3,   1,   2,  1,  2,  4,  2]])
-      print hmax(a,2,sebox())
-      #
-      #   example 2
-      #
-      f = readgray('r4x2_256.tif')
-      show(f)
-      fb = hmax(f,50)
-      show(fb)
-      show(regmax(fb))
-    """
-
-    if Bc is None: Bc = secross()
-    g = subm(f, h)
-    return infrec(g, f, Bc);
-
-
-def homothick():
-    """
-    Iab = homothick()
-
-    Interval for homotopic thickening.
-
-    `homothick` creates an interval that is useful for the homotopic
-    (i.e., that conserves the relation between objects and holes)
-    thickening of binary images.
-
-    Returns
-    -------
-    Iab: Interval
-    """
-    return se2hmt(binary([[1,1,1],
-                          [0,0,0],
-                          [0,0,0]]),
-                  binary([[0,0,0],
-                          [0,1,0],
-                          [1,1,1]]))
-
-
-def homothin():
-    """
-    Iab = homothin()
-
-    Interval for homotopic thinning.
-
-    `homothin` creates an interval that is useful for the homotopic
-    (i.e., that conserves the relation between objects and holes)
-    thinning of binary images.
-
-    Returns
-    -------
-    Iab : Interval
-    """
-    return se2hmt(binary([[0,0,0],
-                          [0,1,0],
-                          [1,1,1]]),
-
-                   binary([[1,1,1],
-                           [0,0,0],
-                           [0,0,0]]))
-
-
-def img2se(fd, flat=True, f=None):
-    """
-    B = img2se(fd, flat=True, f=None)
-
-    Create a structuring element from a pair of images.
-
-    `img2se` creates a flat structuring element `B` from the binary
-    image `fd` or creates a non-flat structuring element `B` from the
-    binary image `fd` and the gray-scale image `f`. `fd` represents the
-    domain of `B` and `f` represents the image of the points in `fd`.
-
-    Parameters
-    ----------
-    fd : Binary image.
-        The image is in the matrix format where the origin (0,0) is at the
-        matrix center.
-    flat : boolean, optional
-        Whether to return a flat structuring element (default: True)
-    f : ndarray of type (uint8 or uint16, int32, or bool), optional
-
-    Returns
-    -------
-      B : Structuring Element
-    """
-    from numpy import choose, ones
-
-    assert isbinary(fd),'pymorph.img2se: first parameter must be binary'
-    if flat:
-        return seshow(fd)
-    B = choose(fd, (limits(to_int32([0]))[0]*ones(fd.shape),f) )
-    return seshow(to_int32(B),'NON-FLAT')
-
-
-def infcanon(f, Iab, theta=45, direction='clockwise'):
-    """
-    y = infcanon(f, Iab, theta=45, direction='clockwise')
-
-    Intersection of inf-generating operators.
-
-    `infcanon` creates the image `y` by computing intersections of
-    transformations of the image `f` by inf-generating (i.e., dual of
-    the hit-or-miss) operators. These inf-generating operators are
-    characterized by rotations (in the clockwise or anti-clockwise
-    direction) of `theta` degrees of the interval `Iab`.
-
-    Parameters
-    ----------
-    f : Binary image.
-    Iab : Interval
-    theta : Degrees of rotation (default: 45)
-    direction : { 'clockwise' [default], 'anti-clockwise' }
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    from string import upper
-
-    direction = upper(direction)
-    y = union(f,1)
-    for t in xrange(0,360,theta):
-        Irot = interot(Iab, t, direction)
-        y = intersec(y, infgen(f, Irot))
-    return y
-
-
-def infgen(f, Iab):
-    """
-    y = infgen(f, Iab)
-
-    Inf-generating.
-
-    `infgen` creates the image `y` by computing the transformation of
-    the image `f` by the inf-generating operator (or dual of the
-    hit-or-miss) characterized by the interval `Iab`.
-
-    Parameters
-    ----------
-    f :   Binary image.
-    Iab : Interval
-
-    Returns
-    -------
-    y: Binary image.
-    """
-
-    A,Bc = Iab
-    return union(dilate(f, A),dilate(neg(f), Bc))
-
-
-def infrec(f, g, Bc=None):
-    """
-    y = infrec(f, g, Bc={3x3 cross})
-
-    Inf-reconstruction.
-
-    `infrec` creates the image `y` by an infinite number of recursive
-    iterations (iterations until stability) of the dilation of `f` by
-    Bc conditioned to `g`. We say the `y` is the inf-reconstruction of
-    g from the marker `f`. For algorithms and applications, see
-    Vinc:93b.
-
-    Parameters
-    ----------
-    f :  Marker image (gray or binary).
-    g :  Conditioning image (gray or binary).
-    Bc : Connectivity Structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Image
-    """
-    """
-    - Examples
-        #
-        #   example 1
-        #
-        g=readgray('text_128.tif')
-        f=erode(g,seline(9,90))
-        y=infrec(f,g,sebox())
-        show(g)
-        show(f)
-        show(y)
-        #
-        #   example 2
-        #
-        g=neg(readgray('n2538.tif'))
-        f=intersec(g,0)
-        f=draw(f,'LINE:40,30,60,30:END')
-        y30=cdilate(f,g,sebox(),30)
-        y=infrec(f,g,sebox())
-        show(g)
-        show(f)
-        show(y30)
-        show(y)
-    """
-    if Bc is None: Bc = secross()
-    n = f.size
-    return cdilate(f, g, Bc, n);
-
-
-def inpos(f, g, Bc=None):
-    """
-    y = inpos(f, g, Bc={3x3 cross})
-
-    Minima imposition.
-
-    Minima imposition on `g` based on the marker `f`. `inpos` creates
-    an image `y` by filing the valleys of `g` that do not cover the
-    connect components of `f`. A remarkable property of `y` is that its
-    regional minima are exactly the connect components of `g`.
-
-    Parameters
-    ----------
-    f :  Binary image. Marker image.
-    g :  Gray-scale (uint8 or uint16) image. input image.
-    Bc : connectivity structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) image.
-    """
-
-    if Bc is None: Bc = secross()
-    assert isbinary(f), 'pymorph.inpos: first parameter must be binary image'
-    fg = gray(neg(f),datatype(g))
-    k = limits(g)[1] - 1
-    return suprec(fg, intersec(union(g, 1), k, fg), Bc)
-
-
-def interot(Iab, theta=45, direction="clockwise"):
-    """
-    Irot = interot(Iab, theta=45, direction="clockwise")
-
-    Rotate an interval
-
-    `interot` rotates the interval `Iab` by `theta`.
-
-    Parameters
-    ----------
-    Iab :       Interval
-    theta :     Degrees of rotation. Should be a multiple of 45 degrees. If not,
-                   the rotation is approximate (default: 45).
-    direction : { 'clockwise' [default], 'anti-clockwise' }
-
-    Returns
-    -------
-    Irot : Interval
-
-    Examples
-    --------
-
-    ::
-
-        b1 = endpoints()
-        b2 = interot(b1)
-        print intershow(b1)
-        print intershow(b2)
-
-    """
-    from string import lower
-
-    direction = lower(direction)
-    A,Bc = Iab
-    if direction != 'clockwise':
-        theta = 360 - theta
-    Irot = se2hmt(serot(A, theta),
-                    serot(Bc,theta))
-    return Irot
-
-
-def intersec(f1, f2, f3=None, f4=None, f5=None):
-    """
-    y = intersec(f1, f2, f3=None, f4=None, f5=None)
-
-    Intersection of images.
-
-    `intersec` creates the image `y` by taking the pixelwise minimum
-    between the images `f1`, `f2`, `f3`, `f4`, and `f5` . When `f1`,
-    `f2`, `f3`, `f4`, and f5 are binary images, `y` is the intersection
-    of them.
-
-    Parameters
-    ----------
-    f1 : Image (gray or binary) or constant.
-    f2 : Image (gray or binary) or constant.
-    f3 : Image (gray or binary) or constant, optional.
-    f4 : Image (gray or binary) or constant, optional.
-    f5 : Image (gray or binary) or constant, optional.
-
-    Returns
-    -------
-    y : Image
-    """
-    """
-    - Examples
-      #
-      #   example 1
-      #
-      f=to_uint8([255,  255,    0,   10,    0,   255,   250])
-      g=to_uint8([ 0,    40,   80,   140,  250,    10,    30])
-      print intersec(f, g)
-      print intersec(f, 0)
-      #
-      #   example 2
-      #
-      a = readgray('form-ok.tif')
-      b = readgray('form-1.tif')
-      c = intersec(a,b)
-      show(a)
-      show(b)
-      show(c)
-      #
-      #   example 3
-      #
-      d = readgray('tplayer1.tif')
-      e = readgray('tplayer2.tif')
-      f = readgray('tplayer3.tif')
-      g = intersec(d,e,f)
-      show(d)
-      show(e)
-      show(f)
-      show(g)
-    """
-# Should this be intersect(f0, f1, *args) and take an arbitrary nr of inputs?
-    from numpy import minimum
-
-    y = minimum(f1,f2)
-    if f3 != None: y = minimum(y,f3)
-    if f4 != None: y = minimum(y,f4)
-    if f5 != None: y = minimum(y,f5)
-    return y.astype(f1.dtype)
-
-
-def intershow(Iab):
-    """
-    s = intershow(Iab)
-
-    Visualize an interval.
-
-    `intershow` creates a representation for an interval using `0`, `1`
-    and `.` (don't care).
-
-    Parameters
-    ----------
-    Iab : Interval
-
-    Returns
-    -------
-    s : string representation of the interval.
-
-    Examples
-    --------
-    ::
-
-        print intershow(homothick())
-
-    prints out
-
-    ::
-
-        0 0 0
-        . 0 .
-        0 0 0
-    """
-    from numpy import array, product, reshape, choose
-    from string import join
-
-    assert (type(Iab) is tuple) and (len(Iab) == 2),'pymorph.intershow: not proper format of hit-or-miss template'
-    A,B = Iab
-    s = ''
-    for y in xrange(A.shape[0]):
-        for x in xrange(A.shape[1]):
-            if A[y,x]:
-                s += '1 '
-            elif B[y,x]:
-                s += '0 '
-            else:
-                s += '. '
-        s += '\n'
-    return s
-
-
-def isbinary(f):
-    """
-    is_b = isbinary(f)
-
-    Check for binary image
-
-    `isbinary` returns True if the datatype of the input image is
-    binary. A binary image has just the values `0` and `1`.
-
-    Parameters
-    ----------
-    f : Image
-
-    Returns
-    -------
-    is_b : bool
-        Whether `f` is a binary image
-    """
-    return f.dtype == bool
-
-def asbinary(f):
-    """
-    fbin = asbinary(f)
-
-    Transforms f into a binary image
-
-    Parameters
-    ----------
-    f : image of any type, consisting only of 0s and 1s.
-
-    Returns
-    -------
-      fbin : binary image
-    """
-    import numpy
-    if isbinary(f): return f
-    assert ( (f == 0) | (f == 1) ).sum() == f.size, 'pymorph.asbinary: f has values that are not 0 or 1.'
-    return (f != 0)
-
-def isequal(f1, f2):
-    """
-    r_eq = isequal(f1, f2)
-
-    Check if two images are equal
-
-    `isequal` compares the images `f1` and f2 and returns `True`, if
-    `f1 and `f2` have the same size and `f1(x) == f2(x)`, for all pixel `x`;
-    otherwise, returns `False`.
-
-    Parameters
-    ----------
-    f1 :  Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-    f2 :  Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-
-    Returns
-    -------
-    r_eq : Boolean
-        Whether the two images are equal
-    """
-    import numpy
-    if f1.shape != f2.shape:
-        return False
-    return numpy.all(f1 == f2)
-
-
-def labelflat(f, Bc=None, lambda_=0):
-    """
-    y = labelflat(f, Bc=None, lambda_=0)
-
-    Label the flat zones of gray-scale images.
-
-    `labelflat` creates the image y by labeling the flat zones of `f`,
-    according to the connectivity defined by the structuring
-    element `Bc`. A flat zone is a connected region of the image
-    domain in which all the pixels have the same gray-level
-    (lambda=0). When lambda is different than zero, a quasi-flat
-    zone is detected where two neighboring pixels belong to the same
-    region if their difference gray-levels is smaller or equal
-    `lambda`. The minimum label of the output image is 1 and the
-    maximum is the number of flat-zones in the image.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    Bc : Structuring element, optional
-        Connectivity (efault: 3x3 elementary cross).
-    lambda_ : Default: 0. Connectivity given by ``|f(q)-f(p)|<=lambda_``.
-
-    Returns
-    -------
-    y: ndarray of same shape as `f`
-        If number of labels is less than 65535, the data type is uint16;
-        otherwise, it is int32.
-    """
-    """
-            f=to_uint8([
-               [5,5,8,3,0],
-               [5,8,8,0,2]])
-            g=labelflat(f)
-            print g
-            g1=labelflat(f,secross(),2)
-            print g1
-            #
-            #   example 2
-            #
-            f=readgray('blob.tif')
-            d=dist(f,sebox(),'euclidean')
-            g= d /8
-            show(g)
-            fz=labelflat(g,sebox());
-            lblshow(fz)
-            print fz.max()
-            #
-            #   example 3
-            #
-            f=readgray('pcb_gray.tif')
-            g=labelflat(f,sebox(),3)
-            show(f)
-            lblshow(g)
-    """
-    from numpy import allclose, ravel, nonzero, array
-    import numpy as np
-    if Bc is None: Bc = secross()
-    assert not lambda_, 'pymorph.labelflat: only lambda_==0 is supported.'
-
-    label = 1
-    labeled = np.zeros(f.shape, np.uint16)
-    fmark = np.zeros_like(f)
-    Y,X = np.where(f)
-    for y,x in zip(Y,X):
-        if labeled[y,x]: continue
-        val = f[y,x]
-        fmark[y,x] = val
-        r = infrec(fmark, (f == val), Bc)
-        labeled[r] = label
-        fmark[y,x] = 0
-        label += 1
-    return labeled
-
-
-def lastero(f, B=None):
-    """
-    Last erosion.
-
-    y = lastero(f, B=None)
-
-    `lastero` creates the image y by computing the last erosion by
-    the structuring element B of the image f . The objects found in
-    y are the objects of the erosion by nB that can not be
-    reconstructed from the erosion by (n+1)B , where n is a generic
-    non negative integer. The image y is a proper subset of the
-    morphological skeleton by B of f .
-
-    Parameters
-    ----------
-    f : Binary image.
-    B : Structuring Element (default: 3x3 elementary cross).
-
-    Returns
-    -------
-    y : Binary image.
-    """
-
-    assert isbinary(f),'pymorph.lastero: can only process binary images'
-    if B is None: B = secross()
-    dt = dist(f,B)
-    return regmax(dt,B)
-
-
-def open(f, b=None):
-    """
-    y = open(f, b={3x3 cross})
-
-    Morphological opening.
-
-    `open` creates the image y by the morphological opening of the
-    image `f` by the structuring element `b`. In the binary case, the
-    opening by the structuring element `b` may be interpreted as the
-    union of translations of `b` included in `f`. In the gray-scale
-    case, there is a similar interpretation taking the functions
-    umbra.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    b : Structuring element (default: 3x3 elementary cross).
-
-    Returns
-    -------
-    y : Image
-    """
-
-    if b is None: b = secross()
-    return dilate(erode(f,b),b)
-
-
-def openrec(f, Bero=None, Bc=None):
-    """
-    y = openrec(f, Bero={3x3 cross}, Bc={3x3 cross})
-
-    Opening by reconstruction.
-
-    `openrec` creates the image `y` by an inf-reconstruction of the
-    image `f` from its erosion by `bero`, using the connectivity
-    defined by `Bc`.
-
-    Parameters
-    ----------
-    f :    Gray-scale (uint8 or uint16) or binary image.
-    Bero : Eroding structuring element (default: 3x3 cross).
-    Bc :   Connecting structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Image (same type as f).
-    """
-
-    if Bero is None: Bero = secross()
-    if Bc is None: Bc = secross()
-    return infrec(erode(f,Bero),f,Bc)
-
-
-def openrecth(f, Bero=None, Bc=None):
-    """
-    y = openrecth(f, Bero={3x3 cross}, Bc={3x3 cross})
-
-    Open-by-Reconstruction Top-Hat.
-
-    `openrecth` creates the image `y` by subtracting the open by
-    reconstruction of `f`, defined by the structuring elements `Bero` and
-    `Bc`, of `f` itself.
-
-    Parameters
-    ----------
-    f :    Gray-scale (uint8 or uint16) or binary image.
-    Bero : Erosion structuring element (default: 3x3 cross).
-    Bc :   Connectivity structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Image of same type as `f`.
-    """
-    if Bero is None: Bero = secross()
-    if Bc is None: Bc = secross()
-    return subm(f, openrec(f, Bero, Bc))
-
-
-def openth(f, b=None):
-    """
-    y = openth(f, b={3x3 cross})
-
-    Opening Top Hat.
-
-    `openth` creates the image y by subtracting the morphological
-    opening of `f` by the structuring element `b` of `f` itself.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    b : Structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Image of same type as `f`.
-    """
-    """
-        - Examples
-            #
-            a = readgray('keyb.tif')
-            show(a)
-            b = openth(a,sebox(3))
-            show(b)
-    """
-
-    if b is None: b = secross()
-    return subm(f, open(f,b))
-
-
-def opentransf(f, type='octagon', n=65535, Bc=None, Buser=None):
-    """
-    y = opentransf(f, type='octagon', n=65535, Bc={3x3 cross}, Buser={3x3 cross})
-
-    Open transform.
-
-    Compute the open transform of a binary image. The value of the
-    pixels in the open transform is radius of the smallest disk, which
-    if used to open, nullifies that pixel.
-
-    The disk sequence must satisfy the following: if `r > s`, then `rB` is
-    `sB`-open, i.e. `open(rB,sB) == rB`. Note that the Euclidean
-    disk does not satisfy this property in the discrete grid. This
-    function also computes the reconstructive open transform by
-    adding the suffix '-rec' in the 'type' parameter.
-
-    Parameters
-    ----------
-    f : binary image.
-    type : { 'octagon' [default], 'chessboard', 'citi-block', 'linear-h', 'linear-v', 'linear-45r', 'user' }
-        disk family.
-    n : integer, optional
-        Maximum disk radius (default: 65535).
-    Bc :  Structuring element, optional
-        Connectivity for the reconstructive opening. Used if '-rec' suffix is
-        appended in the 'type' string. default: 3x3 cross
-    Buser : structure element, optional
-        user disk, used if 'type' is 'user'.
-
-    Returns
-    -------
-    y : Gray-scale (uint16) image.
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            f = binary([
-                          [0,0,0,0,0,0,0,0],
-                          [0,0,1,1,1,1,0,0],
-                          [0,0,1,1,1,1,1,0],
-                          [0,1,0,1,1,1,0,0],
-                          [1,1,0,0,0,0,0,0]])
-            print opentransf( f, 'city-block')
-            print opentransf( f, 'linear-h')
-            print opentransf( f, 'linear-45r')
-            print opentransf( f, 'user',10,secross(),binary([0,1,1]))
-            print opentransf( f, 'city-block-rec')
-            #
-            #   example 2
-            #
-            f=readgray('numbers.tif')
-            show(f)
-            g=opentransf(f,'OCTAGON')
-            show(g)
-            #
-            #   example 3
-            #
-            b=sedisk(3,'2D','OCTAGON')
-            g1=open(f,b)
-            show(g1)
-            g2=(g > 3)
-            print g1 == g2
-    """
-    import numpy as np
-    from string import lower
-    if Bc is None: Bc = secross()
-    if Buser is None: Buser = secross()
-    assert isbinary(f),'pymorph.opentransf: input image is not binary'
-    type = lower(type)
-    rec_flag = False
-    if type.endswith('-rec'):
-        rec_flag = True
-        type = type[:-len('-rec')]
-    disk_se = (type in ('octagon', 'chessboard', 'city-block'))
-    if disk_se:
-        n  = min(n,min(f.shape))
-    elif  type == 'linear-h':
-        se = binary([[1, 1, 1]])
-        n  = min(n,f.shape[1])
-    elif  type =='linear-v':
-        se = binary([
-                [1],
-                [1],
-                [1]])
-        n  = min(n,f.shape[0])
-    elif  type == 'linear-45r':
-        se = binary([
-                    [0, 0, 1],
-                    [0, 1, 0],
-                    [1, 0, 0]])
-        n  = min(n,min(f.shape))
-    elif  type == 'linear-45l':
-        se = binary([
-                    [1, 0, 0],
-                    [0, 1, 0],
-                    [0, 0, 1]])
-        n  = min(n,min(f.shape))
-    elif  type == 'user':
-        se = Buser
-        n  = min(n,min(f.shape))
-    else:
-        assert False, \
-            'pymorph.opentransf: only accepts octagon, chessboard, \
-                city-block, linear-h, linear-v, linear-45r, linear-45l, or user as type, or with suffix -rec.'
-    y = np.zeros(f.shape, np.uint8)
-    for k in xrange(n):
-        prev = y
-        if disk_se:
-            a = open(f, sedisk(k, 2, type))
-        else:
-            a = open(f, sesum(se,k))
-        y = addm(y, gray(a,'uint16',1))
-        if isequal(y, prev):
-            break
-
-    if rec_flag:
-        return grain(label(f,Bc), y, 'max')
-    return y
-
-
-def patspec(f, type='octagon', n=65535, Bc=None, Buser=None):
-    """
-    h = patspec(f, type='octagon', n=65535, Bc={3x3 cross}, Buser=None)
-
-    Pattern spectrum (also known as granulometric size density).
-
-    Compute the Pattern Spectrum of a binary image. See Mara:89b .
-    The pattern spectrum is the histogram of the open transform, not
-    taking the zero values.
-
-    Parameters
-    ----------
-    f :     Binary image.
-    type : { 'octagon' [default], 'chessboard', 'citi-block', 'linear-h', 'linear-v', 'linear-45r', 'user' }
-        disk family.
-    n : integer, optional
-        Maximum disk radius (default: 65535).
-    Bc :  Structuring element, optional
-        Connectivity for the reconstructive granulometry. Used if '-rec' suffix
-        is appended in the 'type' string. default: 3x3 cross
-    Buser : structure element, optional
-        user disk, used if 'type' is 'user'.
-
-    Returns
-    -------
-    h : ndarray
-    """
-
-    if Bc is None: Bc = secross()
-    if Buser is None: Buser = secross()
-    assert isbinary(f),'pymorph.patspec: Error: input image is not binary'
-    g = opentransf(f,type,n,Bc,Buser)
-    h = histogram(g)
-    h = h[1:]
-    return h
-
-
-def regmax(f, Bc=None):
-    """
-    y = regmax(f, Bc={3x3 cross})
-
-    Regional Maximum.
-
-    `regmax` creates a binary image `y` by computing the regional
-    maxima of `f`, according to the connectivity defined by the
-    structuring element `Bc`. A regional maximum is a flat zone not
-    surrounded by flat zones of higher gray values.
-
-    Parameters
-    ----------
-    f :  Gray-scale image.
-    Bc : Connectivity structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Binary image.
-    """
-
-    if Bc is None: Bc = secross()
-    return regmin(neg(f),Bc)
-
-
-def regmin(f, Bc=None, option="binary"):
-    """
-    y = regmin(f, Bc=None, option="binary")
-
-    Regional Minimum (with generalized dynamics).
-
-    `regmin` creates a binary image by computing the regional
-    minima of `f`, according to the connectivity defined by the
-    structuring element `Bc`.
-
-    A regional minimum is a flat zone not surrounded by flat zones of
-    lower gray values. A flat zone is a maximal connected component of a
-    gray-scale image with same pixel values.
-
-    Parameters
-    ----------
-    f :      Gray-scale (uint8 or uint16) image.
-    Bc :     Connectivity structuring element (default: 3x3 cross).
-    option : 'binary'
-        if 'binary', outputs a binary image. Currently, it must be set to
-        'binary'. Fortunately, that's the default.
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) or binary image.
-
-
-    Not Implemented
-    ---------------
-
-    There are three output options: binary image; valued image; and
-    generalized dynamics. The dynamics of a regional minima is the
-    minimum height a pixel has to climb in a walk to reach another
-    regional minima with a higher dynamics.  The area-dyn is the minimum
-    area a catchment basin has to raise to reach another regional minima
-    with higher area-dynamics.  The volume-dyn is the minimum volume a
-    catchment basin has to raise to reach another regional minima with a
-    higher volume dynamics.
-
-    The dynamics concept was first introduced in Grimaud:92 and it is
-    the basic notion for the hierarchical or multiscale watershed
-    transform.
-
-    Controlled by option:
-
-    'value'
-        output a grayscale image with points at the regional minimum with the
-        pixel values of the input image
-    'dynamics'
-        output a grayscale image with points at the regional minimum with its
-        dynamics;
-    'area-dyn'
-        int32 image with the area-dynamics;
-    'volume-dyn'
-        int32 image with the volume-dynamics.
-
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            a = to_uint8([
-                [10,  10,  10,  10,  10,  10,  10],
-                [10,   9,   6,  18,   6,   5,  10],
-                [10,   9,   6,  18,   6,   5,  10],
-                [10,   9,   9,  15,   4,   9,  10],
-                [10,   9,   9,  15,  12,  10,  10],
-                [10,  10,  10,  10,  10,  10,  10]])
-            print regmin(a)
-            print regmin(a,secross(),'value')
-            print regmin(a,secross(),'dynamics')
-            #
-            #   example 2
-            #
-            f1=readgray('bloodcells.tif')
-            m1=regmin(f1,sebox())
-            show(f1,m1)
-            f2=hmin(f1,70)
-            show(f2)
-            m2=regmin(f2,sebox())
-            show(f2,m2)
-            #
-            #   example 3
-            #
-            f=readgray('cameraman.tif')
-            g=gradm(f)
-            mh=regmin(g,secross(),'dynamics')
-            ws1=cwatershed(g, binary(mh, 20))
-            ws2=cwatershed(g, binary(mh, 40))
-            show(ws1)
-            show(ws2)
-    """
-
-    if option != 'binary':
-        raise ValueError, "pymorph.regmin only implements option 'binary'"
-    if Bc is None: Bc = secross()
-    fplus = addm(f,1)
-    g = subm(suprec(fplus,f,Bc),f)
-    return union(threshad(g,1),threshad(f,0,0))
-
-
-def se2interval(a, b):
-    """
-    Iab = se2interval(a, b)
-
-    Create an interval from a pair of structuring elements.
-
-    `se2interval` creates the interval [a,b] from the structuring
-    elements `a` and `b` such that `a` is less or equal `b`.
-
-    Parameters
-    ----------
-    a : Structuring element left extremity
-    b : Structuring element right extremity
-
-    Returns
-    -------
-    Iab : Interval
-    """
-    return a, neg(b)
-
-
-def se2hmt(A, Bc):
-    """
-    Iab = se2hmt(A, Bc)
-
-    Create a Hit-or-Miss Template (or interval) from a pair of
-    structuring elements.
-
-    `se2hmt` creates the Hit-or-Miss Template (HMT), also called
-    interval `[A,Bc]` from the structuring elements `A` and `Bc` such that
-    `A` is included in the complement of `Bc` . The only difference
-    between this function and `se2interval` is that here the second
-    structuring element is the complement of the one used in the
-    other function. The advantage of this function over
-    `se2interval` is that this one is more flexible in the use of
-    the structuring elements as they are not required to have the
-    same size.
-
-    Parameters
-    ----------
-    A :  Structuring Element Left extremity.
-    Bc : Structuring Element Complement of the right extremity.
-
-    Returns
-    -------
-    Iab : Interval
-    """
-    return A, Bc
-
-
-def se2flatidx(f,Bc):
-    """
-    Bi = se2flatidx(f,Bc)
-
-    Transforms the Bc structuring element into an array of indices so that
-    f.flat[Bi[i]] corresponds to the i-th element where Bc is true
-
-    Equivalent of::
-
-        g = zeros(f.shape)
-        h,w=Bc.shape
-        g[:h,:w]=Bc
-        Bi, = where(g.ravel())
-
-    This is useful for implementing many functions. See the implementation of
-    `label()` for an example.
-
-    Parameters
-    ----------
-    f : image
-    Bc : structuring element
-
-    Returns
-    -------
-    Bi : array of indice offsets.
-    """
-    from numpy import array, where
-    h,w=Bc.shape
-    h //= 2
-    w //= 2
-    Bi=[]
-    for i,j in zip(*where(Bc)):
-        Bi.append( (j-w)+(i-h)*f.shape[1] )
-    return array(Bi)
-def sebox(r=1):
-    """
-    B = sebox(r=1)
-
-    Create a box structuring element.
-
-    `sebox` creates the structuring element B formed by r successive
-    Minkowski additions of the elementary square (i.e., the 3x3
-    square centered at the origin) with itself. If `R=0`, `B` is the
-    unitary set that contains the origin. If `R=1`, `B` is the
-    elementary square itself.
-
-    Parameters
-    ----------
-    r : integer, optional
-        size of box (default: 1)
-
-    Returns
-    -------
-    B : Structuring Element
-    """
-
-    return sesum(binary([[1,1,1],
-                         [1,1,1],
-                         [1,1,1]]),
-                 r)
-
-
-def secross(r=1):
-    """
-    B = secross(r=1)
-
-    Diamond structuring element and elementary 3x3 cross.
-
-    `secross` creates the structuring element `B` formed by `r`
-    successive Minkowski additions of the elementary cross (i.e.,
-    the 3x3 cross centered at the origin) with itself. If `r=0`, `B` is
-    the unitary set that contains the origin. If `r=1` (the default),
-    `B` is the elementary cross itself.
-
-    Parameters
-    ----------
-    r : integer, optional
-        radius (default: 1)
-
-    Returns
-    -------
-    B : Structuring Element
-    """
-    return sesum(binary([[0,1,0],
-                         [1,1,1],
-                         [0,1,0]]),
-                 r)
-
-
-def sedisk(r=3, dim=2, metric="euclidean", flat=True, h=0):
-    """
-    B = sedisk(r=3, dim=2, metric="euclidean", flat=True, h=0)
-
-    Create a disk or a semi-sphere structuring element.
-
-    `sedisk` creates a flat structuring element B that is disk under
-    the metric metric , centered at the origin and with radius r or
-    a non-flat structuring element that is a semi-sphere under the
-    metric metric, centered at (0, h) and with radius r . this
-    structuring element can be created on the 1D, 2D or 3D space.
-
-    Parameters
-    ----------
-    r :        Non-negative integer. Disk radius (default: 3)
-    dim : {1, 2 [default], 3}
-        dimension
-    metric : {'euclidean' [default], 'city-block', 'octagon', 'chessboard' }
-    flat : boolean, optional
-        default: True
-    h : double, optional
-        elevation of the center of the semi-sphere (default: 0).
-
-    Returns
-    -------
-    B : Structuring Element
-    """
-    from string import lower
-    from numpy import resize, transpose, arange
-    from numpy import sqrt, arange, transpose, maximum
-
-    metric = lower(metric)
-    assert dim== 2, 'pymorph.sedisk: Supports only 2D structuring elements'
-    if flat: y = binary([[1]])
-    else:    y = to_int32([[h]])
-    if r == 0: return y
-    if metric == 'city-block':
-        if flat:
-            b = secross(1)
-        else:
-            b = to_int32([[-2147483647, 0,-2147483647],
-                          [          0, 1,          0],
-                          [-2147483647, 0,-2147483647]])
-        return sedilate(y,sesum(b,r))
-    elif metric == 'chessboard':
-        if flat:
-            b = sebox(1)
-        else:
-            b = to_int32([[1,1,1],
-                          [1,1,1],
-                          [1,1,1]])
-        return sedilate(y,sesum(b,r))
-    elif metric == 'octagon':
-        if flat:
-            b1,b2 = sebox(1),secross(1)
-        else:
-            b1 = to_int32([
-                    [1,1,1],
-                    [1,1,1],
-                    [1,1,1]])
-            b2 = to_int32([
-                    [-2147483647, 0, -2147483647],
-                    [          0, 1,           0],
-                    [-2147483647, 0, -2147483647]])
-        if r == 1:
-            return b1
-        return sedilate(sedilate(y,sesum(b1,r//2)), sesum(b2,(r+1)//2))
-    elif metric == 'euclidean':
-        v = arange(-r,r+1)
-        x = resize(v, (len(v), len(v)))
-        y = transpose(x)
-        Be = binary(sqrt(x*x + y*y) <= (r+0.5))
-        if flat:
-            return Be
-        be = h + to_int32( sqrt( maximum((r+0.5)*(r+0.5) - (x*x) - (y*y),0)))
-        be = intersec(gray(Be,'int32'),be)
-        return be
-    else:
-        assert False,'Non valid metric'
-    return B
-
-
-def seline(length=3, theta=0):
-    """
-    B = seline(length=3, theta=0)
-
-    Create a line structuring element.
-
-    seline creates a structuring element B that is a line segment
-    that has an extremity at the origin, length `length` and angle
-    `theta` (0 degrees is east direction, clockwise). If `length==0` ,
-    it generates the origin.
-
-    Note that `length` is simply the number of on-pixels. Therefore, in
-    diagonal directions it is off by a factor of \sqrt{2}.
-
-    Parameters
-    ----------
-    length : Length of line (default: 3)
-    theta :  Degrees, clockwise (default: 0, i.e. east)
-
-    Returns
-    -------
-    B : Structuring Element
-
-    Examples
-    --------
-
-    ::
-
-        >>> import pymorph
-        >>> pymorph.seline(2)
-        array([[0],
-               [1],
-               [1]], dtype=uint8)
-        >>> pymorph.seline(4)
-        array([[0],
-               [0],
-               [0],
-               [1],
-               [1],
-               [1],
-               [1]], dtype=uint8)
-        >>> pymorph.seline(3,45)
-        array([[0, 0, 0],
-               [0, 1, 1],
-               [0, 0, 1]], dtype=uint8)
-
-    """
-    import numpy
-    from numpy import pi, tan, cos, sin, sign, floor, arange, transpose, array, ones
-
-    theta = pi*theta/180.
-    if abs(tan(theta)) <= 1:
-        s  = sign(cos(theta))
-        x0 = arange(length) * cos(theta)
-        x1 = floor(x0 * tan(theta) + 0.5)
-    else:
-        s  = sign(sin(theta))
-        x1 = arange(length) * sin(theta)
-        x0 = floor(x1 / tan(theta) + 0.5)
-    x = array(zip(x0, x1), int)
-    B = set2mat((x,))
-    return B
-
-
-def serot(b, theta=45, direction="clockwise"):
-    """
-    brot = serot(b, theta=45, direction="clockwise")
-
-    Rotate a structuring element.
-    `serot` rotates structuring element `b` by `theta` degrees.
-
-    Parameters
-    ----------
-    B :       Structuring Element
-    theta :   Degrees of rotation. Should be a multiple of 45 degrees. If not,
-                the rotation is approximate (default: 45).
-    direction : { 'clockwise' [default], 'anti-clockwise' }
-
-    Returns
-    -------
-    brot : structuring element
-    """
-    from string import lower
-    from numpy import array, transpose, concatenate
-    from numpy import cos, sin, pi
-
-    direction = lower(direction)
-    if direction == "anti-clockwise":
-       theta = -theta
-    theta = pi * theta/180.
-    ct = cos(theta)
-    st = sin(theta)
-    y,v = mat2set(b)
-    if len(y)==0: return binary([0])
-    x0 = y[:,1] * cos(theta) - y[:,0] * sin(theta)
-    x1 = y[:,1] * sin(theta) + y[:,0] * cos(theta)
-    x0 = to_int32((x0 +0.5)*(x0>=0) + (x0-0.5)*(x0<0))
-    x1 = to_int32((x1 +0.5)*(x1>=0) + (x1-0.5)*(x1<0))
-    x = transpose(array([transpose(x1),transpose(x0)]))
-    brot = set2mat((x,v))
-    return brot
-
-
-def seshow(b, option="normal"):
-    """
-    y = seshow(b, option="NORMAL")
-
-    Display a structuring element as an image.
-
-    `seshow` used with the option 'expand' generates an image `y` that
-    is a suitable graphical representation of the structuring
-    element `b`. This function is useful to convert a structuring
-    element to an image. The origin of the structuring element is at
-    the center of the image. If `b` is flat, y is binary, otherwise, y
-    is signed `int32 image. When using the option 'non-flat', the
-    output `y` is always a signed `int32` image.
-
-    Parameters
-    ----------
-    b :      Structuring element
-    option : { 'normal' [default], 'expand', 'non-flat' }
-        Mode
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) or binary image.
-    """
-    from string import upper
-
-    option = upper(option)
-    if option=='NON-FLAT':
-        y = to_int32([0])
-        if isbinary(b):
-            b = intersec(gray(b,'int32'),0)
-    elif option=='NORMAL':
-        if isbinary(b):
-            y = binary([1])
-        else:
-           y = to_int32([0])
-    elif option=='EXPAND':
-        assert isbinary(b), 'pymorph.seshow: \'expand\' option is only available with flat SE'
-        y = sedilate(binary([1]),b)
-        b1 = (y>=0)
-        b0 = erode(y,b)
-        return bshow(b1,y,b0)
-    else:
-        assert False, 'pymorph.seshow: not a valid flag: NORMAL, EXPAND or NON-FLAT'
-    return sedilate(y,b)
-
-
-def sesum(B=None, N=1):
-    """
-    Bn = sesum(B=None, N=1)
-
-    N-1 iterative Minkowski additions
-
-    `sesum` creates the structuring element `Bn` from `N - 1` iterative
-    Minkowski additions with the structuring element `B`.
-
-    Parameters
-    ----------
-    B : Structuring element (Default: 3x3 elementary cross).
-    N : Non-negative integer. Default: 1.
-
-    Returns
-    -------
-    Bn : Structuring Element
-    """
-
-    if B is None: B = secross()
-    if N==0:
-        if isbinary(B): return binary([[1]])
-        else:           return to_int32([[0]]) # identity
-    NB = B
-    for i in xrange(N-1):
-        NB = sedilate(NB,B)
-    return NB
-
-
-def setrans(Bi, t):
-    """
-    Bo = setrans(Bi, t)
-
-    Translate a structuring element
-
-    setrans translates a structuring element by a specific value.
-
-    Parameters
-    ----------
-    Bi : Structuring Element
-    t : translation amount
-
-    Returns
-    -------
-    Bo : Structuring element of same type as `Bi`
-    """
-
-    x,v = mat2set(Bi)
-    Bo = set2mat((x+t,v))
-    return Bo.astype(Bi.dtype)
-
-
-def sereflect(Bi):
-    """
-    Bo = sereflect(Bi)
-
-    Reflect a structuring element
-
-    `sereflect` reflects a structuring element about the origin
-
-    Parameters
-    ----------
-    Bi : Structuring Element
-
-    Returns
-    -------
-    Bo : Structuring element of same type as `Bi`
-    """
-    return Bi[::-1, ::-1]
-
-
-def sedilate(B1, B2):
-    """
-    Bo = sedilate(B1, B2)
-
-    Dilate one structuring element by another
-
-    `sedilate` dilates an structuring element by another. The main
-    difference between this dilation and `dilate` is that the dilation
-    between structuring elements are not bounded, returning another
-    structuring element usually larger than anyone of them. This
-    gives the composition of the two structuring elements by
-    Minkowski addition.
-
-    Parameters
-    ----------
-    B1 : Structuring Element
-    B2 : Structuring Element
-
-    Returns
-    -------
-    Bo: Structuring Element
-    """
-    from numpy import newaxis, array, int32
-
-    assert (isbinary(B1) or (B1.dtype == int32)) and (isbinary(B2) or B2.dtype == int32), 'pymorph.sedilate: s.e. must be binary or int32'
-    if len(B1.shape) == 1: B1 = B1[newaxis,:]
-    if len(B2.shape) == 1: B2 = B2[newaxis,:]
-    if B1.dtype==int32 or B2.dtype == int32:
-       Bo = to_int32([limits(to_int32([0]))[0]])
-       if isbinary(B1):
-          B1 = gray(B1,'int32',0)
-       if isbinary(B2):
-          B2 = gray(B2,'int32',0)
-    else:
-       Bo = binary([0])
-    x,v = mat2set(B2)
-    if len(x):
-        for i in xrange(x.shape[0]):
-            s = add4dilate(B1,v[i])
-            st= setrans(s,x[i])
-            Bo = seunion(Bo,st)
-    return Bo
-
-
-def seunion(B1, B2):
-    """
-    B = seunion(B1, B2)
-
-    Union of structuring elements
-
-    `seunion` creates a structuring element from the union of two
-    structuring elements.
-
-    Parameters
-    ----------
-    B1 : Structuring element
-    B2 : Structuring element
-
-    Returns
-    -------
-    B : structure element
-        union of B1 and B2
-    """
-    from numpy import maximum, ones, asarray, newaxis, int32
-
-    assert B1.dtype == B2.dtype, 'Cannot have different datatypes:'
-    type1 = B1.dtype
-    if len(B1) == 0: return B2
-    if len(B1.shape) == 1: B1 = B1[newaxis,:]
-    if len(B2.shape) == 1: B2 = B2[newaxis,:]
-    if B1.shape != B2.shape:
-        inf = limits(B1)[0]
-        h1,w1 = B1.shape
-        h2,w2 = B2.shape
-        H,W = max(h1,h2),max(w1,w2)
-        Hc,Wc = (H-1)//2,(W-1)//2    # center
-        BB1,BB2 = asarray(B1),asarray(B2)
-        B1, B2  = inf * ones((H,W),int32), inf *ones((H,W),int32)
-        dh1s , dh1e = (h1-1)//2 , (h1-1)//2 + (h1+1)%2 # deal with even and odd dimensions
-        dw1s , dw1e = (w1-1)//2 , (w1-1)//2 + (w1+1)%2
-        dh2s , dh2e = (h2-1)//2 , (h2-1)//2 + (h2+1)%2
-        dw2s , dw2e = (w2-1)//2 , (w2-1)//2 + (w2+1)%2
-        B1[ Hc-dh1s : Hc+dh1e+1  ,  Wc-dw1s : Wc+dw1e+1 ] = BB1
-        B2[ Hc-dh2s : Hc+dh2e+1  ,  Wc-dw2s : Wc+dw2e+1 ] = BB2
-    B = maximum(B1,B2).astype(type1)
-    return B
-
-
-def skelm(f, B=None, return_binary=True):
-    """
-    y = skelm(f, B={3x3 cross}, return_binary=True)
-
-    Morphological skeleton (Medial Axis Transform).
-
-    `skelm` creates the image `y` by computing the morphological
-    skeleton by `B` of the image `f`. In this
-    case, the pixels of value 1 in y are center of maximal balls
-    (generated from B ) included in `f`. This is also called Medial
-    Axis. If `return_binary` is False, the non zeros pixels in `y` are the
-    radius plus 1 of the maximal balls. This is called Medial Axis
-    Transform or valued morphological skeleton.
-
-    Parameters
-    ----------
-    f :      Binary image.
-    B :      Structuring Element Default: None (3x3 elementary
-               cross).
-    return_binary : boolean, optional
-         Whether to return a binary image of the medial axis (the default) or a
-         greyscale a binary image (medial axis); value: output a grayscale
-         image with values of the radius of the disk to reconstruct the
-         original image (medial axis transform).
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) or binary image.
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            from numpy import ones
-            a=neg(frame(binary(ones((7,9)))))
-            print a
-            print skelm(a)
-            print skelm(a,sebox())
-            #
-            #   example 2
-            #
-            a=readgray('pcbholes.tif')
-            b=skelm(a)
-            show(a)
-            show(b)
-            #
-            #   example 3
-            #
-            c=skelm(a,secross(),'value')
-            show(c)
-    """
-    from numpy import asarray
-    if B is None: B = secross()
-    assert isbinary(f),'pymorph.skelm: only works for binary images'
-    k1,k2 = limits(f)
-    y = gray(intersec(f, k1),'uint16')
-    iszero = asarray(y)
-    nb = sesum(B,0)
-    for r in xrange(1,65535):
-        ero = erode(f,nb)
-        if isequal(ero, iszero): break
-        f1 = openth(ero, B)
-        nb = sedilate(nb, B)
-        y = union(y, gray(f1,'uint16',r))
-    if return_binary:
-        return binary(y)
-    return y
-
-
-def skelmrec(f, B=None):
-    """
-    y = skelmrec(f, B={3x3 cross})
-
-    Morphological skeleton reconstruction
-    (inverse medial axis transform).
-
-    `skelmrec` reconstructs the valued morphological skeleton to
-    recover the original image.
-
-    Parameters
-    ----------
-    f : Gray-scale (uint8 or uint16) or binary image.
-    B : Structuring element (default: 3x3 cross).
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    """
-        - Examples
-            #
-            from numpy import ones
-            a=neg(frame(binary(ones((7,9)))))
-            print a
-            b=skelm(a,secross(),'value')
-            print b
-            c=skelmrec(b,secross())
-            print c
-    """
-    if B is None: B = secross()
-    y = binary(intersec(f, 0))
-    for r in xrange(f.max(),1,-1):
-        y = dilate(union(y,binary(f,r)), B)
-    return union(y, binary(f,1))
-
-
-def skiz(f, Bc=None, return_lines=False, metric=None):
-    """
-    labeled = skiz(f, Bc={3x3 cross}, return_lines=False, metric=None)
-    labeled,lines = skiz(f, Bc={3x3 cross}, return_lines=True, metric=None)
-
-    Skeleton of Influence Zone - also know as Generalized Voronoi Diagram
-
-
-
-    `skiz` creates the `labeled` image by detecting the lines which are
-    equidistant to two or more connected components of `f`, according
-    to the connectivity defined by `Bc`.
-
-    `labeled` will be a labeled image, while `lines` will be a binary image
-    of the lines between the regions Depending on with the flag
-
-    When the connected objects of `f` are single points, the `skiz` is the
-    Voronoi diagram.
-
-    Parameters
-    ----------
-    f : Binary image.
-    Bc : Structuring Element (default: 3x3 cross).
-        Connectivity for the distance measurement.
-    return_lines : boolean, optional
-        Whether to return the lines separating regions in the image.
-        Default: False
-    metric : str, optional
-        default: 'euclidean'
-
-    Returns
-    -------
-    y : Gray-scale (uint8 or uint16) image.
-    lines : binary image.
-        only returned if `return_lines` is ``True``
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            f=readgray('blob2.tif')
-            y=skiz(f,sebox(),'LINES','EUCLIDEAN')
-            show(f,y)
-            #
-            #   example 2
-            #
-            from numpy import zeros
-            f=binary(zeros((100,100)))
-            f[30,25],f[20,75],f[50,50],f[70,30],f[80,70] = 1,1,1,1,1
-            y = skiz(f,sebox(),'LINES','EUCLIDEAN')
-            show(f,y)
-    """
-    from string import upper
-    if Bc is None: Bc = secross()
-    d = dist(neg(f), Bc, metric)
-    return cwatershed(d,f,Bc,return_lines)
-
-def subm(f1, f2):
-    """
-    y = subm(f1, f2)
-
-    Subtraction of two images, with saturation.
-
-    `subm` creates the image `y` by pixelwise subtraction of the image
-    `f2` from the image `f1`. When the subtraction of the values of two
-    pixels is negative, 0 is taken as the result of the subtraction.
-    When `f1` and `f2` are binary images, `y` represents the set
-    subtraction of `f2` from `f1`.
-
-    Parameters
-    ----------
-    f1 : Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image.
-    f2 : Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image. Or constant.
-
-    Returns
-    -------
-    y : ndarray of same shape and dtype as `f1`
-
-    Examples
-    --------
-
-    ::
-
-        f = to_uint8([255,   255,    0,   10,   20,   10,    0,   255,  255])
-        g = to_uint8([10,     20,   30,   40,   50,   40,   30,    20,    10])
-        print subm(f, g)
-        print subm(f, 100)
-        print subm(100, f)
-
-    ::
-
-        a = readgray('boxdrill-C.tif')
-        b = readgray('boxdrill-B.tif')
-        c = subm(a,b)
-        show(a)
-        show(b)
-        show(c)
-    """
-    from numpy import array, clip
-
-    if type(f2) is array:
-        if f1.dtype != f2.dtype:
-            raise TypeError('pymorph.subm(): arguments cannot have different datatypes')
-    bottom,top = limits(f1)
-    y = clip(f1.astype('d') - f2, bottom, top)
-    return y.astype(f1.dtype)
-
-
-def supcanon(f, Iab, theta=45, direction="clockwise"):
-    """
-    y = supcanon(f, Iab, theta=45, direction="clockwise")
-
-    Union of sup-generating or hit-miss operators.
-
-    `supcanon` creates the image `y` by computing the union of
-    transformations of the image `f` by sup-generating operators.
-    These hit-miss operators are characterized by rotations (in the
-    clockwise or anti-clockwise direction) of `theta` degrees of the
-    interval `Iab`.
-
-    Parameters
-    ----------
-    f : Binary image.
-    Iab : Interval
-    theta : {45 [default], 90, 180 }
-        Angle of rotation in degrees.
-    direction : {'clockwise' [default], 'anti-clockwise'}
-        Direction of rotation
-
-    Returns
-    ------
-    y : Binary image.
-    """
-    y = intersec(f,0)
-    for t in xrange(0,360,theta):
-        Irot = interot(Iab, t, direction)
-        y = union(y, supgen(f, Irot))
-    return y
-
-
-def supgen(f, interval):
-    """
-    y = supgen(f, interval)
-
-    Sup-generating (hit-miss).
-
-    `supgen` creates the binary image `y` by computing the transformation of
-    the image f by the sup-generating operator characterized by the interval
-    `Iab`. The sup-generating operator is just a relaxed template matching,
-    where the criterion to keep a shape is that it be inside the interval
-    `Iab`. Note that we have the classical template matching when `a==b`. Note
-    also that the sup-generating operator is equivalent to the classical
-    hit-miss operator.
-
-    Parameters
-    ----------
-    f :        Binary image.
-    interval : Interval
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            f=binary([
-               [0,0,1,0,0,1,1],
-               [0,1,0,0,1,0,0],
-               [0,0,0,1,1,0,0]])
-            i=endpoints()
-            print intershow(i)
-            g=supgen(f,i)
-            print g
-            #
-            #   example 2
-            #
-            a=readgray('gear.tif')
-            b=supgen(a,endpoints())
-            show(a)
-            show(dilate(b))
-    """
-
-    A,Bc = interval
-    return intersec(erode(f,A),
-                   erode(neg(f),Bc))
-
-def suprec(f, g, Bc=None):
-    """
-    y = suprec(f, g, Bc={3x3 cross})
-
-    Sup-reconstruction.
-
-    `suprec` creates the image `y` by an infinite number of iterations
-    (until stability) of the erosion of `f` by `Bc` conditioned to `g`.
-    We say that y is the sup-reconstruction of `g` from the marker `f`.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) or binary image.
-        Marker image.
-    g :  Gray-scale (uint8 or uint16) or binary image.
-        Conditioning image.
-    Bc : Connectivity structuring element (default: 3x3 cross)
-
-    Returns
-    -------
-    y : Image
-    """
-    from numpy import product
-    if Bc is None: Bc = secross()
-    n = product(f.shape)
-    return cerode(f,g,Bc,n);
-
-
-def bshow(f1, f2=None, f3=None, factor=17):
-    """
-    y = bshow(f1, f2=None, f3=None, factor=17)
-
-    Generate a graphical representation of overlaid binary images.
-    Does **not** actually display the image anywhere!
-
-    Generate an expanded binary image as a graphical representation
-    of up to three binary input images. The 1-pixels of the first
-    image are represented by square contours, the pixels of the
-    optional second image are represented by circles and for the
-    third image they are represented by shaded squares. This
-    function is useful to create graphical illustration of small
-    images.
-
-    Parameters
-    ----------
-    f1 :     Binary image.
-    f2 :     Binary image. Default: None.
-    f3 :     Binary image. Default: None.
-    factor : Double Default: 17. Expansion factor for the output
-                  image. Use odd values above 9.
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    import numpy
-    from numpy import newaxis, zeros, resize, transpose, floor, arange, array
-
-    if f1.shape == (): f1 = array([f1])
-    if len(f1.shape) == 1: f1 = f1[newaxis,:]
-    if f2 is not None and f1.shape != f2.shape or \
-        f3 is not None and f1.shape != f3.shape or \
-        f2 is not None and f3 is not None and f2.shape != f3.shape:
-        raise ValueError, 'pymorph.bshow: arguments must have the same shape'
-    s = factor
-    if factor < 9: s = 9
-    h,w = f1.shape
-    y = zeros((s*h, s*w),numpy.int32)
-    xc = resize(range(s), (s,s))
-    yc = transpose(xc)
-    r  = int(floor((s-8)/2. + 0.5))
-    circle = (xc - s//2)**2 + (yc - s//2)**2 <= r**2
-    r = arange(s) % 2
-    fillrect = resize(array([r, 1-r]), (s,s))
-    fillrect[ 0 , : ] = 0
-    fillrect[s-1, : ] = 0
-    fillrect[ : , 0 ] = 0
-    fillrect[ : ,s-1] = 0
-    for i in xrange(h):
-        for j in xrange(w):
-            m, n = s*i, s*j
-            if f1 and f1[i,j]:
-                y[m     ,n:n+s] = 1
-                y[m+s-1 ,n:n+s] = 1
-                y[m:m+s ,n    ] = 1
-                y[m:m+s ,n+s-1] = 1
-            if f2 and f2[i,j]:
-                y[m:m+s, n:n+s] += circle
-            if f3 and f3[i,j]:
-                y[m:m+s, n:n+s] += fillrect
-    return (y > 0)
-
-
-def symdiff(f1, f2):
-    """
-    y = symdiff(f1, f2)
-
-    Symmetric difference between two images
-
-    `symdiff` creates the image y by taken the union of the subtractions of `f1`
-    from `f2` and `f2` from `f1`. When `f1` and `f2` are binary images, y
-    represents the set of points that are in `f1` and not in `f2` or that are
-    in `f2` and not in `f1`.
-
-    Parameters
-    ----------
-    f1 : Gray-scale (uint8 or uint16) or binary image.
-    f2 : Gray-scale (uint8 or uint16) or binary image.
-
-    Returns
-    -------
-    y : Image
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            a = to_uint8([1, 2, 3, 4, 5])
-            b = to_uint8([5, 4, 3, 2, 1])
-            print symdiff(a,b)
-            #
-            #   example 2
-            #
-            c = readgray('tplayer1.tif')
-            d = readgray('tplayer2.tif')
-            e = symdiff(c,d)
-            show(c)
-            show(d)
-            show(e)
-    """
-    return union(subm(f1,f2),subm(f2,f1))
-symdif = symdiff
-
-
-def thick(f, Iab=None, n=-1, theta=45, direction="clockwise"):
-    """
-    y = thick(f, Iab=None, n=-1, theta=45, direction="clockwise")
-
-    Image transformation by thickening.
-
-    `thick` creates the binary image `y` by performing a thickening of the
-    binary image `f`. The number of iterations of the thickening is `n` and
-    each iteration is performed by union of `f` with the points that are
-    detected in f by the hit-miss operators characterized by rotations of theta
-    degrees of the interval `Iab`.
-
-    Parameters
-    ----------
-    f :         Binary image.
-    Iab :       Interval Default: None (homothick).
-    n :         Number of iterations. Default: -1, i.e., infinite
-    theta :     Degrees of rotation: 45 (default), 90, or 180.
-    direction : One of ('clockwise', 'anti-clockwise').
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    from numpy import product
-    if Iab is None: Iab = homothick()
-    assert isbinary(f),'f must be binary image'
-    if n == -1: n = product(f.shape)
-    y = f
-    zero = intersec(f,0)
-    for i in xrange(n):
-        aux = zero
-        for t in xrange(0,360,theta):
-            sup = supgen(y, interot(Iab, t, direction))
-            aux = union(aux, sup)
-            y = union(y, sup)
-        if isequal(aux,zero): break
-    return y
-
-
-def thin(f, Iab=None, n=-1, theta=45, direction="clockwise"):
-    """
-    y = thin(f, Iab={Homothin}, n={infinite}, theta=45, direction="clockwise")
-
-    Image transformation by thinning.
-
-    `thin` creates the binary image `y` by performing a thinning of the binary
-    image `f`. The number of iterations of the thinning is n and each iteration
-    is performed by subtracting the points that are detect in f by hit-miss
-    operators characterized by rotations of theta of the interval `Iab`. When
-    `n` is infinite and the interval is homothin (default conditions), thin
-    gives the skeleton by thinning.
-
-    Parameters
-    ----------
-    f :         Binary image.
-    Iab :       Interval Default:(homothin).
-    n :         Number of iterations. (default: -1, i.e. infinite)
-    theta :     Double Default: 45. Degrees of rotation: 45, 90, or
-                180.
-    direction : One of ('clockwise', 'anti-clockwise'). default: clockwise.
-
-    Returns
-    -------
-    y : Binary image.
-    """
-    """
-    - Examples
-      #
-      f=readgray('scissors.tif')
-      f1=thin(f)
-      show(f,f1) # skeleton
-      f2=thin(f1,endpoints(),15) # prunning 15 pixels
-      show(f,f2) # prunned skeleton
-    """
-    from numpy import product
-    from string import lower
-    if Iab is None: Iab = homothin()
-    direction = lower(direction)
-    assert isbinary(f),'f must be binary image'
-    if n == -1: n = product(f.shape)
-    y = f
-    zero = intersec(f,0)
-    for i in xrange(n):
-        aux = zero
-        for t in xrange(0,360,theta):
-            sup = supgen(y, interot(Iab, t, direction))
-            aux = union(aux, sup)
-            y = subm(y, sup)
-        if isequal(aux,zero): break
-    return y
-
-
-def union(f1, f2, *args):
-    """
-    y = union(f1, f2, f3=None, f4=None, f5=None, ...)
-
-    Union of images.
-
-    `union` creates the image `y` by taking the pixelwise maximum
-    between the images given. When the images are binary images,
-    y represents the union of them.
-
-    Parameters
-    ----------
-    f1 : Gray-scale (uint8 or uint16) or binary image.
-    f2 : Gray-scale (uint8 or uint16) or binary image. Or constant
-    args : Gray-scale (uint8 or uint16) or binary images.
-
-    Returns
-    -------
-    y : Image
-    """
-    """
-        - Examples
-            #
-            #   example 1
-            #
-            f=to_uint8([255, 255,  0,  10,   0, 255, 250])
-            print 'f=',f
-            g=to_uint8([  0,  40, 80, 140, 250,  10,  30])
-            print 'g=',g
-            print union(f, g)
-            print union(f, 255)
-            #
-            #   example 2
-            #
-            a = readgray('form-ok.tif')
-            b = readgray('form-1.tif')
-            c = union(a,b)
-            show(a)
-            show(b)
-            show(c)
-            #
-            #   example 3
-            #
-            d = readgray('danaus.tif')
-            e = (d < 80)
-            f = union(d,gray(e))
-            show(d)
-            show(e)
-            show(f)
-            #
-            #   example 4
-            #
-            g = readgray('tplayer1.tif')
-            h = readgray('tplayer2.tif')
-            i = readgray('tplayer3.tif')
-            j = union(g,h,i)
-            show(g)
-            show(h)
-            show(i)
-            show(j)
-    """
-    from numpy import maximum
-
-    y = maximum(f1,f2)
-    for f in args:
-        y = maximum(y,f)
-    return y.astype(f1.dtype)
-
-
-def watershed(f, Bc=None, return_lines=False):
-    """
-    W = watershed(f, Bc={3x3 cross}, return_lines=False)
-    W,Wl = watershed(f, Bc={3x3 cross}, return_lines=True)
-
-    Watershed transform.
-
-    `watershed` creates the image y by detecting the domain of the
-    catchment basins of `f`, according to the connectivity defined by
-    `Bc`.
-
-    The implementation of this function is based on VincSoil:91.
-
-    Parameters
-    ----------
-    f :  Gray-scale (uint8 or uint16) or binary image.
-    return_lines : boolean
-            Whether to return the boundaries (default: False)
-
-    Returns
-    -------
-    W : labeled image
-    Wl : separation lines
-    """
-    from string import upper
-    if Bc is None: Bc = secross()
-    return cwatershed(f,regmin(f,Bc),Bc,return_lines=return_lines)
-
-
-def maxleveltype(type='uint8'):
-    """
-    max = maxleveltype(type='uint8')
-
-    Returns the maximum value supported by a datatype
-
-    Parameters
-    ----------
-    type : { 'uint8' [default], 'uint16', 'int32'}
-
-    Returns
-    -------
-    max : numeric value
-        The maximum level value of `type`
-    """
-    if type == 'uint8': return 255
-    if type == 'binary': return 1
-    if type == 'uint16': return 65535
-    if type == 'int32': return 2147483647
-    assert False, 'pymorph.maxleveltype: does not support this data type:'+TYPE
-
-
-def to_int32(f):
-    """
-    Convert an image to an int32 image.
-
-    img = to_int32(f)
-
-    `to_int32` clips the input image between the values -2147483648 and
-    2147483647 and converts it to the signed 32-bit datatype.
-
-    Parameters
-    ----------
-    f : Any image
-
-    Returns
-    -------
-    img : The converted image
-    """
-    from numpy import int32, asanyarray
-    return asanyarray(f).astype(int32)
-
-
-def to_uint8(f):
-    """
-    img = to_uint8(f)
-
-    Convert an image to an uint8 image.
-
-    `to_uint8` clips the input image between the values 0 and 255 and
-    converts it to the unsigned 8-bit datatype.
-
-    Parameters
-    ----------
-    f : Any image
-
-    Returns
-    -------
-    img : Gray-scale uint8 image. The converted image
-
-    Examples
-    --------
-    ::
-
-        print to_uint8([-3, 0, 8, 600])
-
-    prints out
-
-    ::
-
-        [  0   0   8 255]
-    """
-    from numpy import array, clip, uint8
-
-    img = array(clip(f,0,255),uint8)
-    return img
-
-
-def to_uint16(f):
-    """
-    img = to_uint16(f)
-
-    Convert an image to a uint16 image.
-
-    `to_uint16` clips the input image between the values 0 and 65535 and
-    converts it to the unsigned 16-bit datatype.
-
-    Parameters
-    ----------
-    f : Any image
-
-    Returns
-    -------
-    img : The converted image
-    """
-    from numpy import array, clip
-
-    img = array(clip(f,0,65535)).astype('H')
-    return img
-
-
-def to_gray(f):
-    """
-    g = to_gray(f)
-
-    Transform (possibly color) image to gray image.
-
-    If input file is a color RGB image, it is converted to gray-scale using the
-    equation:
-
-        I = 0.2989 * R + 0.587 * G + 0.114 * B
-
-    Parameters
-    ----------
-    f : ndarray of shape HxWx3
-        color image.
-
-    Returns
-    -------
-    g : gray image of shape HxW same type as input
-    """
-    import numpy as np
-
-    if len(f.shape) == 2:
-        return f
-    if len(f.shape) != 3:
-        raise ValueError, 'pymorph.to_gray: can only handle gray and color images'
-    r = f[:,:,0]
-    g = f[:,:,1]
-    b = f[:,:,2]
-    if np.all( (r == g) & (r == b) ):
-        return r
-    g = (0.2989 * r + 0.5870 * g  +  0.1140 * b)
-    return g.astype(f.dtype)
-
-
-def datatype(f):
-    """
-    type = datatype(f)
-
-    Return the image datatype string
-
-    datatype returns a string that identifies the pixel datatype
-    of the image `f`.
-
-    Consider using f.dtype.
-
-    Parameters
-    ----------
-    f : Unsigned gray-scale (uint8 or uint16), signed (int32) or binary image
-        Any image
-
-    Returns
-    -------
-    type : str
-        String representation of image type: 'binary',
-        'uint8', 'uint16' or 'int32'
-    """
-    from numpy import bool, uint8, uint16, int32
-    code = f.dtype
-    if   code == bool: type='binary'
-    elif code == uint8: type='uint8'
-    elif code == uint16: type='uint16'
-    elif code == int32: type='int32'
-    else:
-        assert 0,'Does not accept this typecode: %s' % code
-    return type
-
-
-def add4dilate(f, c):
-    """
-    a = add4dilate(f, c)
-
-    Addition for dilation. Assumes that the minimum value of dtype(f) is
-    to represent -inf (where -inf + c == -inf, for all c)
-
-    Parameters
-    ----------
-    f : Gray-scale or binary image.
-    c : Gray-scale, binary image, or constant.
-
-    Returns
-    -------
-    a : f + c (but with correct implementation of -inf)
-    """
-    from numpy import asarray, minimum, maximum, float64
-
-    if not c:
-        return f
-    y = asarray(f,float64) + c
-    k1,k2 = limits(f)
-    y = ((f==k1) * k1) + ((f!=k1) * y)
-    y = maximum(minimum(y,k2),k1)
-    return y.astype(f.dtype)
-
-
-def mat2set(A):
-    """
-    C,V = mat2set(A)
-
-    Converts image representation from matrix to set
-
-    Return tuple with array of pixel coordinates and array of
-    corresponding pixel values. The input image is in the matrix
-    format, like the structuring element, where the origin (0,0) is
-    at the center of the matrix.
-
-    Parameters
-    ----------
-    A : ndarray
-        Image in matrix format, where the origin (0,0) is at the
-        center of the matrix.
-
-    Returns
-    -------
-    C : array of pixel coordinates
-    V : array of pixel values corresponding to the coordinates of C
-
-    See also
-    --------
-    set2mat : reverse function
-    """
-    from numpy import take, ravel, nonzero, transpose, newaxis
-
-    if len(A.shape) == 1: A = A[newaxis,:]
-    offsets = nonzero(ravel(A) - limits(A)[0])[0]
-    if len(offsets) == 0: return ([],[])
-    h,w = A.shape
-    x = [0,1]
-    x[0] = offsets//w - (h-1)//2
-    x[1] = offsets%w - (w-1)//2
-    x = transpose(x)
-    return x,take(ravel(A),offsets)
-
-
-def set2mat(A):
-    """
-    M = set2mat(A)
-
-    Converts image representation from set to matrix
-
-    Return an image in the matrix format built from a tuple of an
-    array of pixel coordinates and a corresponding array of pixel
-    values
-
-    Parameters
-    ----------
-    A : tuple (ndarray, ndarray) or tuple (ndarray,)
-        Tuple with array of pixel coordinates and optional array of
-        corresponding pixel values
-
-    Returns
-    -------
-    M : Image in matrix format, origin (0,0) at the matrix center
-
-
-    Examples
-    --------
-
-    ::
-
-        coords = to_int32([ [0,0] , [-1,0] , [1,1]])
-        print set2mat( (coords,) )
-
-    prints out
-
-    ::
-
-        [0,1,0]
-        [0,1,0]
-        [0,0,1]
-    """
-    from numpy import put, ones, ravel, shape, newaxis, array, asarray, max, int32
-    import numpy as np
-
-    if len(A) == 2:
-        x, v = A
-        v = asarray(v)
-    elif len(A) == 1:
-        x = A[0]
-        v = np.ones((len(x),), np.uint8)
-    else:
-        raise TypeError, 'pymorph.set2mat: argument must be a tuple of length 1 or 2'
-    if len(x) == 0:  return array([0]).astype(v.dtype)
-    if len(x.shape) == 1: x = x[newaxis,:]
-    dh,dw = abs(x).max(0)
-    h,w = (2*dh)+1, (2*dw)+1
-    M=ones((h,w),int32) * limits(v)[0]
-    offset = x[:,0] * w + x[:,1] + (dh*w + dw)
-    put(M,offset,v)
-    return M.astype(v.dtype)
-
-def pad4n(f, Bc, value, scale=1):
-    """
-    y = pad4n(f, Bc, value, scale=1)
-
-    pads f with value so that Bc can be applied scaled by scale.
-
-    Parameters
-    ----------
-    f :     Image
-    Bc :    Structuring Element (connectivity).
-    value : dtype
-        value to pad borders with
-    scale : (default=1).
-
-    Returns
-    -------
-    y : The converted image
-    """
-    from numpy import ones, array
-
-    if type(Bc) is not array:
-      Bc = seshow(Bc)
-    Bh, Bw = Bc.shape
-    assert Bh%2 and Bw%2, 'structuring element must be odd sized'
-    ch, cw = scale * Bh/2, scale * Bw/2
-    g = value * ones( f.shape + scale * (array(Bc.shape) - 1))
-    g[ ch: -ch, cw: -cw] = f
-    return g.astype(f.dtype)
-
diff --git a/python/plugins/sextante/pymorph/notimplemented.py b/python/plugins/sextante/pymorph/notimplemented.py
deleted file mode 100644
index 4b15f34a7b74..000000000000
--- a/python/plugins/sextante/pymorph/notimplemented.py
+++ /dev/null
@@ -1,145 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    notimplemented.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-"""
-This contains functions that were not implemented (yet).
-
-Consider them TODO items.
-"""
-
-def swatershed(f, g, B=None, LINEREG="LINES"):
-    """
-        - Purpose
-            Detection of similarity-based watershed from markers.
-        - Synopsis
-            y = swatershed(f, g, B=None, LINEREG="LINES")
-        - Input
-            f:       Gray-scale (uint8 or uint16) image.
-            g:       Gray-scale (uint8 or uint16) or binary image. Marker
-                     image. If binary, each connected component is an object
-                     marker. If gray, it is assumed it is a labeled image.
-            B:       Structuring Element Default: None (3x3 elementary
-                     cross). (watershed connectivity)
-            LINEREG: String Default: "LINES". 'LINES' or ' REGIONS'.
-        - Output
-            y: Gray-scale (uint8 or uint16) or binary image.
-        - Description
-            swatershed creates the image y by detecting the domain of the
-            catchment basins of f indicated by g , according with the
-            connectivity defined by B . This watershed is a modified version
-            where each basin is defined by a similarity criterion between
-            pixels. The original watershed is normally applied to the
-            gradient of the image. In this case, the gradient is taken
-            internally. According to the flag LINEREG y will be a labeled
-            image of the catchment basins domain or just a binary image that
-            presents the watershed lines. The implementation of this
-            function is based on LotuFalc:00 .
-        - Examples
-            #
-            f = to_uint8([
-                [0,  0,  0,  0,  0,  0,  0],
-                [0,  1,  0,  0,  0,  1,  0],
-                [0,  1,  0,  0,  0,  1,  0],
-                [0,  1,  1,  1,  1,  1,  0],
-                [0,  1,  0,  0,  0,  0,  0],
-                [0,  0,  0,  0,  0,  0,  0]])
-            m = to_uint8([
-                [0,  0,  0,  0,  0,  0,  0],
-                [0,  1,  0,  0,  0,  0,  0],
-                [0,  0,  0,  0,  0,  0,  0],
-                [0,  0,  0,  0,  0,  0,  0],
-                [0,  0,  0,  0,  0,  0,  0],
-                [0,  0,  0,  2,  0,  0,  0]])
-            print swatershed(f,m,secross(),'REGIONS')
-    """
-
-    if B is None: B = secross()
-    print 'Not implemented yet'
-    return None
-    return y
-
-
-def vmax(f, v=1, Bc=None):
-    """
-    y = vmax(f, v=1, Bc={3x3 cross})
-
-    Remove domes with volume less than v.
-
-    This operator removes connected domes with volume less
-    than `v`. This function is very similar to `hmax`, but instead
-    of using a gray scale criterion (contrast) for the dome, it uses
-    a volume criterion.
-
-    Parameters
-    ----------
-      f :  Gray-scale (uint8 or uint16) image.
-      v :  Volume parameter (default: 1).
-      Bc : Structuring element (default: 3x3 cross).
-    Returns
-    -------
-      y : Gray-scale (uint8 or uint16) or binary image.
-    """
-
-    if Bc is None: Bc = secross()
-    raise NotImplementedError, 'Not implemented yet'
-
-
-def flood(fin, T, option, Bc=None):
-    """
-    y = flood(fin, T, option, Bc=None)
-
-    Flooding filter h,v,a-basin and dynamics (depth, area, volume)
-
-    This is a flooding algorithm. It is the basis to implement many
-    topological functions. It is a connected filter that floods an
-    image following some topological criteria: area, volume, depth.
-    These filters are equivalent to area-close, volume-basin or
-    h-basin, respectively. This code may be difficult to understand
-    because of its many options. Basically, when t is negative, the
-    generalized dynamics: area, volume, h is computed. When the
-    flooding is computed, every time a new level in the flooding
-    happens, a test is made to verify if the criterion has reached.
-    This is used to set the value to that height. This value image
-    will be used later for sup-reconstruction (flooding) at that
-    particular level. This test happens in the raising of the water
-    and in the merging of basins.
-
-    Parameters
-    ----------
-      fin :    Gray-scale image (uint8 or uint16).
-      T :      Criterion value. If T==-1, then the dynamics is
-                 determined, not the flooding at this criterion. This was
-                 selected just to use the same algoritm to compute two
-                 completely distinct functions.
-      option : One of ('AREA', 'VOLUME', 'H').
-      Bc :     Structuring element (default: 3x3 cross)
-
-    Returns
-    -------
-      y : Gray-scale image (same type as input).
-    """
-
-    if Bc is None: Bc = secross()
-    raise NotImplementedError, 'pymorph.flood'
diff --git a/python/plugins/sextante/pymorph/pymorph_version.py b/python/plugins/sextante/pymorph/pymorph_version.py
deleted file mode 100644
index a55df4f1a047..000000000000
--- a/python/plugins/sextante/pymorph/pymorph_version.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    pymorph_version.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-__version__ = '0.96'
-__version_info__ = (0, 96)
diff --git a/python/plugins/sextante/pymorph/scripts/CMakeLists.txt b/python/plugins/sextante/pymorph/scripts/CMakeLists.txt
deleted file mode 100644
index c8316ec4fea1..000000000000
--- a/python/plugins/sextante/pymorph/scripts/CMakeLists.txt
+++ /dev/null
@@ -1,3 +0,0 @@
-FILE(GLOB PY_FILES *.py)
-
-INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/pymorph/scripts)
diff --git a/python/plugins/sextante/pymorph/scripts/addm.py b/python/plugins/sextante/pymorph/scripts/addm.py
deleted file mode 100644
index 34552e3dcb6f..000000000000
--- a/python/plugins/sextante/pymorph/scripts/addm.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    addm.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Additional_image=raster
-from sextante.pymorph.mmorph import addm
-img2 = gdal.Open(Additional_image)
-input_array2 = img2.ReadAsArray()
-output_array = addm(input_array, input_array2)
diff --git a/python/plugins/sextante/pymorph/scripts/areaclose.py b/python/plugins/sextante/pymorph/scripts/areaclose.py
deleted file mode 100644
index 0129ea2c20bf..000000000000
--- a/python/plugins/sextante/pymorph/scripts/areaclose.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    areaclose.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import areaclose
-output_array = areaclose(input_array, area)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/areaopen.py b/python/plugins/sextante/pymorph/scripts/areaopen.py
deleted file mode 100644
index a8cbc340cf2e..000000000000
--- a/python/plugins/sextante/pymorph/scripts/areaopen.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    areaopen.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##area=number 100
-from sextante.pymorph.mmorph import areaopen
-output_array = areaopen(input_array, area)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/asf.py b/python/plugins/sextante/pymorph/scripts/asf.py
deleted file mode 100644
index fd67aed00211..000000000000
--- a/python/plugins/sextante/pymorph/scripts/asf.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    asf.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##operation=selection opening after closing;closing after opening;opening after closing after opening;closing after opening after closing
-##iterations=number 1
-from sextante.pymorph.mmorph import asf
-operations=['OC', 'CO', 'OCO', 'COC']
-output_array=asf(input_array,operations[operation], n = iterations)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/asfrec.py b/python/plugins/sextante/pymorph/scripts/asfrec.py
deleted file mode 100644
index ca8b25364b80..000000000000
--- a/python/plugins/sextante/pymorph/scripts/asfrec.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    asfrec.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import asfrec
-asfrec()
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/binary.py b/python/plugins/sextante/pymorph/scripts/binary.py
deleted file mode 100644
index b22b9cf9a376..000000000000
--- a/python/plugins/sextante/pymorph/scripts/binary.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    binary.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##threshold=number 1
-from sextante.pymorph.mmorph import binary
-output_array=binary(input_array,threshold)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/cbisector.py b/python/plugins/sextante/pymorph/scripts/cbisector.py
deleted file mode 100644
index c858428673a4..000000000000
--- a/python/plugins/sextante/pymorph/scripts/cbisector.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    cbisector.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import cbisector
-cbisector()
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/cdilate.py b/python/plugins/sextante/pymorph/scripts/cdilate.py
deleted file mode 100644
index c1f3e3c146f4..000000000000
--- a/python/plugins/sextante/pymorph/scripts/cdilate.py
+++ /dev/null
@@ -1,31 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    cdilate.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Conditioning_image=raster
-##iterations=number 1
-from sextante.pymorph.mmorph import cdilate, binary
-img2 = gdal.Open(Conditioning_image)
-input_array2 = img2.ReadAsArray()
-output_array = cdilate(binary(input_array), binary(input_array2), n=iterations)
diff --git a/python/plugins/sextante/pymorph/scripts/center.py b/python/plugins/sextante/pymorph/scripts/center.py
deleted file mode 100644
index 7d2d8e209193..000000000000
--- a/python/plugins/sextante/pymorph/scripts/center.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    center.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import center
-output_array=center(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/close.py b/python/plugins/sextante/pymorph/scripts/close.py
deleted file mode 100644
index 1b7856e23f8e..000000000000
--- a/python/plugins/sextante/pymorph/scripts/close.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    close.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import close
-output_array=close(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/closeholes.py b/python/plugins/sextante/pymorph/scripts/closeholes.py
deleted file mode 100644
index e8b2b2319609..000000000000
--- a/python/plugins/sextante/pymorph/scripts/closeholes.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    closeholes.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import close_holes
-output_array=close_holes(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/closerec.py b/python/plugins/sextante/pymorph/scripts/closerec.py
deleted file mode 100644
index dafafc675488..000000000000
--- a/python/plugins/sextante/pymorph/scripts/closerec.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    closerec.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import closerec
-output_array=closerec(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/closerecth.py b/python/plugins/sextante/pymorph/scripts/closerecth.py
deleted file mode 100644
index db45c70fc08b..000000000000
--- a/python/plugins/sextante/pymorph/scripts/closerecth.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    closerecth.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import closerecth
-output_array=closerecth(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/closeth.py b/python/plugins/sextante/pymorph/scripts/closeth.py
deleted file mode 100644
index ac363565838f..000000000000
--- a/python/plugins/sextante/pymorph/scripts/closeth.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    closeth.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import closeth
-output_array=closeth(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/cthick.py b/python/plugins/sextante/pymorph/scripts/cthick.py
deleted file mode 100644
index 3c7a709e175b..000000000000
--- a/python/plugins/sextante/pymorph/scripts/cthick.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    cthick.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Conditioning_image=raster
-from sextante.pymorph.mmorph import cthick, binary
-img2 = gdal.Open(Conditioning_image)
-input_array2 = img2.ReadAsArray()
-output_array=cthick(binary(input_array), binary(input_array2))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/cthin.py b/python/plugins/sextante/pymorph/scripts/cthin.py
deleted file mode 100644
index 63fbbcd61227..000000000000
--- a/python/plugins/sextante/pymorph/scripts/cthin.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    cthin.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Conditioning_image=raster
-from sextante.pymorph.mmorph import cthin, binary
-img2 = gdal.Open(Conditioning_image)
-input_array2 = img2.ReadAsArray()
-output_arrary=cthin(binary(input_array), binary(input_array2))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/cwatershed.py b/python/plugins/sextante/pymorph/scripts/cwatershed.py
deleted file mode 100644
index cc7d612600d9..000000000000
--- a/python/plugins/sextante/pymorph/scripts/cwatershed.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    cwatershed.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Markers_image=raster
-from sextante.pymorph.mmorph import cwatershed
-img2 = gdal.Open(Markers_image)
-input_array2 = img2.ReadAsArray()
-output_arrary=cwatershed(input_array, input_array2)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/dilate.py b/python/plugins/sextante/pymorph/scripts/dilate.py
deleted file mode 100644
index 1303718e8792..000000000000
--- a/python/plugins/sextante/pymorph/scripts/dilate.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    dilate.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import dilate
-output_array=dilate(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/dist.py b/python/plugins/sextante/pymorph/scripts/dist.py
deleted file mode 100644
index 56a0ee027334..000000000000
--- a/python/plugins/sextante/pymorph/scripts/dist.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    dist.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import dist, binary
-output_array=dist(binary(input_array))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/erode.py b/python/plugins/sextante/pymorph/scripts/erode.py
deleted file mode 100644
index b16508d61429..000000000000
--- a/python/plugins/sextante/pymorph/scripts/erode.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    erode.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import erode
-output_array=erode(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/gdist.py b/python/plugins/sextante/pymorph/scripts/gdist.py
deleted file mode 100644
index ea358fca5238..000000000000
--- a/python/plugins/sextante/pymorph/scripts/gdist.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    gdist.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import gdist
-output_array=gdist(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/gradm.py b/python/plugins/sextante/pymorph/scripts/gradm.py
deleted file mode 100644
index 29cacaa67ba9..000000000000
--- a/python/plugins/sextante/pymorph/scripts/gradm.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    gradm.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import gradm
-output_array=gradm(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/hmax.py b/python/plugins/sextante/pymorph/scripts/hmax.py
deleted file mode 100644
index 45cd70e0d2d5..000000000000
--- a/python/plugins/sextante/pymorph/scripts/hmax.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    hmax.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Contrast_threshold=number 1
-from sextante.pymorph.mmorph import hmax
-output_array=hmax(input_array, Contrast_threshold)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/hmin.py b/python/plugins/sextante/pymorph/scripts/hmin.py
deleted file mode 100644
index 38d92d2b9de3..000000000000
--- a/python/plugins/sextante/pymorph/scripts/hmin.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    hmin.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Contrast_threshold=number 1
-from sextante.pymorph.mmorph import hmin
-output_array=hmin(input_array, Contrast_threshold)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/inpos.py b/python/plugins/sextante/pymorph/scripts/inpos.py
deleted file mode 100644
index f8dd4f2803eb..000000000000
--- a/python/plugins/sextante/pymorph/scripts/inpos.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    inpos.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Binary_marker_image=raster
-from sextante.pymorph.mmorph import inpos, binary
-img2 = gdal.Open(Binary_marker_image)
-input_array2 = img2.ReadAsArray()
-output_array=inpos(binary(input_array2), input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/isolines.py b/python/plugins/sextante/pymorph/scripts/isolines.py
deleted file mode 100644
index 82ac533e6e8e..000000000000
--- a/python/plugins/sextante/pymorph/scripts/isolines.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    isolines.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Number_of_isolines=number 10
-from sextante.pymorph.mmorph import isolines
-output_array=isolines(input_array, Number_of_isolines)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/label.py b/python/plugins/sextante/pymorph/scripts/label.py
deleted file mode 100644
index 9f58ed3b83b7..000000000000
--- a/python/plugins/sextante/pymorph/scripts/label.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    label.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import label
-output_array=label(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/labelflat.py b/python/plugins/sextante/pymorph/scripts/labelflat.py
deleted file mode 100644
index 56ff33af79f5..000000000000
--- a/python/plugins/sextante/pymorph/scripts/labelflat.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    labelflat.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Threshold=number 0
-from sextante.pymorph.mmorph import labelflat
-output_array=labelflat(input_array, Threshold)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/lastero.py b/python/plugins/sextante/pymorph/scripts/lastero.py
deleted file mode 100644
index c1239fa5bbb6..000000000000
--- a/python/plugins/sextante/pymorph/scripts/lastero.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    lastero.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import lastero
-output_array=lastero(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/neg.py b/python/plugins/sextante/pymorph/scripts/neg.py
deleted file mode 100644
index b4dd3fe4e43f..000000000000
--- a/python/plugins/sextante/pymorph/scripts/neg.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    neg.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import neg
-output_array = neg(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/openrec.py b/python/plugins/sextante/pymorph/scripts/openrec.py
deleted file mode 100644
index b018e90215a9..000000000000
--- a/python/plugins/sextante/pymorph/scripts/openrec.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    openrec.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import openrec
-output_array=openrec(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/openrecth.py b/python/plugins/sextante/pymorph/scripts/openrecth.py
deleted file mode 100644
index a602efda419c..000000000000
--- a/python/plugins/sextante/pymorph/scripts/openrecth.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    openrecth.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import openrecth
-output_array=openrecth(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/openth.py b/python/plugins/sextante/pymorph/scripts/openth.py
deleted file mode 100644
index 090e259172db..000000000000
--- a/python/plugins/sextante/pymorph/scripts/openth.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    openth.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import openth
-output_array=openth(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/opentransf.py b/python/plugins/sextante/pymorph/scripts/opentransf.py
deleted file mode 100644
index 8effb78b3ce0..000000000000
--- a/python/plugins/sextante/pymorph/scripts/opentransf.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    opentransf.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import opentransf, binary
-output_array=opentransf(binary(input_array))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/patspec.py b/python/plugins/sextante/pymorph/scripts/patspec.py
deleted file mode 100644
index cf627871bdab..000000000000
--- a/python/plugins/sextante/pymorph/scripts/patspec.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    patspec.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import patspec, binary
-output_array=patspec(binary(input_array))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/randomcolor.py b/python/plugins/sextante/pymorph/scripts/randomcolor.py
deleted file mode 100644
index 96a7d50ac67a..000000000000
--- a/python/plugins/sextante/pymorph/scripts/randomcolor.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    randomcolor.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import randomcolor
-output_array=randomcolor(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/regmax.py b/python/plugins/sextante/pymorph/scripts/regmax.py
deleted file mode 100644
index ef9249664101..000000000000
--- a/python/plugins/sextante/pymorph/scripts/regmax.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    regmax.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import regmax, binary
-output_array=regmax(binary(input_array))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/regmin.py b/python/plugins/sextante/pymorph/scripts/regmin.py
deleted file mode 100644
index 020dff4d7397..000000000000
--- a/python/plugins/sextante/pymorph/scripts/regmin.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    regmin.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import regmin, binary
-output_array=regmin(binary(input_array))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/skelm.py b/python/plugins/sextante/pymorph/scripts/skelm.py
deleted file mode 100644
index abbc7b9d0c62..000000000000
--- a/python/plugins/sextante/pymorph/scripts/skelm.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    skelm.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import skelm, binary
-output_array=skelm(binary(input_array))
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/skelmrec.py b/python/plugins/sextante/pymorph/scripts/skelmrec.py
deleted file mode 100644
index 66c86eb22128..000000000000
--- a/python/plugins/sextante/pymorph/scripts/skelmrec.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    skelmrec.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import skelmrec
-output_array=skelmrec(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/skiz.py b/python/plugins/sextante/pymorph/scripts/skiz.py
deleted file mode 100644
index e017cb5d594d..000000000000
--- a/python/plugins/sextante/pymorph/scripts/skiz.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    skiz.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import skiz
-output_array=skiz(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/subm.py b/python/plugins/sextante/pymorph/scripts/subm.py
deleted file mode 100644
index 8adc937d3acc..000000000000
--- a/python/plugins/sextante/pymorph/scripts/subm.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    subm.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Additional_image=raster
-from sextante.pymorph.mmorph import subm
-img2 = gdal.Open(Additional_image)
-input_array2 = img2.ReadAsArray()
-output_array = subm(input_array, input_array2)
diff --git a/python/plugins/sextante/pymorph/scripts/suprec.py b/python/plugins/sextante/pymorph/scripts/suprec.py
deleted file mode 100644
index d7ca64879b9b..000000000000
--- a/python/plugins/sextante/pymorph/scripts/suprec.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    suprec.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Additional_image=raster
-from sextante.pymorph.mmorph import suprec
-img2 = gdal.Open(Additional_image)
-input_array2 = img2.ReadAsArray()
-output_array = suprec(input_array, input_array2)
diff --git a/python/plugins/sextante/pymorph/scripts/symdiff.py b/python/plugins/sextante/pymorph/scripts/symdiff.py
deleted file mode 100644
index ae7677b97c82..000000000000
--- a/python/plugins/sextante/pymorph/scripts/symdiff.py
+++ /dev/null
@@ -1,30 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    symdiff.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-##Additional_image=raster
-from sextante.pymorph.mmorph import symdiff
-img2 = gdal.Open(Additional_image)
-input_array2 = img2.ReadAsArray()
-output_array = symdiff(input_array, input_array2)
diff --git a/python/plugins/sextante/pymorph/scripts/thick.py b/python/plugins/sextante/pymorph/scripts/thick.py
deleted file mode 100644
index a2fc62763a83..000000000000
--- a/python/plugins/sextante/pymorph/scripts/thick.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    thick.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-#iterations=number 1
-from sextante.pymorph.mmorph import thick
-output_array=thick(input_array, n=iterations)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/thin.py b/python/plugins/sextante/pymorph/scripts/thin.py
deleted file mode 100644
index bc8514385652..000000000000
--- a/python/plugins/sextante/pymorph/scripts/thin.py
+++ /dev/null
@@ -1,28 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    thin.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-#iterations=number 1
-from sextante.pymorph.mmorph import thin
-output_array=thin(input_array, n=iterations)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/scripts/watershed.py b/python/plugins/sextante/pymorph/scripts/watershed.py
deleted file mode 100644
index 711e46a4e9a6..000000000000
--- a/python/plugins/sextante/pymorph/scripts/watershed.py
+++ /dev/null
@@ -1,27 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    watershed.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.pymorph.mmorph import watershed
-output_array=watershed(input_array)
\ No newline at end of file
diff --git a/python/plugins/sextante/pymorph/text.py b/python/plugins/sextante/pymorph/text.py
deleted file mode 100644
index 2f26f3143ca8..000000000000
--- a/python/plugins/sextante/pymorph/text.py
+++ /dev/null
@@ -1,1570 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    text.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Victor Olaya
-    Email                : volayaf at gmail dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Victor Olaya'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Victor Olaya'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-__all__ = ['text']
-import numpy as np
-from mmorph import concat
-FontDft = np.array([
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   1,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   1,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   1,   1,   1,   0,],
-     [0,   1,   0,   1,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   1,   0,   0,   1,   1,   0,],
-     [0,   1,   0,   0,   1,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   0,   0,   0,   1,   1,   0,],
-     [0,   1,   0,   1,   0,   1,   0,   1,   0,],
-     [0,   1,   0,   1,   0,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   1,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   1,   0,   1,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [5,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   1,   1,   0,   0,],
-     [0,   1,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   0,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   1,   1,   1,   0,   0,],
-     [0,   0,   1,   1,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   1,   1,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   0,   1,   0,   0,   1,   0,],
-     [0,   1,   0,   1,   0,   1,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   1,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   0,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   1,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   1,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   1,   1,   1,   1,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   1,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   1,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   1,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   1,   1,   1,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    [[0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   1,   0,   0,   0,],
-     [0,   0,   0,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   1,   0,   0,   0,   0,],
-     [0,   1,   1,   1,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,],
-     [0,   0,   0,   0,   0,   0,   0,   0,   0,]],
-
-    ],
-    np.bool)
-
-def text(txt):
-    """
-    y = text(txt)
-
-    Create a binary image of a text.
-
-    text creates the binary image y of the text txt . The
-    background of y is 0, while its foreground is 1. The text should
-    be composed only by lower and upper case letters.
-
-    Parameters
-    ----------
-      txt : Text as a string
-
-    Returns
-    -------
-      y : Binary image.
-
-    """
-    from numpy import reshape, array
-
-    FIRST_CHAR =  32
-    LAST_CHAR  = 126
-    N_CHARS    = LAST_CHAR - FIRST_CHAR
-    for i,ch in enumerate(txt):
-      ind = ord(ch) - FIRST_CHAR
-      assert ind < N_CHARS,'pymorph.text: code not allowed (%s)' % ch
-      print ch, ind
-      glyph = FontDft[ind]
-      if i == 0:
-        y = glyph
-      else:
-        y = concat('w', y, glyph)
-    return y
diff --git a/python/plugins/sextante/r/CMakeLists.txt b/python/plugins/sextante/r/CMakeLists.txt
index fea07193c772..d762289fe23c 100644
--- a/python/plugins/sextante/r/CMakeLists.txt
+++ b/python/plugins/sextante/r/CMakeLists.txt
@@ -1,5 +1,5 @@
 FILE(GLOB PY_FILES *.py)
 FILE(GLOB SCRIPT_FILES scripts/*.rsx)
 
-INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/r)
-INSTALL(FILES ${SCRIPT_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/r/scripts)
+PLUGIN_INSTALL(sextante r ${PY_FILES})
+PLUGIN_INSTALL(sextante r/scripts ${SCRIPT_FILES})
diff --git a/python/plugins/sextante/r/EditRScriptDialog.py b/python/plugins/sextante/r/EditRScriptDialog.py
index e82afbbfe4fd..dd629fa1fdd9 100644
--- a/python/plugins/sextante/r/EditRScriptDialog.py
+++ b/python/plugins/sextante/r/EditRScriptDialog.py
@@ -88,9 +88,11 @@ def editHelp(self):
 
     def saveAlgorithm(self):
         if self.filename is None:
-            self.filename = QtGui.QFileDialog.getSaveFileName(self, "Save Script", RUtils.RScriptsFolder(), "SEXTANTE R script (*.rsx)")
+            self.filename = str(QtGui.QFileDialog.getSaveFileName(self, "Save Script", RUtils.RScriptsFolder(), "SEXTANTE R script (*.rsx)"))
 
         if self.filename:
+            if not self.filename.endswith(".rsx"):
+                self.filename += ".rsx"
             text = str(self.text.toPlainText())
             if self.alg is not None:
                 self.alg.script = text
diff --git a/python/plugins/sextante/r/RAlgorithm.py b/python/plugins/sextante/r/RAlgorithm.py
index 4dbef52dd4da..ef2a757a8686 100644
--- a/python/plugins/sextante/r/RAlgorithm.py
+++ b/python/plugins/sextante/r/RAlgorithm.py
@@ -213,7 +213,7 @@ def processAlgorithm(self, progress):
             f.close()
         if self.showConsoleOutput:
             htmlfilename = self.getOutputValue(RAlgorithm.R_CONSOLE_OUTPUT)
-            f = open(htmlfilename)
+            f = open(htmlfilename, "w")
             f.write(RUtils.getConsoleOutput())
             f.close()
 
@@ -270,7 +270,8 @@ def getImportCommands(self):
                 value = value.replace("\\", "/")
                 filename = os.path.basename(value)
                 filename = filename[:-4]
-                commands.append(param.name + " = readOGR(\"" + value + "\",layer=\"" + filename + "\")")
+                folder = os.path.dirname(value)
+                commands.append(param.name + " = readOGR(\"" + folder + "\",layer=\"" + filename + "\")")
             if isinstance(param, ParameterTable):
                 value = param.value
                 if not value.lower().endswith("csv"):
diff --git a/python/plugins/sextante/r/RAlgorithmProvider.py b/python/plugins/sextante/r/RAlgorithmProvider.py
index 86d9d1d201ec..3ab9a6306c94 100644
--- a/python/plugins/sextante/r/RAlgorithmProvider.py
+++ b/python/plugins/sextante/r/RAlgorithmProvider.py
@@ -69,10 +69,18 @@ def getName(self):
 
     def _loadAlgorithms(self):
         folder = RUtils.RScriptsFolder()
+        self.loadFromFolder(folder)
+        folder = os.path.join(os.path.dirname(__file__), "scripts")
+        self.loadFromFolder(folder)
+
+
+    def loadFromFolder(self, folder):
+        if not os.path.exists(folder):
+            return
         for descriptionFile in os.listdir(folder):
             if descriptionFile.endswith("rsx"):
                 try:
-                    fullpath = os.path.join(RUtils.RScriptsFolder(), descriptionFile)
+                    fullpath = os.path.join(folder, descriptionFile)
                     alg = RAlgorithm(fullpath)
                     if alg.name.strip() != "":
                         self.algs.append(alg)
diff --git a/python/plugins/sextante/r/RUtils.py b/python/plugins/sextante/r/RUtils.py
index 24754b453e1f..38bad582f28f 100644
--- a/python/plugins/sextante/r/RUtils.py
+++ b/python/plugins/sextante/r/RUtils.py
@@ -48,7 +48,8 @@ def RFolder():
     def RScriptsFolder():
         folder = SextanteConfig.getSetting(RUtils.RSCRIPTS_FOLDER)
         if folder == None:
-            folder = os.path.join(os.path.dirname(__file__), "scripts")
+            #folder = os.path.join(os.path.dirname(__file__), "scripts")
+            folder = SextanteUtils.userFolder() + os.sep + "rscripts"
         mkdir(folder)
 
         return folder
@@ -82,7 +83,7 @@ def executeRAlgorithm(alg, progress):
             os.chmod(RUtils.getRScriptFilename(), stat.S_IEXEC | stat.S_IREAD | stat.S_IWRITE)
             command = "R CMD BATCH --vanilla " + RUtils.getRScriptFilename() + " "+ RUtils.getConsoleOutputFilename()
 
-        proc = subprocess.Popen(command, shell=SextanteUtils.isWindows(), stdout=subprocess.PIPE, stdin=subprocess.PIPE,stderr=subprocess.STDOUT,
+        proc = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stdin=subprocess.PIPE,stderr=subprocess.STDOUT,
                                 universal_newlines=True)
         proc.wait()
         RUtils.createConsoleOutput()
diff --git a/python/plugins/sextante/r/scripts/F_function_-_distance_from_a_point_to nearest event.rsx b/python/plugins/sextante/r/scripts/F_function_-_distance_from_a_point_to_nearest_event.rsx
similarity index 100%
rename from python/plugins/sextante/r/scripts/F_function_-_distance_from_a_point_to nearest event.rsx
rename to python/plugins/sextante/r/scripts/F_function_-_distance_from_a_point_to_nearest_event.rsx
diff --git a/python/plugins/sextante/r/scripts/G_function_-_distance to nearest event.rsx b/python/plugins/sextante/r/scripts/G_function_-_distance_to_nearest_event.rsx
similarity index 100%
rename from python/plugins/sextante/r/scripts/G_function_-_distance to nearest event.rsx
rename to python/plugins/sextante/r/scripts/G_function_-_distance_to_nearest_event.rsx
diff --git a/python/plugins/sextante/resources.qrc b/python/plugins/sextante/resources.qrc
index 1e390ec721d5..f9659c89c7a2 100644
--- a/python/plugins/sextante/resources.qrc
+++ b/python/plugins/sextante/resources.qrc
@@ -5,7 +5,6 @@
         images/grass.png
         images/help.png
         images/history.gif
-        images/info.png
         images/input.png
         images/iterate.png
         images/model.png
diff --git a/python/plugins/sextante/saga/CMakeLists.txt b/python/plugins/sextante/saga/CMakeLists.txt
index e4567650cf44..ba50dfb8af5f 100644
--- a/python/plugins/sextante/saga/CMakeLists.txt
+++ b/python/plugins/sextante/saga/CMakeLists.txt
@@ -2,6 +2,6 @@ FILE(GLOB PY_FILES *.py)
 FILE(GLOB DESCR_FILES description/*.txt)
 FILE(GLOB HELP_FILES help/*.html)
 
-INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/saga)
-INSTALL(FILES ${DESCR_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/saga/description)
-INSTALL(FILES ${HELP_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/saga/help)
+PLUGIN_INSTALL(sextante saga ${PY_FILES})
+PLUGIN_INSTALL(sextante saga/description ${DESCR_FILES})
+PLUGIN_INSTALL(sextante saga/help ${HELP_FILES})
diff --git a/python/plugins/sextante/saga/SagaAlgorithm.py b/python/plugins/sextante/saga/SagaAlgorithm.py
index ca80398b40e2..8d5ed7461c5c 100644
--- a/python/plugins/sextante/saga/SagaAlgorithm.py
+++ b/python/plugins/sextante/saga/SagaAlgorithm.py
@@ -243,7 +243,7 @@ def processAlgorithm(self, progress):
                 if value in self.exportedLayers.keys():
                     command+=(" -" + param.name + " \"" + self.exportedLayers[value] + "\"")
                 else:
-                    command+=(" -" + param.name + " " + value)
+                    command+=(" -" + param.name + " \"" + value + "\"")
             elif isinstance(param, ParameterMultipleInput):
                 s = param.value
                 for layer in self.exportedLayers.keys():
@@ -256,16 +256,16 @@ def processAlgorithm(self, progress):
                 tempTableFile  = SextanteUtils.getTempFilename("txt")
                 f = open(tempTableFile, "w")
                 f.write('\t'.join([col for col in param.cols]) + "\n")
-                values = param.value.split(",")                
+                values = param.value.split(",")
                 for i in range(0, len(values), 3):
                     s = values[i] + "\t" + values[i+1] + "\t" + values[i+2] + "\n"
                     f.write(s)
                 f.close()
-                command+=( " -" + param.name + " " + tempTableFile)
+                command+=( " -" + param.name + " \"" + tempTableFile + "\"")
             elif isinstance(param, ParameterExtent):
-                #'we have to substract half cell size, since saga is center based, not corner based
+                #'we have to substract/add half cell size, since saga is center based, not corner based
                 halfcell = self.getOutputCellsize() / 2
-                offset = [halfcell, 0, halfcell, 0]
+                offset = [halfcell, -halfcell, halfcell, -halfcell]
                 values = param.value.split(",")
                 for i in range(4):
                     command+=(" -" + self.extentParamNames[i] + " " + str(float(values[i]) + offset[i]));
@@ -318,18 +318,17 @@ def processAlgorithm(self, progress):
             SextanteLog.addToLog(SextanteLog.LOG_INFO, loglines)
         SagaUtils.executeSaga(progress);
 
-    
+
     def getOutputCellsize(self):
-        '''tries to guess the cellsize of the output, searchiing for a parameter with an appropriate name for it'''
+        '''tries to guess the cellsize of the output, searching for a parameter with an appropriate name for it'''
         cellsize = 0;
         for param in self.parameters:
             if param.value is not None and param.name == "USER_SIZE":
                 cellsize = float(param.value)
                 break;
-        QtGui.QMessageBox.critical(None, "", str(cellsize));
         return cellsize
-    
-    
+
+
     def resampleRasterLayer(self,layer):
         '''this is supposed to be run after having exported all raster layers'''
         if layer in self.exportedLayers.keys():
diff --git a/python/plugins/sextante/saga/SagaAlgorithmProvider.py b/python/plugins/sextante/saga/SagaAlgorithmProvider.py
index 02c610ae2259..57550f254f97 100644
--- a/python/plugins/sextante/saga/SagaAlgorithmProvider.py
+++ b/python/plugins/sextante/saga/SagaAlgorithmProvider.py
@@ -16,6 +16,7 @@
 *                                                                         *
 ***************************************************************************
 """
+from sextante.saga.SplitRGBBands import SplitRGBBands
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
@@ -80,6 +81,7 @@ def createAlgsList(self):
                         SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open SAGA algorithm: " + descriptionFile)
                 except Exception,e:
                     SextanteLog.addToLog(SextanteLog.LOG_ERROR, "Could not open SAGA algorithm: " + descriptionFile)
+        self.preloadedAlgs.append(SplitRGBBands())
 
     def _loadAlgorithms(self):
         self.algs = self.preloadedAlgs
@@ -90,6 +92,12 @@ def getDescription(self):
     def getName(self):
         return "saga"
 
+    def getSupportedOutputVectorLayerExtensions(self):
+        return ["shp"]
+
+    def getSupportedOutputRasterLayerExtensions(self):
+        return ["tif"]
+
     def getIcon(self):
         return  QIcon(os.path.dirname(__file__) + "/../images/saga.png")
 
diff --git a/python/plugins/sextante/saga/SagaHelpGenerator.py b/python/plugins/sextante/saga/SagaHelpGenerator.py
index 438a16aab365..bceed1132617 100644
--- a/python/plugins/sextante/saga/SagaHelpGenerator.py
+++ b/python/plugins/sextante/saga/SagaHelpGenerator.py
@@ -80,7 +80,7 @@ def parameters(self):
                 except:
                     pass
         return self._parameters
-            
+
 
 class Parameter:
     def __init__(self, params, i):
@@ -105,12 +105,12 @@ def __init__(self, params, i):
                 if parameterValue.has_Maximum():
                     self.maximum = parameterValue.Get_Maximum()
         self.choices = None
-        if typ == saga.PARAMETER_TYPE_Choice:     
+        if typ == saga.PARAMETER_TYPE_Choice:
             parameterChoice = self.parameter.asChoice()
             self.choices = [parameterChoice.Get_Item(i) for i in
                 range(parameterChoice.Get_Count())]
-        
-        
+
+
 def getLibraryPaths(userPath = None):
     try:
         paths = os.environ['MLB_PATH'].split(':')
@@ -155,7 +155,7 @@ def writeHTML(path, mod):
                 constraints.append("Maximum: " + str(p.maximum))
             if p.choices:
                 constraints.append("Available choices: " + ', '.join(p.choices))
-            
+
             docs += "\t
        %s 
        %s
        " % (p.name, p.typeName)
             docs += "
        %s 
        %s
        \n" % (p.description, '; '.join(constraints))
         docs += ""
@@ -173,7 +173,7 @@ def writeHTML(path, mod):
     parser.add_argument('-l', dest='libpath', help='Location of SAGA libraries.')
 
     args = parser.parse_args()
-    
+
     libs = list()
     paths = getLibraryPaths(args.libpath)
     for p in paths:
@@ -181,11 +181,11 @@ def writeHTML(path, mod):
             libs.append(Library(p))
         except ImportError:
             pass
-            
+
     if not libs:
         print "No saga libraries found"
         exit(1)
-        
+
     print "%i libraries loaded." % len(libs)
     for lib in libs:
         mods = lib.modules()
diff --git a/python/plugins/sextante/saga/SagaUtils.py b/python/plugins/sextante/saga/SagaUtils.py
index 7036329d75de..1e27d2f17dc6 100644
--- a/python/plugins/sextante/saga/SagaUtils.py
+++ b/python/plugins/sextante/saga/SagaUtils.py
@@ -76,12 +76,8 @@ def createSagaBatchJobFileFromSagaCommands(commands):
             fout.write("PATH=PATH;%SAGA%;%SAGA_MLB%\n");
         else:
             pass
-            #fout.write("export SAGA_MLB=" + SagaUtils.sagaPath() + os.sep + "modules" + "\n");
-            #fout.write("PATH=$PATH:" + SagaUtils.sagaPath() + os.sep + "modules" + "\n");
-            #fout.write("export PATH\n");
-
         for command in commands:
-            fout.write("saga_cmd " + command + "\n")
+            fout.write("saga_cmd " + command.encode("utf8") + "\n")
 
         fout.write("exit")
         fout.close()
@@ -99,7 +95,10 @@ def executeSaga(progress):
         for line in iter(proc.readline, ""):
             if "%" in line:
                 s = "".join([x for x in line if x.isdigit()])
-                progress.setPercentage(int(s))
+                try:
+                    progress.setPercentage(int(s))
+                except:
+                    pass
             else:
                 line = line.strip()
                 if line!="/" and line!="-" and line !="\\" and line!="|":
diff --git a/python/plugins/sextante/saga/SplitRGBBands.py b/python/plugins/sextante/saga/SplitRGBBands.py
new file mode 100644
index 000000000000..b128d95cb651
--- /dev/null
+++ b/python/plugins/sextante/saga/SplitRGBBands.py
@@ -0,0 +1,73 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    SplitRGBBands.py
+    ---------------------
+    Date                 : August 2012
+    Copyright            : (C) 2012 by Victor Olaya
+    Email                : volayaf at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+from sextante.core.SextanteUtils import SextanteUtils
+from sextante.core.QGisLayers import QGisLayers
+from sextante.saga.SagaUtils import SagaUtils
+
+__author__ = 'Victor Olaya'
+__date__ = 'August 2012'
+__copyright__ = '(C) 2012, Victor Olaya'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+from PyQt4 import QtGui
+from sextante.core.GeoAlgorithm import GeoAlgorithm
+from sextante.parameters.ParameterRaster import ParameterRaster
+from sextante.outputs.OutputRaster import OutputRaster
+import os
+
+class SplitRGBBands(GeoAlgorithm):
+
+    INPUT = "INPUT"
+    R = "R"
+    G = "G"
+    B = "B"
+
+    def getIcon(self):
+        return  QtGui.QIcon(os.path.dirname(__file__) + "/../images/saga.png")
+
+    def defineCharacteristics(self):
+        self.name = "Split RGB bands"
+        self.group = "Grid - Tools"
+        self.addParameter(ParameterRaster(SplitRGBBands.INPUT, "Input layer", False))
+        self.addOutput(OutputRaster(SplitRGBBands.R, "Output R band layer"))
+        self.addOutput(OutputRaster(SplitRGBBands.G, "Output G band layer"))
+        self.addOutput(OutputRaster(SplitRGBBands.B, "Output B band layer"))
+
+    def processAlgorithm(self, progress):
+        #TODO:check correct num of bands
+        input = self.getParameterValue(SplitRGBBands.INPUT)
+        temp = SextanteUtils.getTempFilename();
+        r = self.getOutputValue(SplitRGBBands.R)
+        g = self.getOutputValue(SplitRGBBands.G)
+        b = self.getOutputValue(SplitRGBBands.B)
+        commands = []
+        if SextanteUtils.isWindows():
+            commands.append("io_gdal 0 -GRIDS \"" + temp + "\" -FILES \"" + input+"\"")
+            commands.append("io_gdal 1 -GRIDS \"" + temp + "_0001.sgrd\" -FORMAT 1 -TYPE 0 -FILE \"" + r + "\"");
+            commands.append("io_gdal 1 -GRIDS \"" + temp + "_0002.sgrd\" -FORMAT 1 -TYPE 0 -FILE \"" + g + "\"");
+            commands.append("io_gdal 1 -GRIDS \"" + temp + "_0003.sgrd\" -FORMAT 1 -TYPE 0 -FILE \"" + b + "\"");
+        else:
+            commands.append("libio_gdal 0 -GRIDS \"" + temp + "\" -FILES \"" + input + "\"")
+            commands.append("libio_gdal 1 -GRIDS \"" + temp + "_0001.sgrd\" -FORMAT 1 -TYPE 0 -FILE \"" + r + "\"");
+            commands.append("libio_gdal 1 -GRIDS \"" + temp + "_0002.sgrd\" -FORMAT 1 -TYPE 0 -FILE \"" + g + "\"");
+            commands.append("libio_gdal 1 -GRIDS \"" + temp + "_0003.sgrd\" -FORMAT 1 -TYPE 0 -FILE \"" + b + "\"");
+
+        SagaUtils.createSagaBatchJobFileFromSagaCommands(commands)
+        SagaUtils.executeSaga(progress);
diff --git a/python/plugins/sextante/saga/description/FillSinks(Wang&Liu).txt b/python/plugins/sextante/saga/description/FillSinks(WangLiu).txt
similarity index 100%
rename from python/plugins/sextante/saga/description/FillSinks(Wang&Liu).txt
rename to python/plugins/sextante/saga/description/FillSinks(WangLiu).txt
diff --git a/python/plugins/sextante/saga/description/FillSinksXXL(Wang&Liu).txt b/python/plugins/sextante/saga/description/FillSinksXXL(WangLiu).txt
similarity index 100%
rename from python/plugins/sextante/saga/description/FillSinksXXL(Wang&Liu).txt
rename to python/plugins/sextante/saga/description/FillSinksXXL(WangLiu).txt
diff --git a/python/plugins/sextante/saga/description/JoinAttributesfromaTable(Shapes).txt b/python/plugins/sextante/saga/description/JoinAttributesfromaTable(Shapes).txt
index b1ba23bffb64..f3f22523e2f8 100644
--- a/python/plugins/sextante/saga/description/JoinAttributesfromaTable(Shapes).txt
+++ b/python/plugins/sextante/saga/description/JoinAttributesfromaTable(Shapes).txt
@@ -2,7 +2,7 @@ Join Attributes from a Table (Shapes)
 table_tools
 ParameterVector|TABLE_A|Shapes|-1|False
 ParameterTable|TABLE_B|Join Table|False
-ParameterTableField|ID_A|Identifier|TABLE_B
-ParameterTableField|ID_B|Identifier|TABLE_B
+ParameterTableField|ID_A|Attribute (Table)|TABLE_A
+ParameterTableField|ID_B|Attribute (Join Table)|TABLE_B
 ParameterBoolean|KEEPALL      |Keep All|True
 OutputVector|RESULT|Result
diff --git a/python/plugins/sextante/saga/description/JoinAttributesfromaTable.txt b/python/plugins/sextante/saga/description/JoinAttributesfromaTable.txt
index 08d0c7a3aff2..68619dc5fdc3 100644
--- a/python/plugins/sextante/saga/description/JoinAttributesfromaTable.txt
+++ b/python/plugins/sextante/saga/description/JoinAttributesfromaTable.txt
@@ -2,7 +2,7 @@ Join Attributes from a Table
 table_tools
 ParameterTable|TABLE_A|Table|False
 ParameterTable|TABLE_B|Join Table|False
-ParameterTableField|ID_A|Identifier|TABLE_B
-ParameterTableField|ID_B|Identifier|TABLE_B
+ParameterTableField|ID_A|Attribute (Table)|TABLE_A
+ParameterTableField|ID_B|Attribute (Join Table)|TABLE_B
 ParameterBoolean|KEEPALL      |Keep All|True
 OutputTable|RESULT|Result
diff --git a/python/plugins/sextante/saga/description/SplitShapesLayer.txt b/python/plugins/sextante/saga/description/SplitShapesLayer.txt
deleted file mode 100644
index 3fb4a1eb7de3..000000000000
--- a/python/plugins/sextante/saga/description/SplitShapesLayer.txt
+++ /dev/null
@@ -1,8 +0,0 @@
-Split Shapes Layer
-shapes_tools
-ParameterVector|SHAPES|Shapes|-1|False
-ParameterNumber|NX|Number of horizontal tiles|None|None|10
-ParameterNumber|NY|Number of vertical tiles|None|None|10
-ParameterSelection|METHOD|Method|[0] completely contained;[1] intersects;[2] center
-OutputVector|CUTS|Tiles
-OutputVector|EXTENT|Extent
diff --git a/python/plugins/sextante/saga/description/SplitShapesLayerCompletely.txt b/python/plugins/sextante/saga/description/SplitShapesLayerCompletely.txt
deleted file mode 100644
index 8beb6c5678e9..000000000000
--- a/python/plugins/sextante/saga/description/SplitShapesLayerCompletely.txt
+++ /dev/null
@@ -1,6 +0,0 @@
-Split Shapes Layer Completely
-shapes_tools
-ParameterVector|SHAPES|Input|-1|False
-ParameterTableField|FIELD|Attribute|SHAPES
-ParameterSelection|NAMING|Name by...|[0] number of order;[1] attribute
-OutputVector|LIST|Output
diff --git a/python/plugins/sextante/saga/description/SplitShapesbyAttribute.txt b/python/plugins/sextante/saga/description/SplitShapesbyAttribute.txt
deleted file mode 100644
index 5e28251b478f..000000000000
--- a/python/plugins/sextante/saga/description/SplitShapesbyAttribute.txt
+++ /dev/null
@@ -1,5 +0,0 @@
-Split Shapes by Attribute
-shapes_tools
-ParameterVector|TABLE|Table/Shapes|-1|False
-ParameterTableField|FIELD|Attribute|TABLE
-OutputTable|CUTS|Cuts
diff --git a/python/plugins/sextante/saga/help/FillSinks(Wang&Liu).html b/python/plugins/sextante/saga/help/FillSinks(WangLiu).html
similarity index 100%
rename from python/plugins/sextante/saga/help/FillSinks(Wang&Liu).html
rename to python/plugins/sextante/saga/help/FillSinks(WangLiu).html
diff --git a/python/plugins/sextante/saga/help/FillSinksXXL(Wang&Liu).html b/python/plugins/sextante/saga/help/FillSinksXXL(WangLiu).html
similarity index 100%
rename from python/plugins/sextante/saga/help/FillSinksXXL(Wang&Liu).html
rename to python/plugins/sextante/saga/help/FillSinksXXL(WangLiu).html
diff --git a/python/plugins/sextante/script/CMakeLists.txt b/python/plugins/sextante/script/CMakeLists.txt
index 3cab7f4e77fc..6953c531be8a 100644
--- a/python/plugins/sextante/script/CMakeLists.txt
+++ b/python/plugins/sextante/script/CMakeLists.txt
@@ -1,3 +1,5 @@
 FILE(GLOB PY_FILES *.py)
+FILE(GLOB SCRIPTS_FILES scripts/*.py)
 
-INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/script)
+PLUGIN_INSTALL(sextante script ${PY_FILES})
+PLUGIN_INSTALL(sextante script/scripts ${SCRIPTS_FILES})
diff --git a/python/plugins/sextante/script/EditScriptDialog.py b/python/plugins/sextante/script/EditScriptDialog.py
index a87e595712d2..7cf5c8e5ef4b 100644
--- a/python/plugins/sextante/script/EditScriptDialog.py
+++ b/python/plugins/sextante/script/EditScriptDialog.py
@@ -88,9 +88,11 @@ def editHelp(self):
 
     def saveAlgorithm(self):
         if self.filename is None:
-            self.filename = QtGui.QFileDialog.getSaveFileName(self, "Save Script", ScriptUtils.scriptsFolder(), "Python scripts (*.py)")
+            self.filename = str(QtGui.QFileDialog.getSaveFileName(self, "Save Script", ScriptUtils.scriptsFolder(), "Python scripts (*.py)"))
 
         if self.filename:
+            if not self.filename.endswith(".py"):
+                self.filename += ".py"
             text = str(self.text.toPlainText())
             if self.alg is not None:
                 self.alg.script = text
diff --git a/python/plugins/sextante/script/ScriptAlgorithm.py b/python/plugins/sextante/script/ScriptAlgorithm.py
index 0b5a4e29b1dc..e75979398545 100644
--- a/python/plugins/sextante/script/ScriptAlgorithm.py
+++ b/python/plugins/sextante/script/ScriptAlgorithm.py
@@ -16,6 +16,8 @@
 *                                                                         *
 ***************************************************************************
 """
+from sextante.outputs.OutputNumber import OutputNumber
+from sextante.outputs.OutputString import OutputString
 
 __author__ = 'Victor Olaya'
 __date__ = 'August 2012'
@@ -43,6 +45,8 @@
 from sextante.parameters.ParameterExtent import ParameterExtent
 from sextante.parameters.ParameterFile import ParameterFile
 from sextante.outputs.OutputFile import OutputFile
+from sextante.parameters.ParameterFactory import ParameterFactory
+from sextante.outputs.OutputFactory import OutputFactory
 import sys
 from sextante.gui.Help2Html import Help2Html
 
@@ -85,7 +89,6 @@ def defineCharacteristicsFromFile(self):
             line = lines.readline()
         lines.close()
 
-
     def defineCharacteristicsFromScript(self):
         lines = self.script.split("\n")
         self.silentOutputs = []
@@ -105,11 +108,19 @@ def processParameterLine(self,line):
         param = None
         out = None
         line = line.replace("#", "");
+        # If the line is in the format of the text description files for normal algorithms,
+        # then process it using parameter and output factories
+        if '|' in line:
+            self.processDescriptionParameterLine(line)
+            return
         tokens = line.split("=");
         desc = self.createDescriptiveName(tokens[0])
         if tokens[1].lower().strip() == "group":
             self.group = tokens[0]
             return
+        if tokens[1].lower().strip() == "name":
+            self.name = tokens[0]
+            return
         if tokens[1].lower().strip() == "raster":
             param = ParameterRaster(tokens[0], desc, False)
         elif tokens[1].lower().strip() == "vector":
@@ -159,6 +170,10 @@ def processParameterLine(self,line):
             out = OutputHTML()
         elif tokens[1].lower().strip().startswith("output file"):
             out = OutputFile()
+        elif tokens[1].lower().strip().startswith("output number"):
+            out = OutputNumber()
+        elif tokens[1].lower().strip().startswith("output string"):
+            out = OutputString()
 
         if param != None:
             self.addParameter(param)
@@ -169,20 +184,38 @@ def processParameterLine(self,line):
         else:
             raise WrongScriptException("Could not load script:" + self.descriptionFile + ".\n Problem with line \"" + line + "\"")
 
+    def processDescriptionParameterLine(self, line):
+        try:
+            if line.startswith("Parameter"):
+                self.addParameter(ParameterFactory.getFromString(line))
+            elif line.startswith("*Parameter"):
+                param = ParameterFactory.getFromString(line[1:])
+                param.isAdvanced = True
+                self.addParameter(param)
+            else:
+                self.addOutput(OutputFactory.getFromString(line))
+        except Exception:
+            raise WrongScriptException("Could not load script:" + self.descriptionFile + ".\n Problem with line \"" + line + "\"")
+
     def processAlgorithm(self, progress):
 
-        script = "from sextante.core.Sextante import Sextante\n"
+        script = "import sextante\n"
+
+        ns = {}
+        ns['progress'] = progress
+
         for param in self.parameters:
-            script += param.name + "=" + param.getValueAsCommandLineParameter() + "\n"
+            #script += param.name + "=" + param.getValueAsCommandLineParameter() + "\n"
+            ns[param.name] = param.value
 
         for out in self.outputs:
-            script += out.name + "=" + out.getValueAsCommandLineParameter() + "\n"
+            ns[out.name] = out.value
+            #script += out.name + "=" + out.getValueAsCommandLineParameter() + "\n"
 
         script+=self.script
-        redirection = Redirection(progress)
-        sys.stdout = redirection
-        exec(script)
-        sys.stdout = sys.__stdout__
+        exec(script) in ns
+        for out in self.outputs:
+            out.setValue(ns[out.name])
 
     def helpFile(self):
         helpfile = self.descriptionFile + ".help"
@@ -192,14 +225,3 @@ def helpFile(self):
         else:
             return None
 
-class Redirection():
-    def __init__(self, progress):
-        self.progress = progress
-
-    def write(self, string):
-        try:
-            n = int(string)
-            self.progress.setPercentage(n)
-        except:
-            self.progress.setText(string)
-            pass
\ No newline at end of file
diff --git a/python/plugins/sextante/script/ScriptAlgorithmProvider.py b/python/plugins/sextante/script/ScriptAlgorithmProvider.py
index 2654286f9402..db2926566c79 100644
--- a/python/plugins/sextante/script/ScriptAlgorithmProvider.py
+++ b/python/plugins/sextante/script/ScriptAlgorithmProvider.py
@@ -55,9 +55,6 @@ def unload(self):
     def getIcon(self):
         return QtGui.QIcon(os.path.dirname(__file__) + "/../images/script.png")
 
-    def scriptsFolder(self):
-        return ScriptUtils.scriptsFolder()
-
     def getName(self):
         return "script"
 
@@ -65,11 +62,18 @@ def getDescription(self):
         return "Scripts"
 
     def _loadAlgorithms(self):
-        folder = self.scriptsFolder()
+        folder = ScriptUtils.scriptsFolder()
+        self.loadFromFolder(folder)
+        folder = os.path.join(os.path.dirname(__file__), "scripts")
+        self.loadFromFolder(folder)
+
+    def loadFromFolder(self, folder):
+        if not os.path.exists(folder):
+            return
         for descriptionFile in os.listdir(folder):
             if descriptionFile.endswith("py"):
                 try:
-                    fullpath = os.path.join(ScriptUtils.scriptsFolder(), descriptionFile)
+                    fullpath = os.path.join(folder, descriptionFile)
                     alg = ScriptAlgorithm(fullpath)
                     if alg.name.strip() != "":
                         self.algs.append(alg)
diff --git a/python/plugins/sextante/script/ScriptUtils.py b/python/plugins/sextante/script/ScriptUtils.py
index 3a8079fe7c7a..afdf3cd5e5a9 100644
--- a/python/plugins/sextante/script/ScriptUtils.py
+++ b/python/plugins/sextante/script/ScriptUtils.py
@@ -37,11 +37,7 @@ class ScriptUtils:
     def scriptsFolder():
         folder = SextanteConfig.getSetting(ScriptUtils.SCRIPTS_FOLDER)
         if folder == None:
-            #folder = os.path.join(os.path.dirname(__file__), "scripts")
             folder = SextanteUtils.userFolder() + os.sep + "scripts"
         mkdir(folder)
 
         return folder
-
-
-
diff --git a/python/plugins/sextante/pymorph/AlgNames.py b/python/plugins/sextante/script/scripts/Hex_grid_from_layer_bounds.py
similarity index 61%
rename from python/plugins/sextante/pymorph/AlgNames.py
rename to python/plugins/sextante/script/scripts/Hex_grid_from_layer_bounds.py
index d851f98458d7..df4885327ef9 100644
--- a/python/plugins/sextante/pymorph/AlgNames.py
+++ b/python/plugins/sextante/script/scripts/Hex_grid_from_layer_bounds.py
@@ -2,9 +2,9 @@
 
 """
 ***************************************************************************
-    AlgNames.py
+    Hex_grid_from_layer_bounds.py
     ---------------------
-    Date                 : August 2012
+    Date                 : November 2012
     Copyright            : (C) 2012 by Victor Olaya
     Email                : volayaf at gmail dot com
 ***************************************************************************
@@ -18,23 +18,20 @@
 """
 
 __author__ = 'Victor Olaya'
-__date__ = 'August 2012'
+__date__ = 'November 2012'
 __copyright__ = '(C) 2012, Victor Olaya'
 # This will get replaced with a git SHA1 when you do a git archive
 __revision__ = '$Format:%H$'
 
-import os
-class AlgNames():
+##[Example scripts]=group
+##input=vector
+##cellsize=number 1000.0
+##grid=output vector
+from sextante.core.QGisLayers import QGisLayers
 
-    names = {}
-
-    @staticmethod
-    def getName(shortname):
-        if not AlgNames.names:
-            f = open(os.path.dirname(__file__) + "/algnames.txt")
-            lines = f.readlines()
-            for line in lines:
-                tokens = line.split(":")
-                AlgNames.names[tokens[0].strip()] = tokens[1].strip()
-                f.close()
-        return AlgNames.names[shortname]
\ No newline at end of file
+input = QGisLayers.getObjectFromUri(input)
+centerx = (input.extent().xMinimum() + input.extent().xMaximum()) / 2
+centery = (input.extent().yMinimum() + input.extent().yMaximum()) / 2
+width = (input.extent().xMaximum() - input.extent().xMinimum())
+height = (input.extent().yMaximum() - input.extent().yMinimum())
+sextante.runalg("mmqgisx:creategrid", cellsize, cellsize, width, height, centerx, centery, 3, grid)
diff --git a/python/plugins/sextante/script/scripts/Number_of_unique_values_in_classes.py b/python/plugins/sextante/script/scripts/Number_of_unique_values_in_classes.py
new file mode 100644
index 000000000000..ed8c02952e7c
--- /dev/null
+++ b/python/plugins/sextante/script/scripts/Number_of_unique_values_in_classes.py
@@ -0,0 +1,86 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    Number_of_unique_values_in_classes.py
+    ---------------------
+    Date                 : November 2012
+    Copyright            : (C) 2012 by Victor Olaya
+    Email                : volayaf at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Victor Olaya'
+__date__ = 'November 2012'
+__copyright__ = '(C) 2012, Victor Olaya'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+#Definition of inputs and outputs
+#==================================
+##[Example scripts]=group
+##input=vector
+##class_field=field input
+##value_field=field input
+##output=output vector
+
+#Algorithm body
+#==================================
+from sextante.core.QGisLayers import QGisLayers
+from qgis.core import *
+from PyQt4.QtCore import *
+from sextante.core.SextanteVectorWriter import SextanteVectorWriter
+
+# "input" contains the location of the selected layer.
+# We get the actual object, so we can get its bounds
+layer = QGisLayers.getObjectFromUri(input)
+provider = layer.dataProvider()
+allAttrs = provider.attributeIndexes()
+provider.select( allAttrs )
+fields = provider.fields()
+fields[len(fields)] = QgsField("UNIQ_COUNT", QVariant.Int)
+writer = SextanteVectorWriter(output, None, fields, provider.geometryType(), provider.crs() )
+
+# Fields are defined by their names, but QGIS needs the index for the attributes map
+class_field_index = provider.fieldNameIndex(class_field)
+value_field_index = provider.fieldNameIndex(value_field)
+
+inFeat = QgsFeature()
+outFeat = QgsFeature()
+inGeom = QgsGeometry()
+nFeat = provider.featureCount()
+nElement = 0
+classes = {}
+
+#Iterate over input layer to count unique values in each class
+while provider.nextFeature(inFeat):
+  progress.setPercentage(int((100 * nElement)/nFeat))
+  nElement += 1
+  atMap = inFeat.attributeMap()
+  clazz = atMap[class_field_index].toString()
+  value = atMap[value_field_index].toString()
+  if clazz not in classes:
+      classes[clazz] = []
+  if value not in classes[clazz]:
+      classes[clazz].append(value)
+
+# Create output vector layer with additional attribute
+while provider.nextFeature(inFeat):
+  print int((500 * nElement)/nFeat)
+  nElement += 1
+  inGeom = inFeat.geometry()
+  outFeat.setGeometry( inGeom )
+  atMap = inFeat.attributeMap()
+  clazz = atMap[class_field_index].toString()
+  outFeat.setAttributeMap( atMap )
+  outFeat.addAttribute( len(provider.fields()), QVariant(len(classes[clazz])))
+  writer.addFeature( outFeat )
+
+del writer
diff --git a/python/plugins/sextante/script/scripts/Save_selected_features.py b/python/plugins/sextante/script/scripts/Save_selected_features.py
new file mode 100644
index 000000000000..57dfaefdf678
--- /dev/null
+++ b/python/plugins/sextante/script/scripts/Save_selected_features.py
@@ -0,0 +1,61 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    Save_selected_features.py
+    ---------------------
+    Date                 : November 2012
+    Copyright            : (C) 2012 by Victor Olaya
+    Email                : volayaf at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Victor Olaya'
+__date__ = 'November 2012'
+__copyright__ = '(C) 2012, Victor Olaya'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+from qgis.core import *
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from sextante.core.QGisLayers import QGisLayers
+from sextante.core.SextanteVectorWriter import SextanteVectorWriter
+
+#Here we define the input and outputs
+#====================================
+##[Example scripts]=group
+##input=vector
+##output=output vector
+
+#And here is the body of the algorithm
+#=======================================
+
+#input layers values are always a string with its location.
+#That string can be converted into a QGIS object (a QgsVectorLayer in this case))
+#using the Sextante.getObjectFromUri() method
+vectorLayer = QGisLayers.getObjectFromUri(input)
+
+#And now we can process
+
+#First we create the output layer.
+#To do so, we create a SextanteVectorWriter, that we can later use to add features.
+provider = vectorLayer.dataProvider()
+writer = SextanteVectorWriter(output, None, provider.fields(), provider.geometryType(), provider.crs() )
+
+#Now we take the selected features and add them to the output layer
+selection = vectorLayer.selectedFeatures()
+for feat in selection:
+    writer.addFeature(feat)
+del writer
+
+#There is nothing more to do here. We do not have to open the layer that we have created.
+#SEXTANTE will take care of that, or will handle it if this algorithm is executed within
+#a complex model
\ No newline at end of file
diff --git a/python/plugins/sextante/script/scripts/Split_vector_layer_by_attribute.py b/python/plugins/sextante/script/scripts/Split_vector_layer_by_attribute.py
new file mode 100644
index 000000000000..32d0f496e0a7
--- /dev/null
+++ b/python/plugins/sextante/script/scripts/Split_vector_layer_by_attribute.py
@@ -0,0 +1,75 @@
+# -*- coding: utf-8 -*-
+
+"""
+***************************************************************************
+    Split_vector_layer_by_attribute.py
+    ---------------------
+    Date                 : November 2012
+    Copyright            : (C) 2012 by Victor Olaya
+    Email                : volayaf at gmail dot com
+***************************************************************************
+*                                                                         *
+*   This program is free software; you can redistribute it and/or modify  *
+*   it under the terms of the GNU General Public License as published by  *
+*   the Free Software Foundation; either version 2 of the License, or     *
+*   (at your option) any later version.                                   *
+*                                                                         *
+***************************************************************************
+"""
+
+__author__ = 'Victor Olaya'
+__date__ = 'November 2012'
+__copyright__ = '(C) 2012, Victor Olaya'
+# This will get replaced with a git SHA1 when you do a git archive
+__revision__ = '$Format:%H$'
+
+#Definition of inputs and outputs
+#==================================
+##[Example scripts]=group
+##input=vector
+##class_field=field input
+##output=output file
+
+#Algorithm body
+#==================================
+from sextante.core.QGisLayers import QGisLayers
+from qgis.core import *
+from PyQt4.QtCore import *
+from sextante.core.SextanteVectorWriter import SextanteVectorWriter
+
+# "input" contains the location of the selected layer.
+# We get the actual object,
+layer = QGisLayers.getObjectFromUri(input)
+provider = layer.dataProvider()
+allAttrs = provider.attributeIndexes()
+provider.select( allAttrs )
+fields = provider.fields()
+writers = {}
+
+# Fields are defined by their names, but QGIS needs the index for the attributes map
+class_field_index = provider.fieldNameIndex(class_field)
+
+inFeat = QgsFeature()
+outFeat = QgsFeature()
+inGeom = QgsGeometry()
+nFeat = provider.featureCount()
+nElement = 0
+writers = {}
+
+while provider.nextFeature(inFeat):
+  progress.setPercentage(int((100 * nElement)/nFeat))
+  nElement += 1
+  atMap = inFeat.attributeMap()
+  clazz = atMap[class_field_index].toString()
+  if clazz not in writers:
+      outputFile = output + "_" + str(len(writers)) + ".shp"
+      writers[clazz] = SextanteVectorWriter(outputFile, None, fields, provider.geometryType(), provider.crs() )
+  inGeom = inFeat.geometry()
+  outFeat.setGeometry(inGeom)
+  outFeat.setAttributeMap(atMap)
+  writers[clazz].addFeature(outFeat)
+
+
+
+for writer in writers.values():
+    del writer
\ No newline at end of file
diff --git a/python/plugins/sextante/taudem/CMakeLists.txt b/python/plugins/sextante/taudem/CMakeLists.txt
index 182214513d8d..09b6bf31b080 100644
--- a/python/plugins/sextante/taudem/CMakeLists.txt
+++ b/python/plugins/sextante/taudem/CMakeLists.txt
@@ -1,7 +1,7 @@
 FILE(GLOB PY_FILES *.py)
 FILE(GLOB DESCR_FILES description/*.txt)
-FILE(GLOB HELP_FILES help/*.html)
+FILE(GLOB HELP_FILES help/*.*)
 
-INSTALL(FILES ${PY_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/taudem)
-INSTALL(FILES ${DESCR_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/taudem/description)
-INSTALL(FILES ${HELP_FILES} DESTINATION ${SEXTANTE_PLUGIN_DIR}/taudem/help)
+PLUGIN_INSTALL(sextante taudem ${PY_FILES})
+PLUGIN_INSTALL(sextante taudem/description ${DESCR_FILES})
+PLUGIN_INSTALL(sextante taudem/help ${HELP_FILES})
diff --git a/python/plugins/sextante/taudem/TauDEMAlgorithmProvider.py b/python/plugins/sextante/taudem/TauDEMAlgorithmProvider.py
index 64b389377a6f..c94e49e7cd64 100644
--- a/python/plugins/sextante/taudem/TauDEMAlgorithmProvider.py
+++ b/python/plugins/sextante/taudem/TauDEMAlgorithmProvider.py
@@ -50,6 +50,7 @@ class TauDEMAlgorithmProvider(AlgorithmProvider):
 
     def __init__(self):
         AlgorithmProvider.__init__(self)
+        self.activate = False
         self.createAlgsList()
 
     def getDescription(self):
diff --git a/python/plugins/sextante/tests/data/model b/python/plugins/sextante/tests/data/model
deleted file mode 100644
index 810b07abed95..000000000000
--- a/python/plugins/sextante/tests/data/model
+++ /dev/null
@@ -1,68 +0,0 @@
-NAME:Watersheds from DEM and threshold
-GROUP:Hydrology
-PARAMETER:ParameterRaster|RASTERLAYER_DEM|DEM|False
-120.0,60.0
-PARAMETER:ParameterNumber|NUMBER_THRESHOLD|Threshold|0.0|None|1000000.0
-610.0,61.0
-VALUE:HARDCODEDPARAMVALUE_CLASS_ID_3=0
-VALUE:HARDCODEDPARAMVALUE_SPLIT_3=0
-VALUE:HARDCODEDPARAMVALUE_Method_0=0
-VALUE:HARDCODEDPARAMVALUE_INIT_METHOD_1=2
-VALUE:HARDCODEDPARAMVALUE_STEP_0=1
-VALUE:HARDCODEDPARAMVALUE_CONVERGENCE_0=1.0
-VALUE:HARDCODEDPARAMVALUE_DOLINEAR             _0=True
-VALUE:HARDCODEDPARAMVALUE_MINSIZE_2=0
-VALUE:HARDCODEDPARAMVALUE_CLASS_ALL_3=1
-VALUE:HARDCODEDPARAMVALUE_LINEARTHRS_0=500.0
-VALUE:HARDCODEDPARAMVALUE_MINLEN_1=10.0
-VALUE:HARDCODEDPARAMVALUE_DIV_CELLS_1=10.0
-ALGORITHM:saga:catchmentarea(parallel)
-288.0,259.0
--1|RASTERLAYER_DEM
-None
-None
-None
-None
--1|HARDCODEDPARAMVALUE_STEP_0
--1|HARDCODEDPARAMVALUE_Method_0
--1|HARDCODEDPARAMVALUE_DOLINEAR             _0
--1|HARDCODEDPARAMVALUE_LINEARTHRS_0
-None
-None
--1|HARDCODEDPARAMVALUE_CONVERGENCE_0
-None
-None
-None
-None
-None
-None
-None
-None
-ALGORITHM:saga:channelnetwork
-601.0,242.0
--1|RASTERLAYER_DEM
-None
-0|CAREA
--1|HARDCODEDPARAMVALUE_INIT_METHOD_1
--1|NUMBER_THRESHOLD
-None
--1|HARDCODEDPARAMVALUE_DIV_CELLS_1
-None
--1|HARDCODEDPARAMVALUE_MINLEN_1
-None
-None
-None
-ALGORITHM:saga:watershedbasins
-140.0,534.0
--1|RASTERLAYER_DEM
-1|CHNLNTWRK
-None
--1|HARDCODEDPARAMVALUE_MINSIZE_2
-None
-ALGORITHM:saga:vectorisinggridclasses
-550.0,530.0
-2|BASINS
--1|HARDCODEDPARAMVALUE_CLASS_ALL_3
--1|HARDCODEDPARAMVALUE_CLASS_ID_3
--1|HARDCODEDPARAMVALUE_SPLIT_3
-Watersheds
diff --git a/python/plugins/sextante/tests/test.py b/python/plugins/sextante/tests/test.py
index 7b65fb9137bf..4af0356fbb6d 100755
--- a/python/plugins/sextante/tests/test.py
+++ b/python/plugins/sextante/tests/test.py
@@ -10,6 +10,7 @@
      (at your option) any later version.
 
 """
+import sextante
 
 __author__ = 'tim@linfiniti.com'
 __version__ = '0.3.0'
@@ -59,7 +60,7 @@ class bcolors:
 
 class SextantePluginTest(unittest.TestCase):
     """Test suite for Sextante QGis plugin"""
-        
+
     def test_createplugin(self):
         """Initialize plugin"""
         self.sextanteplugin = SextantePlugin(IFACE)
@@ -129,15 +130,15 @@ def gen_test_parameters(self, alg, doSet = False):
 
     def setUp(self):
         SextanteConfig.setSettingValue(SextanteConfig.USE_THREADS, self.threaded)
-        print 
+        print
         print bcolors.INFO, self.msg, bcolors.ENDC,
         print "Parameters: ", self.alg.parameters,
         print "Outputs: ", [out for out in self.alg.outputs if not out.hidden],
         self.args = list(self.gen_test_parameters(self.alg, True))
         print ' => ', self.args, bcolors.WARNING,
-    
+
     def runalg_none(self):
-        result = Sextante.runalg(self.alg, *self.args)
+        result = sextante.runalg(self.alg, *self.args)
         print bcolors.ENDC
         self.assertIsNotNone(result, self.msg)
         if not result:
@@ -159,7 +160,7 @@ def runalg_parameters(self):
 
     def tearDown(self):
         print bcolors.ENDC
-        
+
 
 def algSuite(dialog = "none", threaded = True, unthreaded = True, provider = None, algName = None):
     s = unittest.TestSuite()
@@ -200,13 +201,13 @@ def modelSuite(modelFile, dialog = "none", threaded = True, unthreaded = True):
     parser.add_argument('-u', dest='uOnly', action='store_true', help='Enable unthreaded execution only.')
     parser.add_argument('-r', dest='raster', help='Use specified raster as input.', default='data/raster')
     parser.add_argument('-v', dest='vector', help='Use specified vectro as input.', default='data/vector')
-    
+
     args = parser.parse_args()
 
     threaded = not args.uOnly or args.tOnly
     unthreaded = not args.tOnly or args.uOnly
-    
-    
+
+
     try:
         loadSuite = unittest.TestLoader().loadTestsFromTestCase(SextantePluginTest)
         unittest.TextTestRunner(verbosity=2).run(loadSuite)
diff --git a/python/plugins/sextante/ui/DlgConfig.ui b/python/plugins/sextante/ui/DlgConfig.ui
new file mode 100644
index 000000000000..9daa3d4a43c2
--- /dev/null
+++ b/python/plugins/sextante/ui/DlgConfig.ui
@@ -0,0 +1,101 @@
+
+
+ DlgConfig
+ 
+  
+   
+    0
+    0
+    640
+    450
+   
+  
+  
+   SEXTANTE options
+  
+  
+   
+    2
+   
+   
+    0
+   
+   
+    
+     
+      Enter setting name to filter list
+     
+    
+   
+   
+    
+     
+      true
+     
+     
+      
+       Setting
+      
+     
+     
+      
+       Value
+      
+     
+    
+   
+   
+    
+     
+      Qt::Horizontal
+     
+     
+      QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+     
+    
+   
+  
+ 
+ 
+  
+   QgsFilterLineEdit
+   QLineEdit
+   
        qgis.gui
        
+          
+         
+ 
+ 
+  
+   buttonBox
+   accepted()
+   DlgConfig
+   accept()
+   
+    
+     248
+     254
+    
+    
+     157
+     274
+    
+   
+  
+  
+   buttonBox
+   rejected()
+   DlgConfig
+   reject()
+   
+    
+     316
+     260
+    
+    
+     286
+     274
+    
+   
+  
+ 
+        
diff --git a/python/plugins/sextante/ui/DlgHelpEdition.ui b/python/plugins/sextante/ui/DlgHelpEdition.ui
new file mode 100644
index 000000000000..ea867e7c43d7
--- /dev/null
+++ b/python/plugins/sextante/ui/DlgHelpEdition.ui
@@ -0,0 +1,155 @@
+
+
+ DlgHelpEdition
+ 
+  
+   
+    0
+    0
+    600
+    460
+   
+  
+  
+   Help editor
+  
+  
+   
+    2
+   
+   
+    0
+   
+   
+    
+     
+      Qt::Vertical
+     
+     
+      
+       
+        about:blank
+       
+      
+     
+     
+      
+       Qt::Horizontal
+      
+      
+       
+        
+         2
+        
+        
+         
+          
+           Select element to edit
+          
+         
+        
+        
+         
+          
+           
+            0
+            200
+           
+          
+          
+           true
+          
+          
+           false
+          
+          
+           
+            1
+           
+          
+         
+        
+       
+      
+      
+       
+        
+         2
+        
+        
+         
+          
+           Element description
+          
+         
+        
+        
+         
+          
+           
+            0
+            200
+           
+          
+         
+        
+       
+      
+     
+    
+   
+   
+    
+     
+      Qt::Horizontal
+     
+     
+      QDialogButtonBox::Cancel|QDialogButtonBox::Ok
+     
+    
+   
+  
+ 
+ 
+  
+   QWebView
+   QWidget
+   
        QtWebKit/QWebView
        
+          
+         
+ 
+ 
+  
+   buttonBox
+   accepted()
+   DlgHelpEdition
+   accept()
+   
+    
+     248
+     254
+    
+    
+     157
+     274
+    
+   
+  
+  
+   buttonBox
+   rejected()
+   DlgHelpEdition
+   reject()
+   
+    
+     316
+     260
+    
+    
+     286
+     274
+    
+   
+  
+ 
+        
diff --git a/python/plugins/sextante/about/aboutdialogbase.ui b/python/plugins/sextante/ui/DlgHistory.ui
similarity index 62%
rename from python/plugins/sextante/about/aboutdialogbase.ui
rename to python/plugins/sextante/ui/DlgHistory.ui
index 49b21bd364e5..76ff5ab43e6c 100644
--- a/python/plugins/sextante/about/aboutdialogbase.ui
+++ b/python/plugins/sextante/ui/DlgHistory.ui
@@ -1,17 +1,17 @@
 
 
- DlgAbout
- 
+ DlgHistory
+ 
   
    
     0
     0
-    492
-    401
+    532
+    377
    
   
   
-   About SEXTANTE
+   History and log
   
   
    
@@ -21,12 +21,25 @@
     0
    
    
-    
-     
-      
-       about:blank
-      
+    
+     
+      Qt::Vertical
      
+     
+      
+       false
+      
+      
+       
+        1
+       
+      
+     
+     
+      
+       true
+      
+     
     
    
    
@@ -35,25 +48,18 @@
       Qt::Horizontal
      
      
-      QDialogButtonBox::Close|QDialogButtonBox::Help
+      QDialogButtonBox::Close
      
     
    
   
  
- 
-  
-   QWebView
-   QWidget
-   
        QtWebKit/QWebView
        
-          
-         
  
  
   
    buttonBox
    accepted()
-   DlgAbout
+   DlgHistory
    accept()
    
     
@@ -69,7 +75,7 @@
   
    buttonBox
    rejected()
-   DlgAbout
+   DlgHistory
    reject()
    
     
diff --git a/python/plugins/sextante/ui/DlgModeler.ui b/python/plugins/sextante/ui/DlgModeler.ui
new file mode 100644
index 000000000000..2b43f98ad978
--- /dev/null
+++ b/python/plugins/sextante/ui/DlgModeler.ui
@@ -0,0 +1,166 @@
+
+
+ DlgModeler
+ 
+  
+   
+    0
+    0
+    1000
+    600
+   
+  
+  
+   SEXTANTE modeler
+  
+  
+   
+    2
+   
+   
+    0
+   
+   
+    
+     
+      Qt::Horizontal
+     
+     
+      
+       0
+      
+      
+       
+        Inputs
+       
+       
+        
+         2
+        
+        
+         0
+        
+        
+         
+          
+           true
+          
+          
+           false
+          
+         
+        
+       
+      
+      
+       
+        Algorithms
+       
+       
+        
+         2
+        
+        
+         0
+        
+        
+         
+          
+           Enter algorithm name to filter list
+          
+         
+        
+        
+         
+          
+           true
+          
+          
+           false
+          
+         
+        
+       
+      
+     
+     
+      
+       
+        2
+       
+       
+        
+         
+          Enter model name here
+         
+        
+       
+       
+        
+         
+          Enter group name here
+         
+        
+       
+       
+        
+       
+      
+     
+    
+   
+   
+    
+     
+      Qt::Horizontal
+     
+     
+      QDialogButtonBox::Close
+     
+    
+   
+  
+ 
+ 
+  
+   QgsFilterLineEdit
+   QLineEdit
+   
        qgis.gui
        
+          
+         
+ 
+ 
+  
+   buttonBox
+   accepted()
+   DlgModeler
+   accept()
+   
+    
+     248
+     254
+    
+    
+     157
+     274
+    
+   
+  
+  
+   buttonBox
+   rejected()
+   DlgModeler
+   reject()
+   
+    
+     316
+     260
+    
+    
+     286
+     274
+    
+   
+  
+ 
+        
diff --git a/python/plugins/sextante/ui/DlgResults.ui b/python/plugins/sextante/ui/DlgResults.ui
new file mode 100644
index 000000000000..b7733f86f166
--- /dev/null
+++ b/python/plugins/sextante/ui/DlgResults.ui
@@ -0,0 +1,113 @@
+
+
+ DlgResults
+ 
+  
+   
+    0
+    0
+    623
+    515
+   
+  
+  
+   Results
+  
+  
+   
+    2
+   
+   
+    0
+   
+   
+    
+     
+      Qt::Horizontal
+     
+     
+      
+       
+        0
+        0
+       
+      
+      
+       false
+      
+      
+       
+        1
+       
+      
+     
+     
+      
+       
+        0
+        0
+       
+      
+      
+       
+        about:blank
+       
+      
+     
+    
+   
+   
+    
+     
+      Qt::Horizontal
+     
+     
+      QDialogButtonBox::Close
+     
+    
+   
+  
+ 
+ 
+  
+   QWebView
+   QWidget
+   
        QtWebKit/QWebView
        
+          
+         
+ 
+ 
+  
+   buttonBox
+   accepted()
+   DlgResults
+   accept()
+   
+    
+     248
+     254
+    
+    
+     157
+     274
+    
+   
+  
+  
+   buttonBox
+   rejected()
+   DlgResults
+   reject()
+   
+    
+     316
+     260
+    
+    
+     286
+     274
+    
+   
+  
+ 
+        
diff --git a/python/plugins/sextante/ui/SextanteToolbox.ui b/python/plugins/sextante/ui/SextanteToolbox.ui
new file mode 100644
index 000000000000..8752f3b67069
--- /dev/null
+++ b/python/plugins/sextante/ui/SextanteToolbox.ui
@@ -0,0 +1,66 @@
+
+
+ SextanteToolbox
+ 
+  
+   
+    0
+    0
+    225
+    444
+   
+  
+  
+   SEXTANTE Toolbox
+  
+  
+   
+    
+     2
+    
+    
+     0
+    
+    
+     
+      
+       Click here to configure
+additional algorithm providers
+      
+     
+    
+    
+     
+      
+       Enter algorithm name to filter list
+      
+     
+    
+    
+     
+      
+       Qt::CustomContextMenu
+      
+      
+       true
+      
+      
+       
+        1
+       
+      
+     
+    
+   
+  
+ 
+ 
+  
+   QgsFilterLineEdit
+   QLineEdit
+   
        qgis.gui
        
+          
+         
+ 
+ 
+        
diff --git a/python/plugins/sextante/ui/__init__.py b/python/plugins/sextante/ui/__init__.py
new file mode 100644
index 000000000000..8b137891791f
--- /dev/null
+++ b/python/plugins/sextante/ui/__init__.py
@@ -0,0 +1 @@
+
diff --git a/python/plugins/sextanteexampleprovider/ExampleAlgorithm.py b/python/plugins/sextanteexampleprovider/ExampleAlgorithm.py
deleted file mode 100644
index b645870cccb2..000000000000
--- a/python/plugins/sextanteexampleprovider/ExampleAlgorithm.py
+++ /dev/null
@@ -1,104 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    ExampleAlgorithm.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Tim Sutton
-    Email                : tim at linfiniti dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Tim Sutton'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Tim Sutton'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.core.GeoAlgorithm import GeoAlgorithm
-from sextante.outputs.OutputVector import OutputVector
-from sextante.parameters.ParameterVector import ParameterVector
-from sextante.core.Sextante import Sextante
-from qgis.core import *
-from PyQt4.QtCore import *
-from PyQt4.QtGui import *
-from sextante.parameters.ParameterExtent import ParameterExtent
-from sextante.parameters.ParameterCrs import ParameterCrs
-
-
-class ExampleAlgorithm(GeoAlgorithm):
-    '''This is an example algorithm that takes a vector layer and creates
-    a new one just with just those features of the input layer that are
-    selected.
-    It is meant to be used as an example of how to create your own SEXTANTE
-    algorithms and explain methods and variables used to do it.
-    An algorithm like this will be available in all SEXTANTE elements, and
-    there is not need for additional work.
-
-    All SEXTANTE algorithms should extend the GeoAlgorithm class'''
-
-    #constants used to refer to parameters and outputs.
-    #They will be used when calling the algorithm from another algorithm,
-    #or when calling SEXTANTE from the QGIS console.
-    OUTPUT_LAYER = "OUTPUT_LAYER"
-    INPUT_LAYER = "INPUT_LAYER"
-
-    def defineCharacteristics(self):
-        '''Here we define the inputs and output of the algorithm, along
-        with some other properties'''
-
-        #the name that the user will see in the toolbox
-        self.name = "Create new layer with selected features"
-
-        #the branch of the toolbox under which the algorithm will appear
-        self.group = "Algorithms for vector layers"
-
-        #we add the input vector layer. It can have any kind of geometry
-        #It is a mandatory (not optional) one, hence the False argument
-        self.addParameter(ParameterVector(self.INPUT_LAYER, "Input layer", ParameterVector.VECTOR_TYPE_ANY, False))
-        self.addParameter(ParameterExtent("EXTENT","EXTENT"))
-        self.addParameter(ParameterCrs("CRS", "CRS"))
-        # we add a vector layer as output
-        self.addOutput(OutputVector(self.OUTPUT_LAYER, "Output layer with selected features"))
-
-
-    def processAlgorithm(self, progress):
-        '''Here is where the processing itself takes place'''
-
-        #the first thing to do is retrieve the values of the parameters
-        #entered by the user
-        inputFilename = self.getParameterValue(self.INPUT_LAYER)
-        output = self.getOutputValue(self.OUTPUT_LAYER)
-
-        #input layers values are always a string with its location.
-        #That string can be converted into a QGIS object (a QgsVectorLayer in this case))
-        #using the Sextante.getObject() method
-        vectorLayer = Sextante.getObject(inputFilename)
-
-        #And now we can process
-
-        #First we create the output layer.
-        #The output value entered by the user is a string containing a filename,
-        #so we can use it directly
-        settings = QSettings()
-        systemEncoding = settings.value( "/UI/encoding", "System" ).toString()
-        provider = vectorLayer.dataProvider()
-        writer = QgsVectorFileWriter( output, systemEncoding, provider.fields(), provider.geometryType(), provider.crs() )
-
-        #Now we take the selected features and add them to the output layer
-        selection = vectorLayer.selectedFeatures()
-        for feat in selection:
-            writer.addFeature(feat)
-        del writer
-
-        #There is nothing more to do here. We do not have to open the layer that we have created.
-        #SEXTANTE will take care of that, or will handle it if this algorithm is executed within
-        #a complex model
diff --git a/python/plugins/sextanteexampleprovider/ExampleAlgorithmProvider.py b/python/plugins/sextanteexampleprovider/ExampleAlgorithmProvider.py
deleted file mode 100644
index bd03d6490eea..000000000000
--- a/python/plugins/sextanteexampleprovider/ExampleAlgorithmProvider.py
+++ /dev/null
@@ -1,78 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    ExampleAlgorithmProvider.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Tim Sutton
-    Email                : tim at linfiniti dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Tim Sutton'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Tim Sutton'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from sextante.core.AlgorithmProvider import AlgorithmProvider
-from sextanteexampleprovider.ExampleAlgorithm import ExampleAlgorithm
-from sextante.core.SextanteConfig import Setting, SextanteConfig
-
-class ExampleAlgorithmProvider(AlgorithmProvider):
-
-    MY_DUMMY_SETTING = "MY_DUMMY_SETTING"
-
-    def __init__(self):
-        AlgorithmProvider.__init__(self)
-        self.alglist = [ExampleAlgorithm()]
-
-    def initializeSettings(self):
-        '''In this method we add settings needed to configure our provider.
-        Do not forget to call the parent method, since it takes care or
-        automatically adding a setting for activating or deactivating the
-        algorithms in the provider'''
-        AlgorithmProvider.initializeSettings(self)
-        SextanteConfig.addSetting(Setting("Example algorithms", ExampleAlgorithmProvider.MY_DUMMY_SETTING, "Example setting", "Default value"))
-        '''To get the parameter of a setting parameter, use SextanteConfig.getSetting(name_of_parameter)'''
-
-    def unload(self):
-        '''Setting should be removed here, so they do not appear anymore
-        when the plugin is unloaded'''
-        AlgorithmProvider.unload(self)
-        SextanteConfig.removeSetting( ExampleAlgorithmProvider.MY_DUMMY_SETTING)
-
-
-    def getName(self):
-        '''This name is  used to create the command line name of all the algorithms
-        from this provider'''
-        return "exampleprovider"
-
-    def getDescription(self):
-        '''This is the name that will appear on the toolbox group.'''
-        return "Example algorithms"
-
-    def getIcon(self):
-        '''We return the default icon'''
-        return AlgorithmProvider.getIcon(self)
-
-
-    def _loadAlgorithms(self):
-        '''Here we fill the list of algorithms in self.algs.
-        This method is called whenever the list of algorithms should be updated.
-        If the list of algorithms can change while executing SEXTANTE for QGIS
-        (for instance, if it contains algorithms from user-defined scripts and
-        a new script might have been added), you should create the list again
-        here.
-        In this case, since the list is always the same, we assign from the pre-made list.
-        This assignment has to be done in this method even if the list does not change,
-        since the self.algs list is cleared before calling this method'''
-        self.algs = self.alglist
diff --git a/python/plugins/sextanteexampleprovider/SextanteExampleProviderPlugin.py b/python/plugins/sextanteexampleprovider/SextanteExampleProviderPlugin.py
deleted file mode 100644
index 1e0cfd25a3d1..000000000000
--- a/python/plugins/sextanteexampleprovider/SextanteExampleProviderPlugin.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    SextanteExampleProviderPlugin.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Tim Sutton
-    Email                : tim at linfiniti dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Tim Sutton'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Tim Sutton'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-from qgis.core import *
-import os, sys
-import inspect
-from sextante.core.Sextante import Sextante
-from sextanteexampleprovider.ExampleAlgorithmProvider import ExampleAlgorithmProvider
-
-
-cmd_folder = os.path.split(inspect.getfile( inspect.currentframe() ))[0]
-if cmd_folder not in sys.path:
-    sys.path.insert(0, cmd_folder)
-
-class SextanteExampleProviderPlugin:
-
-    def __init__(self):
-        self.provider = ExampleAlgorithmProvider()
-    def initGui(self):
-        Sextante.addProvider(self.provider)
-
-    def unload(self):
-        Sextante.removeProvider(self.provider)
-
diff --git a/python/plugins/sextanteexampleprovider/__init__.py b/python/plugins/sextanteexampleprovider/__init__.py
deleted file mode 100644
index 749a01b06106..000000000000
--- a/python/plugins/sextanteexampleprovider/__init__.py
+++ /dev/null
@@ -1,38 +0,0 @@
-# -*- coding: utf-8 -*-
-
-"""
-***************************************************************************
-    __init__.py
-    ---------------------
-    Date                 : August 2012
-    Copyright            : (C) 2012 by Tim Sutton
-    Email                : tim at linfiniti dot com
-***************************************************************************
-*                                                                         *
-*   This program is free software; you can redistribute it and/or modify  *
-*   it under the terms of the GNU General Public License as published by  *
-*   the Free Software Foundation; either version 2 of the License, or     *
-*   (at your option) any later version.                                   *
-*                                                                         *
-***************************************************************************
-"""
-
-__author__ = 'Tim Sutton'
-__date__ = 'August 2012'
-__copyright__ = '(C) 2012, Tim Sutton'
-# This will get replaced with a git SHA1 when you do a git archive
-__revision__ = '$Format:%H$'
-
-def name():
-    return "SEXTANTE example provider"
-def description():
-    return "An example plugin that adds algorithms to SEXTANTE. Mainly created to guide developers in the process of creating plugins that add new capabilities to SEXTANTE"
-def version():
-    return "Version 1.0"
-def icon():
-    return "icon.png"
-def qgisMinimumVersion():
-    return "1.0"
-def classFactory(iface):
-    from sextanteexampleprovider.SextanteExampleProviderPlugin import SextanteExampleProviderPlugin
-    return SextanteExampleProviderPlugin()
diff --git a/python/plugins/sextanteexampleprovider/metadata.txt b/python/plugins/sextanteexampleprovider/metadata.txt
deleted file mode 100644
index 70129047c352..000000000000
--- a/python/plugins/sextanteexampleprovider/metadata.txt
+++ /dev/null
@@ -1,17 +0,0 @@
-# This file contains metadata for your plugin. Beginning
-# with version 1.8 this is the preferred way to supply information about a
-# plugin. The current method of embedding metadata in __init__.py will
-# be supported until version 2.0
-
-# This file should be included when you package your plugin.
-
-[general]
-name=SEXTANTE Example Provider
-description=An example plugin that adds algorithms to SEXTANTE. Mainly created to guide developers in the process of creating plugins that add new capabilities to SEXTANTE
-version=1.0
-qgisMinimumVersion=1.0
-class_name=SextanteExampleProviderPlugin
-website=www.sextantegis.com
-[author]
-name=Victor Olaya
-email=volayaf@gmail.com
diff --git a/python/utils.py b/python/utils.py
index f725c172e255..0f282c49d824 100755
--- a/python/utils.py
+++ b/python/utils.py
@@ -28,8 +28,9 @@
 
 """
 
-from PyQt4.QtCore import QCoreApplication,QLocale
-from qgis.core import QGis
+from PyQt4.QtCore import QCoreApplication,QLocale, QString
+from qgis.core import QGis, QgsExpression
+from string import Template
 import sys
 import traceback
 import glob
@@ -229,7 +230,7 @@ def canUninstallPlugin(packageName):
 def unloadPlugin(packageName):
   """ unload and delete plugin! """
   global plugins, active_plugins
-  
+
   if not plugins.has_key(packageName): return False
   if packageName not in active_plugins: return False
 
@@ -303,11 +304,11 @@ def showPluginHelp(packageName=None,filename="index",section=""):
   helpfile = os.path.join(path,filename+"-"+locale+".html")
   if not os.path.exists(helpfile):
     helpfile = os.path.join(path,filename+"-"+locale.split("_")[0]+".html")
-  if not os.path.exists(helpfile):    
+  if not os.path.exists(helpfile):
     helpfile = os.path.join(path,filename+"-en.html")
-  if not os.path.exists(helpfile):    
+  if not os.path.exists(helpfile):
     helpfile = os.path.join(path,filename+"-en_US.html")
-  if not os.path.exists(helpfile):    
+  if not os.path.exists(helpfile):
     helpfile = os.path.join(path,filename+".html")
   if os.path.exists(helpfile):
     url = "file://"+helpfile
@@ -371,6 +372,59 @@ def closeProjectMacro():
     mod.closeProject()
 
 
+def qgsfunction(args, group, **kwargs):
+  """
+  Decorator function used to define a user expression function.
+
+  Custom functions should take (values, feature, parent) as args,
+  they can also shortcut naming feature and parent args by using *args
+  if they are not needed in the function.
+
+  Functions should return a value compatible with QVariant
+
+  Eval errors can be raised using parent.setEvalErrorString()
+
+  Functions must be unregistered when no longer needed using
+  QgsExpression.unregisterFunction
+
+  Example:
+    @qgsfunction(2, 'test'):
+    def add(values, feature, parent):
+      pass
+
+    Will create and register a function in QgsExpression called 'add' in the
+    'test' group that takes two arguments.
+
+    or not using feature and parent:
+
+    @qgsfunction(2, 'test'):
+    def add(values, *args):
+      pass
+  """
+  helptemplate = Template("""
        $name function

        $doc""")
+  class QgsExpressionFunction(QgsExpression.Function):
+    def __init__(self, name, args, group, helptext=''):
+      QgsExpression.Function.__init__(self, name, args, group, QString(helptext))
+
+    def func(self, values, feature, parent):
+      pass
+
+  def wrapper(func):
+    name = kwargs.get('name', func.__name__)
+    help = func.__doc__ or ''
+    help = help.strip()
+    if args == 0 and not name[0] == '$':
+      name = '${0}'.format(name)
+    func.__name__ = name
+    help = helptemplate.safe_substitute(name=name, doc=help)
+    f = QgsExpressionFunction(name, args, group, help)
+    f.func = func
+    register = kwargs.get('register', True)
+    if register:
+      QgsExpression.registerFunction(f)
+    return f
+  return wrapper
+
 #######################
 # IMPORT wrapper
 
@@ -386,7 +440,7 @@ def _import(name, globals={}, locals={}, fromlist=[], level=-1):
   if mod and '__file__' in mod.__dict__:
     module_name = mod.__name__
     package_name = module_name.split('.')[0]
-    # check whether the module belongs to one of our plugins 
+    # check whether the module belongs to one of our plugins
     if package_name in available_plugins:
       if package_name not in _plugin_modules:
         _plugin_modules[package_name] = set()
diff --git a/python/widgets_tree.py b/python/widgets_tree.py
index bca3fe62956b..b96dd13d7fe9 100644
--- a/python/widgets_tree.py
+++ b/python/widgets_tree.py
@@ -47,7 +47,7 @@
 from PyQt4 import Qwt5 as qwt_plot
 sys.modules['qwt_plot'] = qwt_plot
 
-# loadUi is looking for custom widget in module which is lowercase version of 
+# loadUi is looking for custom widget in module which is lowercase version of
 # the class, which do not exist (AFAIK) -> preload them, problems anyway:
 # missing in gui: QgsColorRampComboBox, QgsRendererRulesTreeWidget,
 # QgsRendererRulesTreeWidget, QgsAttributeTableView
@@ -60,16 +60,16 @@ class UiInspector:
 	def __init__(self ):
 		self.ui_dir = os.path.abspath ( os.path.join(  os.path.dirname(__file__)	, '../src/ui/*.ui' ) )
 		self.printMsg ( "Loading UI files " + self.ui_dir )
-		# list of widget classes we want to follow 
+		# list of widget classes we want to follow
 		self.follow = [
-			QWidget, QDialog, 
+			QWidget, QDialog,
 			QCheckBox, QComboBox, QDial, QPushButton, QLabel, QLCDNumber, QLineEdit, QRadioButton, QScrollBar, QSlider, QSpinBox, QTextEdit,
 			QDateEdit, QTimeEdit, QDateTimeEdit, QListView, QProgressBar, QTableView, QTabWidget, QTextBrowser, QDialogButtonBox,
       QScrollArea, QGroupBox, QStackedWidget,
 		]
 
 	def printMsg ( self, msg ):
-		sys.stderr.write( msg + "\n" ) 
+		sys.stderr.write( msg + "\n" )
 
 	def widgetXml(self, element, widget, level = 0, label = None ):
 		#print tostring ( element )
@@ -78,7 +78,7 @@ def widgetXml(self, element, widget, level = 0, label = None ):
 		#self.printMsg ( "windowTitle: " + widget.windowTitle() )
 
 		if not widget.objectName(): return
-	
+
 		lab = label
 		if hasattr( widget, 'text' ):
 			lab = widget.text()
@@ -104,14 +104,14 @@ def widgetXml(self, element, widget, level = 0, label = None ):
 			w  = child['widget']
 			if w.isWidgetType() and ( type(w) in self.follow ):
 				self.widgetXml ( sub_element, w, level+1, child['label'] )
-		
+
 
 	def treeXml(self, element ):
 		xml = ''
     # debug
 		for p in glob.glob( self.ui_dir ):
-		#for p in ['/home/radim/devel/qgis_trunk/src/ui/qgsabout.ui']: 
-		#for p in ['/home/radim/devel/qgis_trunk/src/ui/qgsrasterlayerpropertiesbase.ui']: 
+		#for p in ['/home/radim/devel/qgis_trunk/src/ui/qgsabout.ui']:
+		#for p in ['/home/radim/devel/qgis_trunk/src/ui/qgsrasterlayerpropertiesbase.ui']:
 			self.printMsg ( "Loading " + p )
 			# qgsrasterlayerpropertiesbase.ui is giving: No module named qwt_plot
 			try:
@@ -134,7 +134,7 @@ def xml( self ) :
 		reparsed = minidom.parseString(string)
 		xml = reparsed.toprettyxml(indent="  ")
 		return xml
-		
+
 
 if __name__ == '__main__':
 	app = QApplication(sys.argv) # required by loadUi
diff --git a/scripts/create_new_ts.sh b/scripts/create_new_ts.sh
old mode 100644
new mode 100755
diff --git a/scripts/tsstat.pl b/scripts/tsstat.pl
index 9e8219590367..11298519f332 100755
--- a/scripts/tsstat.pl
+++ b/scripts/tsstat.pl
@@ -37,13 +37,14 @@
 	af => 'Hendrik Bosman',
 	ar => 'Assem Kamal, Latif Jalil',
 	bg => 'Захари Савов, Jordan Tzvetkov',
-	ca_ES => 'Xavi',
+	ca_ES => 'Xavier Roijals',
 	cs_CZ => 'Martin Landa, Peter Antolik, Martin Dzurov, Jan Helebrant',
 	da_DK => 'Preben Lisby',
 	de => 'Jürgen E. Fischer, Stephan Holl, Otto Dassau, Werner Macho',
 	es => 'Carlos Dávila, Javier César Aldariz, Gabriela Awad, Edwin Amado, Mayeul Kauffmann, Diana Galindo',
 	el_GR => 'Evripidis Argyropoulos, Mike Pegnigiannis, Nikos Ves',
 	et_EE => 'Veiko Viil',
+	eu_ES => 'Irantzu Alvarez',
 	fa => 'Mola Pahnadayan',
 	fi => 'Marko Jarvenpaa',
 	fr => 'Eve Rousseau, Marc Monnerat, Lionel Roubeyrie, Jean Roc Morreale, Benjamin Bohard, Jeremy Garniaux, Yves Jacolin, Benjamin Lerre, Stéphane Morel, Marie Silvestre, Tahir Tamba, Xavier M, Mayeul Kauffmann, Mehdi Semchaoui, Robin Cura, Etienne Tourigny, Mathieu Bossaert',
@@ -68,10 +69,11 @@
 	ru => 'Artem Popov',
 	sk => 'Lubos Balazovic',
 	sl_SI => 'Jože Detečnik, Dejan Gregor',
+	sq_AL => '',
 	sr_Cyrl => 'Goran Ivanković',
 	sr_Latn => 'Goran Ivanković',
 	sv => 'Lars Luthman, Magnus Homann, Victor Axbom',
-	sq_AL => '',
+	sw => 'Yohana Mapala',
 	th => 'Man Chao',
 	tr => 'Osman Yilmaz',
 	uk => 'Сергей Якунин',
diff --git a/scripts/update_ts_files.sh b/scripts/update_ts_files.sh
index 22744df7e362..0bfe12a3bab6 100755
--- a/scripts/update_ts_files.sh
+++ b/scripts/update_ts_files.sh
@@ -96,7 +96,7 @@ if [ -n "$exclude" -o -n "$add" ]; then
 fi
 echo Updating python translations
 cd python
-pylupdate4 console.py utils.py -ts python-i18n.ts
+pylupdate4 console/console.py utils.py -ts python-i18n.ts
 perl ../scripts/ts2cpp.pl python-i18n.ts python-i18n.cpp
 rm python-i18n.ts
 cd ..
diff --git a/src/analysis/vector/qgszonalstatistics.cpp b/src/analysis/vector/qgszonalstatistics.cpp
index d94c6a07d612..4c12231f1d6f 100644
--- a/src/analysis/vector/qgszonalstatistics.cpp
+++ b/src/analysis/vector/qgszonalstatistics.cpp
@@ -87,8 +87,8 @@ int QgsZonalStatistics::calculateStatistics( QProgressDialog* p )
   mInputNodataValue = GDALGetRasterNoDataValue( rasterBand, NULL );
 
   //get geometry info about raster layer
-  int nCellsX = GDALGetRasterXSize( inputDataset );
-  int nCellsY = GDALGetRasterYSize( inputDataset );
+  int nCellsXGDAL = GDALGetRasterXSize( inputDataset );
+  int nCellsYGDAL = GDALGetRasterYSize( inputDataset );
   double geoTransform[6];
   if ( GDALGetGeoTransform( inputDataset, geoTransform ) != CE_None )
   {
@@ -105,7 +105,8 @@ int QgsZonalStatistics::calculateStatistics( QProgressDialog* p )
   {
     cellsizeY = -cellsizeY;
   }
-  QgsRectangle rasterBBox( geoTransform[0], geoTransform[3] - ( nCellsY * cellsizeY ), geoTransform[0] + ( nCellsX * cellsizeX ), geoTransform[3] );
+  QgsRectangle rasterBBox( geoTransform[0], geoTransform[3] - ( nCellsYGDAL * cellsizeY ),
+                           geoTransform[0] + ( nCellsXGDAL * cellsizeX ), geoTransform[3] );
 
   //add the new count, sum, mean fields to the provider
   QList newFieldList;
@@ -145,7 +146,6 @@ int QgsZonalStatistics::calculateStatistics( QProgressDialog* p )
 
   while ( vectorProvider->nextFeature( f ) )
   {
-    qWarning( "%d", featureCounter );
     if ( p )
     {
       p->setValue( featureCounter );
@@ -163,15 +163,32 @@ int QgsZonalStatistics::calculateStatistics( QProgressDialog* p )
       continue;
     }
 
+    QgsRectangle featureRect = featureGeometry->boundingBox().intersect( &rasterBBox );
+    if ( featureRect.isEmpty() )
+    {
+      ++featureCounter;
+      continue;
+    }
+
     int offsetX, offsetY, nCellsX, nCellsY;
-    if ( cellInfoForBBox( rasterBBox, featureGeometry->boundingBox(), cellsizeX, cellsizeY, offsetX, offsetY, nCellsX, nCellsY ) != 0 )
+    if ( cellInfoForBBox( rasterBBox, featureRect, cellsizeX, cellsizeY, offsetX, offsetY, nCellsX, nCellsY ) != 0 )
     {
       ++featureCounter;
       continue;
     }
 
-    statisticsFromMiddlePointTest_improved( rasterBand, featureGeometry, offsetX, offsetY, nCellsX, nCellsY, cellsizeX, cellsizeY,
-                                            rasterBBox, sum, count );
+    //avoid access to cells outside of the raster (may occur because of rounding)
+    if (( offsetX + nCellsX ) > nCellsXGDAL )
+    {
+      nCellsX = nCellsXGDAL - offsetX;
+    }
+    if (( offsetY + nCellsY ) > nCellsYGDAL )
+    {
+      nCellsY = nCellsYGDAL - offsetY;
+    }
+
+    statisticsFromMiddlePointTest( rasterBand, featureGeometry, offsetX, offsetY, nCellsX, nCellsY, cellsizeX, cellsizeY,
+                                   rasterBBox, sum, count );
 
     if ( count <= 1 )
     {
@@ -246,21 +263,44 @@ void QgsZonalStatistics::statisticsFromMiddlePointTest( void* band, QgsGeometry*
     int pixelOffsetY, int nCellsX, int nCellsY, double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count )
 {
   double cellCenterX, cellCenterY;
-  QgsPoint currentCellCenter;
 
   float* scanLine = ( float * ) CPLMalloc( sizeof( float ) * nCellsX );
   cellCenterY = rasterBBox.yMaximum() - pixelOffsetY * cellSizeY - cellSizeY / 2;
   count = 0;
   sum = 0;
 
+  GEOSGeometry* polyGeos = poly->asGeos();
+  if ( !polyGeos )
+  {
+    return;
+  }
+
+  const GEOSPreparedGeometry* polyGeosPrepared = GEOSPrepare( poly->asGeos() );
+  if ( !polyGeosPrepared )
+  {
+    return;
+  }
+
+  GEOSCoordSequence* cellCenterCoords = 0;
+  GEOSGeometry* currentCellCenter = 0;
+
   for ( int i = 0; i < nCellsY; ++i )
   {
-    GDALRasterIO( band, GF_Read, pixelOffsetX, pixelOffsetY + i, nCellsX, 1, scanLine, nCellsX, 1, GDT_Float32, 0, 0 );
+    if ( GDALRasterIO( band, GF_Read, pixelOffsetX, pixelOffsetY + i, nCellsX, 1, scanLine, nCellsX, 1, GDT_Float32, 0, 0 )
+         != CPLE_None )
+    {
+      continue;
+    }
     cellCenterX = rasterBBox.xMinimum() + pixelOffsetX * cellSizeX + cellSizeX / 2;
     for ( int j = 0; j < nCellsX; ++j )
     {
-      currentCellCenter = QgsPoint( cellCenterX, cellCenterY );
-      if ( poly->contains( ¤tCellCenter ) )
+      GEOSGeom_destroy( currentCellCenter );
+      cellCenterCoords = GEOSCoordSeq_create( 1, 2 );
+      GEOSCoordSeq_setX( cellCenterCoords, 0, cellCenterX );
+      GEOSCoordSeq_setY( cellCenterCoords, 0, cellCenterY );
+      currentCellCenter = GEOSGeom_createPoint( cellCenterCoords );
+
+      if ( GEOSPreparedContains( polyGeosPrepared, currentCellCenter ) )
       {
         if ( scanLine[j] != mInputNodataValue ) //don't consider nodata values
         {
@@ -273,6 +313,7 @@ void QgsZonalStatistics::statisticsFromMiddlePointTest( void* band, QgsGeometry*
     cellCenterY -= cellSizeY;
   }
   CPLFree( scanLine );
+  GEOSPreparedGeom_destroy( polyGeosPrepared );
 }
 
 void QgsZonalStatistics::statisticsFromPreciseIntersection( void* band, QgsGeometry* poly, int pixelOffsetX,
@@ -319,124 +360,4 @@ void QgsZonalStatistics::statisticsFromPreciseIntersection( void* band, QgsGeome
   CPLFree( pixelData );
 }
 
-void QgsZonalStatistics::statisticsFromMiddlePointTest_improved( void* band, QgsGeometry* poly, int pixelOffsetX, int pixelOffsetY, int nCellsX, int nCellsY,
-    double cellSizeX, double cellSizeY, const QgsRectangle& rasterBBox, double& sum, double& count )
-{
-  double cellCenterX, cellCenterY;
-  QgsPoint currentCellCenter;
-
-  float* scanLine = ( float * ) CPLMalloc( sizeof( float ) * nCellsX );
-  cellCenterY = rasterBBox.yMaximum() - pixelOffsetY * cellSizeY - cellSizeY / 2;
-  count = 0;
-  sum = 0;
-
-  for ( int i = 0; i < nCellsY; ++i )
-  {
-    GDALRasterIO( band, GF_Read, pixelOffsetX, pixelOffsetY + i, nCellsX, 1, scanLine, nCellsX, 1, GDT_Float32, 0, 0 );
-    cellCenterX = rasterBBox.xMinimum() + pixelOffsetX * cellSizeX + cellSizeX / 2;
-
-    //do intersection of scanline with geometry
-    GEOSCoordSequence* scanLineSequence = GEOSCoordSeq_create( 2, 2 );
-    GEOSCoordSeq_setX( scanLineSequence, 0, cellCenterX );
-    GEOSCoordSeq_setY( scanLineSequence, 0, cellCenterY );
-    GEOSCoordSeq_setX( scanLineSequence, 1, cellCenterX + nCellsX * cellSizeX );
-    GEOSCoordSeq_setY( scanLineSequence, 1, cellCenterY );
-    GEOSGeometry* scanLineGeos = GEOSGeom_createLineString( scanLineSequence ); //todo: delete
-    GEOSGeometry* polyGeos = poly->asGeos();
-    GEOSGeometry* scanLineIntersection = GEOSIntersection( scanLineGeos, polyGeos );
-    GEOSGeom_destroy( scanLineGeos );
-    if ( !scanLineIntersection )
-    {
-      cellCenterY -= cellSizeY;
-      continue;
-    }
-
-    //debug
-    //char* scanLineIntersectionType = GEOSGeomType( scanLineIntersection );
-
-    int numGeoms = GEOSGetNumGeometries( scanLineIntersection );
-    if ( numGeoms < 1 )
-    {
-      GEOSGeom_destroy( scanLineIntersection );
-      cellCenterY -= cellSizeY;
-      continue;
-    }
-
-    QList scanLineList;
-    double currentValue;
-    GEOSGeometry* currentGeom = 0;
-    for ( int z = 0; z < numGeoms; ++z )
-    {
-      if ( numGeoms == 1 )
-      {
-        currentGeom = scanLineIntersection;
-      }
-      else
-      {
-        currentGeom = GEOSGeom_clone( GEOSGetGeometryN( scanLineIntersection, z ) );
-      }
-      const GEOSCoordSequence* scanLineCoordSequence = GEOSGeom_getCoordSeq( currentGeom );
-      if ( !scanLineCoordSequence )
-      {
-        //error
-      }
-      unsigned int scanLineIntersectionSize;
-      GEOSCoordSeq_getSize( scanLineCoordSequence, &scanLineIntersectionSize );
-      if ( !scanLineCoordSequence || scanLineIntersectionSize < 2 || ( scanLineIntersectionSize & 1 ) )
-      {
-        //error
-      }
-      for ( unsigned int k = 0; k < scanLineIntersectionSize; ++k )
-      {
-        GEOSCoordSeq_getX( scanLineCoordSequence, k, ¤tValue );
-        scanLineList.push_back( currentValue );
-      }
-
-      if ( numGeoms != 1 )
-      {
-        GEOSGeom_destroy( currentGeom );
-      }
-    }
-    GEOSGeom_destroy( scanLineIntersection );
-    qSort( scanLineList );
-
-    if ( scanLineList.size() < 1 )
-    {
-      cellCenterY -= cellSizeY;
-      continue;
-    }
-
-    int listPlace = -1;
-    for ( int j = 0; j < nCellsX; ++j )
-    {
-      //currentCellCenter = QgsPoint( cellCenterX, cellCenterY );
-
-      //instead of doing a contained test every time, find the place of scanLineList and check if even / odd
-      if ( listPlace >= scanLineList.size() - 1 )
-      {
-        break;
-      }
-      if ( cellCenterX >= scanLineList.at( listPlace + 1 ) )
-      {
-        ++listPlace;
-        if ( listPlace >= scanLineList.size() )
-        {
-          break;
-        }
-      }
-      if ( listPlace >= 0 && listPlace < ( scanLineList.size() - 1 ) && !( listPlace & 1 ) )
-      {
-        if ( scanLine[j] != mInputNodataValue ) //don't consider nodata values
-        {
-          sum += scanLine[j];
-          ++count;
-        }
-      }
-      cellCenterX += cellSizeX;
-    }
-    cellCenterY -= cellSizeY;
-  }
-  CPLFree( scanLine );
-}
-
 
diff --git a/src/app/CMakeLists.txt b/src/app/CMakeLists.txt
index f9b8f4e0bd48..60ce9f6cb874 100644
--- a/src/app/CMakeLists.txt
+++ b/src/app/CMakeLists.txt
@@ -5,6 +5,7 @@ SET(QGIS_APP_SRCS
   qgsabout.cpp
   qgssponsors.cpp
   qgsaddattrdialog.cpp
+  qgsaddtaborgroup.cpp
   qgsaddjoindialog.cpp
   qgsannotationwidget.cpp
   qgsattributeactiondialog.cpp
@@ -34,6 +35,7 @@ SET(QGIS_APP_SRCS
   qgsdiagramproperties.cpp
   qgsdisplayangle.cpp
   qgsfieldcalculator.cpp
+  qgsfieldsproperties.cpp
   qgsgraduatedsymboldialog.cpp
   qgsidentifyresults.cpp
   qgsfeatureaction.cpp
@@ -77,6 +79,7 @@ SET(QGIS_APP_SRCS
   qgsmaptoolselectutils.cpp
   qgsmaptoolsimplify.cpp
   qgsmaptoolsplitfeatures.cpp
+  qgsmaptoolsvgannotation.cpp
   qgsmaptooltextannotation.cpp
   qgsmaptoolvertexedit.cpp
 
@@ -102,6 +105,7 @@ SET(QGIS_APP_SRCS
   qgsshortcutsmanager.cpp
   qgssinglesymboldialog.cpp
   qgssnappingdialog.cpp
+  qgssvgannotationdialog.cpp
   qgsundowidget.cpp
   qgstipgui.cpp
   qgstipfactory.cpp
@@ -165,6 +169,7 @@ SET (QGIS_APP_MOC_HDRS
   qgsabout.h
   qgsaddattrdialog.h
   qgsaddjoindialog.h
+  qgsaddtaborgroup.h
   qgsannotationwidget.h
   qgsattributeactiondialog.h
   qgsattributedialog.h
@@ -191,6 +196,7 @@ SET (QGIS_APP_MOC_HDRS
   qgsdisplayangle.h
   qgsfeatureaction.h
   qgsfieldcalculator.h
+  qgsfieldsproperties.h
   qgsformannotationdialog.h
   qgshtmlannotationdialog.h
   qgsgraduatedsymboldialog.h
@@ -247,6 +253,7 @@ SET (QGIS_APP_MOC_HDRS
   qgssinglesymboldialog.h
   qgssnappingdialog.h
   qgssponsors.h
+  qgssvgannotationdialog.h
   qgstextannotationdialog.h
   qgstipgui.h
   qgstipfactory.h
@@ -409,9 +416,10 @@ INCLUDE_DIRECTORIES(
   ${CMAKE_CURRENT_BINARY_DIR}/../ui
   ${QWT_INCLUDE_DIR}
   ${QT_QTUITOOLS_INCLUDE_DIR}
+  ${QEXTSERIALPORT_INCLUDE_DIR}
   ../analysis/raster
   ../core
-  ../core/gps ../core/gps/qextserialport
+  ../core/gps
   ../core/composer ../core/raster ../core/renderer ../core/symbology ../core/symbology-ng
   ../gui ../gui/symbology-ng ../gui/attributetable ../gui/raster
   ../plugins
@@ -420,7 +428,7 @@ INCLUDE_DIRECTORIES(
   )
 
 IF (ANDROID)
-    INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
+  INCLUDE_DIRECTORIES(${ANDROID_NDK_TOOLCHAIN_ROOT}/sysroot/usr/include)
 ENDIF (ANDROID)
 
 IF (HAVE_SPATIALITE)
diff --git a/src/app/composer/qgsatlascompositionwidget.cpp b/src/app/composer/qgsatlascompositionwidget.cpp
index 9ebc3529d07d..2f5726eb4459 100644
--- a/src/app/composer/qgsatlascompositionwidget.cpp
+++ b/src/app/composer/qgsatlascompositionwidget.cpp
@@ -23,7 +23,7 @@
 #include "qgscomposermap.h"
 
 QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsComposition* c ):
-  QWidget( parent ), mComposition( c )
+    QWidget( parent ), mComposition( c )
 {
   setupUi( this );
 
@@ -34,12 +34,12 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsCompos
   for ( QMap::const_iterator it = layers.begin(); it != layers.end(); ++it )
   {
     // Only consider vector layers
-    if ( dynamic_cast(it.value()) )
+    if ( dynamic_cast( it.value() ) )
     {
-      mAtlasCoverageLayerComboBox->insertItem( idx++, it.value()->name(), /* userdata */ qVariantFromValue( (void*)it.value() ) );
+      mAtlasCoverageLayerComboBox->insertItem( idx++, it.value()->name(), /* userdata */ qVariantFromValue(( void* )it.value() ) );
     }
   }
-  
+
   // Connect to addition / removal of layers
   QgsMapLayerRegistry* layerRegistry = QgsMapLayerRegistry::instance();
   if ( layerRegistry )
@@ -47,7 +47,7 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsCompos
     connect( layerRegistry, SIGNAL( layerWillBeRemoved( QString ) ), this, SLOT( onLayerRemoved( QString ) ) );
     connect( layerRegistry, SIGNAL( layerWasAdded( QgsMapLayer* ) ), this, SLOT( onLayerAdded( QgsMapLayer* ) ) );
   }
-  
+
   // update the composer map combo box
   // populate the map list
   mComposerMapComboBox->clear();
@@ -55,13 +55,13 @@ QgsAtlasCompositionWidget::QgsAtlasCompositionWidget( QWidget* parent, QgsCompos
   QList::const_iterator mapItemIt = availableMaps.constBegin();
   for ( ; mapItemIt != availableMaps.constEnd(); ++mapItemIt )
   {
-    mComposerMapComboBox->addItem( tr( "Map %1" ).arg(( *mapItemIt )->id() ), qVariantFromValue( (void*)*mapItemIt ) );
+    mComposerMapComboBox->addItem( tr( "Map %1" ).arg(( *mapItemIt )->id() ), qVariantFromValue(( void* )*mapItemIt ) );
   }
-  
+
   // Connect to addition / removal of maps
   connect( mComposition, SIGNAL( composerMapAdded( QgsComposerMap* ) ), this, SLOT( onComposerMapAdded( QgsComposerMap* ) ) );
   connect( mComposition, SIGNAL( itemRemoved( QgsComposerItem* ) ), this, SLOT( onItemRemoved( QgsComposerItem* ) ) );
-  
+
   // connect to updates
   connect( &mComposition->atlasComposition(), SIGNAL( parameterChanged() ), this, SLOT( updateGuiElements() ) );
 
@@ -84,7 +84,7 @@ void QgsAtlasCompositionWidget::on_mUseAtlasCheckBox_stateChanged( int state )
   {
     atlasMap->setEnabled( false );
     mAtlasFrame->setEnabled( false );
-  }  
+  }
 }
 
 void QgsAtlasCompositionWidget::onLayerRemoved( QString layerName )
@@ -113,7 +113,7 @@ void QgsAtlasCompositionWidget::onLayerAdded( QgsMapLayer* map )
   QgsVectorLayer* vectorLayer = dynamic_cast( map );
   if ( vectorLayer )
   {
-    mAtlasCoverageLayerComboBox->addItem( map->name(), qVariantFromValue( (void*)map ) );
+    mAtlasCoverageLayerComboBox->addItem( map->name(), qVariantFromValue(( void* )map ) );
   }
   if ( mAtlasCoverageLayerComboBox->count() == 1 )
   {
@@ -124,7 +124,7 @@ void QgsAtlasCompositionWidget::onLayerAdded( QgsMapLayer* map )
 void QgsAtlasCompositionWidget::onComposerMapAdded( QgsComposerMap* map )
 {
   QgsAtlasComposition* atlasMap = &mComposition->atlasComposition();
-  mComposerMapComboBox->addItem( tr( "Map %1" ).arg( map->id() ), qVariantFromValue( (void*)map ) );  
+  mComposerMapComboBox->addItem( tr( "Map %1" ).arg( map->id() ), qVariantFromValue(( void* )map ) );
   if ( mComposerMapComboBox->count() == 1 )
   {
     atlasMap->setComposerMap( map );
@@ -137,7 +137,7 @@ void QgsAtlasCompositionWidget::onItemRemoved( QgsComposerItem* item )
   QgsComposerMap* map = dynamic_cast( item );
   if ( map )
   {
-    int idx = mComposerMapComboBox->findData( qVariantFromValue( (void*)map ) );
+    int idx = mComposerMapComboBox->findData( qVariantFromValue(( void* )map ) );
     if ( idx != -1 )
     {
       mComposerMapComboBox->removeItem( idx );
@@ -162,7 +162,7 @@ void QgsAtlasCompositionWidget::on_mAtlasCoverageLayerComboBox_currentIndexChang
   }
   else
   {
-    QgsVectorLayer* layer = reinterpret_cast(mAtlasCoverageLayerComboBox->itemData( index ).value());
+    QgsVectorLayer* layer = reinterpret_cast( mAtlasCoverageLayerComboBox->itemData( index ).value() );
     atlasMap->setCoverageLayer( layer );
   }
 }
@@ -180,7 +180,7 @@ void QgsAtlasCompositionWidget::on_mComposerMapComboBox_currentIndexChanged( int
   }
   else
   {
-    QgsComposerMap* map = reinterpret_cast(mComposerMapComboBox->itemData( index ).value());
+    QgsComposerMap* map = reinterpret_cast( mComposerMapComboBox->itemData( index ).value() );
     atlasMap->setComposerMap( map );
   }
 }
@@ -203,7 +203,7 @@ void QgsAtlasCompositionWidget::on_mAtlasFilenameExpressionButton_clicked()
   {
     return;
   }
-  
+
   QgsExpressionBuilderDialog exprDlg( atlasMap->coverageLayer(), mAtlasFilenamePatternEdit->text(), this );
   exprDlg.setWindowTitle( tr( "Expression based filename" ) );
   if ( exprDlg.exec() == QDialog::Accepted )
@@ -268,19 +268,19 @@ void QgsAtlasCompositionWidget::updateGuiElements()
   {
     mUseAtlasCheckBox->setCheckState( Qt::Unchecked );
   }
-    
-  int idx = mAtlasCoverageLayerComboBox->findData( qVariantFromValue( (void*)atlasMap->coverageLayer() ));
+
+  int idx = mAtlasCoverageLayerComboBox->findData( qVariantFromValue(( void* )atlasMap->coverageLayer() ) );
   if ( idx != -1 )
   {
     mAtlasCoverageLayerComboBox->setCurrentIndex( idx );
   }
-  idx = mComposerMapComboBox->findData( qVariantFromValue( (void*)atlasMap->composerMap() ));
+  idx = mComposerMapComboBox->findData( qVariantFromValue(( void* )atlasMap->composerMap() ) );
   if ( idx != -1 )
   {
     mComposerMapComboBox->setCurrentIndex( idx );
   }
-  
-  mAtlasMarginSpinBox->setValue( static_cast(atlasMap->margin() * 100) );
+
+  mAtlasMarginSpinBox->setValue( static_cast( atlasMap->margin() * 100 ) );
   mAtlasFilenamePatternEdit->setText( atlasMap->filenamePattern() );
   mAtlasFixedScaleCheckBox->setCheckState( atlasMap->fixedScale() ? Qt::Checked : Qt::Unchecked );
   mAtlasHideCoverageCheckBox->setCheckState( atlasMap->hideCoverage() ? Qt::Checked : Qt::Unchecked );
@@ -290,5 +290,5 @@ void QgsAtlasCompositionWidget::updateGuiElements()
 void QgsAtlasCompositionWidget::blockAllSignals( bool b )
 {
   mUseAtlasCheckBox->blockSignals( b );
-  mAtlasFrame->blockSignals( b );  
+  mAtlasFrame->blockSignals( b );
 }
diff --git a/src/app/composer/qgsatlascompositionwidget.h b/src/app/composer/qgsatlascompositionwidget.h
index a265ccc344b5..4cacc6b56600 100644
--- a/src/app/composer/qgsatlascompositionwidget.h
+++ b/src/app/composer/qgsatlascompositionwidget.h
@@ -25,15 +25,15 @@ class QgsComposerItem;
   * Input widget for QgsAtlasComposition
   */
 class QgsAtlasCompositionWidget:
-    public QWidget,
-    private Ui::QgsAtlasCompositionWidgetBase
+      public QWidget,
+      private Ui::QgsAtlasCompositionWidgetBase
 {
     Q_OBJECT
-    public:
+  public:
     QgsAtlasCompositionWidget( QWidget* parent, QgsComposition* c );
     ~QgsAtlasCompositionWidget();
-				
-public slots:
+
+  public slots:
     void on_mUseAtlasCheckBox_stateChanged( int state );
     void on_mComposerMapComboBox_currentIndexChanged( int index );
     void on_mAtlasCoverageLayerComboBox_currentIndexChanged( int index );
@@ -42,17 +42,17 @@ public slots:
     void on_mAtlasHideCoverageCheckBox_stateChanged( int state );
     void on_mAtlasFixedScaleCheckBox_stateChanged( int state );
     void on_mAtlasSingleFileCheckBox_stateChanged( int state );
-							      
-private slots:
+
+  private slots:
     void onLayerRemoved( QString );
     void onLayerAdded( QgsMapLayer* );
     void onComposerMapAdded( QgsComposerMap* );
     void onItemRemoved( QgsComposerItem* );
 
     void updateGuiElements();
-    
-private:
+
+  private:
     QgsComposition* mComposition;
-    
+
     void blockAllSignals( bool b );
 };
diff --git a/src/app/composer/qgscomposer.cpp b/src/app/composer/qgscomposer.cpp
index 59c95de870dc..f32e7ddd16c7 100644
--- a/src/app/composer/qgscomposer.cpp
+++ b/src/app/composer/qgscomposer.cpp
@@ -93,6 +93,14 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   int size = settings.value( "/IconSize", QGIS_ICON_SIZE ).toInt();
   setIconSize( QSize( size, size ) );
 
+  // ability to save parent project from composer
+  mSaveProjectAction = QgisApp::instance()->actionSaveProject();
+  QToolButton* saveProjectToolButton = new QToolButton( this );
+  saveProjectToolButton->addAction( mSaveProjectAction );
+  saveProjectToolButton->setDefaultAction( mSaveProjectAction );
+  toolBar->insertWidget( mActionLoadFromTemplate, saveProjectToolButton );
+  toolBar->insertSeparator( mActionLoadFromTemplate );
+
   QToolButton* orderingToolButton = new QToolButton( this );
   orderingToolButton->setPopupMode( QToolButton::InstantPopup );
   orderingToolButton->setAutoRaise( true );
@@ -162,6 +170,8 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
 #endif
 
   QMenu *fileMenu = menuBar()->addMenu( tr( "File" ) );
+  fileMenu->addAction( mSaveProjectAction );
+  fileMenu->addSeparator();
   fileMenu->addAction( mActionLoadFromTemplate );
   fileMenu->addAction( mActionSaveAsTemplate );
   fileMenu->addSeparator();
@@ -267,6 +277,7 @@ QgsComposer::QgsComposer( QgisApp *qgis, const QString& title )
   mPanelMenu->addAction( mUndoDock->toggleViewAction() );
   mAtlasDock = new QDockWidget( tr( "Atlas generation" ), this );
   mAtlasDock->setObjectName( "AtlasDock" );
+  mPanelMenu->addAction( mAtlasDock->toggleViewAction() );
 
   mGeneralDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
   mItemDock->setFeatures( QDockWidget::DockWidgetMovable | QDockWidget::DockWidgetClosable );
@@ -434,10 +445,15 @@ void QgsComposer::open( void )
 
 void QgsComposer::activate()
 {
+  bool shown = isVisible();
   show();
   raise();
   setWindowState( windowState() & ~Qt::WindowMinimized );
   activateWindow();
+  if ( !shown )
+  {
+    on_mActionZoomAll_triggered();
+  }
 }
 
 #ifdef Q_WS_MAC
@@ -586,22 +602,22 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
     QSettings myQSettings;  // where we keep last used filter in persistent state
     QString lastUsedFile = myQSettings.value( "/UI/lastSaveAsPdfFile", "qgis.pdf" ).toString();
     QFileInfo file( lastUsedFile );
-    
+
     outputFileName = QFileDialog::getSaveFileName(
-						  this,
-						  tr( "Choose a file name to save the map as" ),
-						  file.path(),
-						  tr( "PDF Format" ) + " (*.pdf *.PDF)" );
+                       this,
+                       tr( "Choose a file name to save the map as" ),
+                       file.path(),
+                       tr( "PDF Format" ) + " (*.pdf *.PDF)" );
     if ( outputFileName.isEmpty() )
     {
       return;
     }
-    
+
     if ( !outputFileName.endsWith( ".pdf", Qt::CaseInsensitive ) )
     {
       outputFileName += ".pdf";
     }
-    
+
     myQSettings.setValue( "/UI/lastSaveAsPdfFile", outputFileName );
   }
   // else, we need to choose a directory
@@ -610,33 +626,33 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
     if ( atlasMap->filenamePattern().size() == 0 )
     {
       int res = QMessageBox::warning( 0, tr( "Empty filename pattern" ),
-				      tr( "The filename pattern is empty. A default one will be used." ),
-				      QMessageBox::Ok | QMessageBox::Cancel,
-				      QMessageBox::Ok );
+                                      tr( "The filename pattern is empty. A default one will be used." ),
+                                      QMessageBox::Ok | QMessageBox::Cancel,
+                                      QMessageBox::Ok );
       if ( res == QMessageBox::Cancel )
       {
-	return;
+        return;
       }
       atlasMap->setFilenamePattern( "'output_'||$feature" );
     }
 
     QSettings myQSettings;
     QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsPdfDir", "." ).toString();
-    outputDir = QFileDialog::getExistingDirectory(this,
-						  tr("Directory where to save PDF files"),
-						  lastUsedDir,
-						  QFileDialog::ShowDirsOnly);
+    outputDir = QFileDialog::getExistingDirectory( this,
+                tr( "Directory where to save PDF files" ),
+                lastUsedDir,
+                QFileDialog::ShowDirsOnly );
     if ( outputDir.isEmpty() )
     {
       return;
     }
     // test directory (if it exists and is writeable)
-    if ( !QDir(outputDir).exists() || !QFileInfo(outputDir).isWritable() )
+    if ( !QDir( outputDir ).exists() || !QFileInfo( outputDir ).isWritable() )
     {
       QMessageBox::warning( 0, tr( "Unable to write into the directory" ),
-			    tr( "The given output directory is not writeable. Cancelling." ),
-			    QMessageBox::Ok,
-			    QMessageBox::Ok );
+                            tr( "The given output directory is not writeable. Cancelling." ),
+                            QMessageBox::Ok,
+                            QMessageBox::Ok );
       return;
     }
 
@@ -658,7 +674,7 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
       painter.begin( &printer );
     }
 
-    QProgressDialog progress( tr("Rendering maps..."), tr("Abort"), 0, atlasMap->numFeatures(), this );
+    QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
     QApplication::setOverrideCursor( Qt::BusyCursor );
 
     for ( size_t featureI = 0; featureI < atlasMap->numFeatures(); ++featureI )
@@ -668,36 +684,36 @@ void QgsComposer::on_mActionExportAsPDF_triggered()
       QCoreApplication::processEvents();
       if ( progress.wasCanceled() )
       {
-	atlasMap->endRender();
-	break;
+        atlasMap->endRender();
+        break;
       }
       try
       {
-	atlasMap->prepareForFeature( featureI );
+        atlasMap->prepareForFeature( featureI );
       }
       catch ( std::runtime_error& e )
       {
-	QMessageBox::warning( this, tr( "Atlas processing error" ),
-			      e.what(),
-			      QMessageBox::Ok,
-			      QMessageBox::Ok);
-	break;
+        QMessageBox::warning( this, tr( "Atlas processing error" ),
+                              e.what(),
+                              QMessageBox::Ok,
+                              QMessageBox::Ok );
+        break;
       }
       if ( !atlasOnASingleFile )
       {
-	outputFileName = QDir(outputDir).filePath( atlasMap->currentFilename() ) + ".pdf";
-	mComposition->beginPrintAsPDF( printer, outputFileName );
-	painter.begin( &printer );
-	mComposition->doPrint( printer, painter );
-	painter.end();
+        outputFileName = QDir( outputDir ).filePath( atlasMap->currentFilename() ) + ".pdf";
+        mComposition->beginPrintAsPDF( printer, outputFileName );
+        painter.begin( &printer );
+        mComposition->doPrint( printer, painter );
+        painter.end();
       }
       else
       {
-	if ( featureI > 0 )
-	{
-	  printer.newPage();
-	}
-	mComposition->doPrint( printer, painter );
+        if ( featureI > 0 )
+        {
+          printer.newPage();
+        }
+        mComposition->doPrint( printer, painter );
       }
     }
     atlasMap->endRender();
@@ -748,7 +764,7 @@ void QgsComposer::on_mActionPrint_triggered()
     mComposition->beginPrint( mPrinter );
     QPainter painter( &mPrinter );
     atlasMap->beginRender();
-    QProgressDialog progress( tr("Rendering maps..."), tr("Abort"), 0, atlasMap->numFeatures(), this );
+    QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
 
     for ( size_t i = 0; i < atlasMap->numFeatures(); ++i )
     {
@@ -758,26 +774,26 @@ void QgsComposer::on_mActionPrint_triggered()
 
       if ( progress.wasCanceled() )
       {
-	atlasMap->endRender();
-	break;
+        atlasMap->endRender();
+        break;
       }
       try
       {
-	atlasMap->prepareForFeature( i );
+        atlasMap->prepareForFeature( i );
       }
       catch ( std::runtime_error& e )
       {
-	QMessageBox::warning( this, tr( "Atlas processing error" ),
-			      e.what(),
-			      QMessageBox::Ok,
-			      QMessageBox::Ok);
-	break;
+        QMessageBox::warning( this, tr( "Atlas processing error" ),
+                              e.what(),
+                              QMessageBox::Ok,
+                              QMessageBox::Ok );
+        break;
       }
 
 
       if ( i > 0 )
       {
-	mPrinter.newPage();
+        mPrinter.newPage();
       }
       mComposition->doPrint( mPrinter, painter );
     }
@@ -825,26 +841,26 @@ void QgsComposer::on_mActionExportAsImage_triggered()
   if ( !atlasMap->enabled() )
   {
     QPair fileNExt = QgisGui::getSaveAsImageName( this, tr( "Choose a file name to save the map image as" ) );
-    
+
     if ( fileNExt.first.isEmpty() )
     {
       return;
     }
-    
+
     mView->setPaintingEnabled( false );
-    
+
     for ( int i = 0; i < mComposition->numPages(); ++i )
     {
       QImage image = mComposition->printPageAsRaster( i );
       if ( i == 0 )
       {
-	image.save( fileNExt.first, fileNExt.second.toLocal8Bit().constData() );
+        image.save( fileNExt.first, fileNExt.second.toLocal8Bit().constData() );
       }
       else
       {
-	QFileInfo fi( fileNExt.first );
-	QString outputFilePath = fi.absolutePath() + "/" + fi.baseName() + "_" + QString::number( i + 1 ) + "." + fi.suffix();
-	image.save( outputFilePath, fileNExt.second.toLocal8Bit().constData() );
+        QFileInfo fi( fileNExt.first );
+        QString outputFilePath = fi.absolutePath() + "/" + fi.baseName() + "_" + QString::number( i + 1 ) + "." + fi.suffix();
+        image.save( outputFilePath, fileNExt.second.toLocal8Bit().constData() );
       }
     }
     mView->setPaintingEnabled( true );
@@ -855,12 +871,12 @@ void QgsComposer::on_mActionExportAsImage_triggered()
     if ( atlasMap->filenamePattern().size() == 0 )
     {
       int res = QMessageBox::warning( 0, tr( "Empty filename pattern" ),
-				      tr( "The filename pattern is empty. A default one will be used." ),
-				      QMessageBox::Ok | QMessageBox::Cancel,
-				      QMessageBox::Ok );
+                                      tr( "The filename pattern is empty. A default one will be used." ),
+                                      QMessageBox::Ok | QMessageBox::Cancel,
+                                      QMessageBox::Ok );
       if ( res == QMessageBox::Cancel )
       {
-	return;
+        return;
       }
       atlasMap->setFilenamePattern( "'output_'||$feature" );
     }
@@ -869,7 +885,7 @@ void QgsComposer::on_mActionExportAsImage_triggered()
     QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsImagesDir", "." ).toString();
     QString lastUsedFormat = myQSettings.value( "/UI/lastSaveAtlasAsImagesFormat", "jpg" ).toString();
 
-    QFileDialog dlg( this, tr("Directory where to save image files") );
+    QFileDialog dlg( this, tr( "Directory where to save image files" ) );
     dlg.setFileMode( QFileDialog::Directory );
     dlg.setOption( QFileDialog::ShowDirsOnly, true );
 
@@ -878,22 +894,22 @@ void QgsComposer::on_mActionExportAsImage_triggered()
     QComboBox *box = new QComboBox();
     QHBoxLayout* hlayout = new QHBoxLayout();
     QWidget* widget = new QWidget();
-    
+
     QList formats = QImageWriter::supportedImageFormats();
     int selectedFormat = 0;
     for ( int i = 0; i < formats.size(); ++i )
     {
-      QString format = QString( formats.at(i) );
+      QString format = QString( formats.at( i ) );
       if ( format == lastUsedFormat )
       {
-	selectedFormat = i;
+        selectedFormat = i;
       }
       box->addItem( format );
     }
     box->setCurrentIndex( selectedFormat );
 
     hlayout->setMargin( 0 );
-    hlayout->addWidget( new QLabel( tr("Image format: ")) );
+    hlayout->addWidget( new QLabel( tr( "Image format: " ) ) );
     hlayout->addWidget( box );
     widget->setLayout( hlayout );
     dlg.layout()->addWidget( widget );
@@ -903,11 +919,11 @@ void QgsComposer::on_mActionExportAsImage_triggered()
       return;
     }
     QStringList s = dlg.selectedFiles();
-    if ( s.size() < 1 || s.at(0).isEmpty() )
+    if ( s.size() < 1 || s.at( 0 ).isEmpty() )
     {
       return;
     }
-    QString dir = s.at(0);
+    QString dir = s.at( 0 );
     QString format = box->currentText();
     QString fileExt = "." + format;
 
@@ -916,12 +932,12 @@ void QgsComposer::on_mActionExportAsImage_triggered()
       return;
     }
     // test directory (if it exists and is writeable)
-    if ( !QDir(dir).exists() || !QFileInfo(dir).isWritable() )
+    if ( !QDir( dir ).exists() || !QFileInfo( dir ).isWritable() )
     {
       QMessageBox::warning( 0, tr( "Unable to write into the directory" ),
-			    tr( "The given output directory is not writeable. Cancelling." ),
-			    QMessageBox::Ok,
-			    QMessageBox::Ok );
+                            tr( "The given output directory is not writeable. Cancelling." ),
+                            QMessageBox::Ok,
+                            QMessageBox::Ok );
       return;
     }
 
@@ -932,49 +948,49 @@ void QgsComposer::on_mActionExportAsImage_triggered()
     QApplication::setOverrideCursor( Qt::BusyCursor );
 
     atlasMap->beginRender();
-    
-    QProgressDialog progress( tr("Rendering maps..."), tr("Abort"), 0, atlasMap->numFeatures(), this );
+
+    QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
 
     for ( size_t feature = 0; feature < atlasMap->numFeatures(); ++feature )
     {
       progress.setValue( feature );
       // process input events in order to allow cancelling
       QCoreApplication::processEvents();
-      
+
       if ( progress.wasCanceled() )
       {
-	atlasMap->endRender();
-	break;
+        atlasMap->endRender();
+        break;
       }
       try
       {
-	atlasMap->prepareForFeature( feature );
+        atlasMap->prepareForFeature( feature );
       }
       catch ( std::runtime_error& e )
       {
-	QMessageBox::warning( this, tr( "Atlas processing error" ),
-			      e.what(),
-			      QMessageBox::Ok,
-			      QMessageBox::Ok);
-	break;
+        QMessageBox::warning( this, tr( "Atlas processing error" ),
+                              e.what(),
+                              QMessageBox::Ok,
+                              QMessageBox::Ok );
+        break;
       }
 
-      QString filename = QDir(dir).filePath(atlasMap->currentFilename()) + fileExt;
-      
+      QString filename = QDir( dir ).filePath( atlasMap->currentFilename() ) + fileExt;
+
       for ( int i = 0; i < mComposition->numPages(); ++i )
       {
-	QImage image = mComposition->printPageAsRaster( i );
-	
-	if ( i == 0 )
-	{
-	  image.save( filename, format.toLocal8Bit().constData() );
-	}
-	else
-	{
-	  QFileInfo fi( filename );
-	  QString outputFilePath = fi.absolutePath() + "/" + fi.baseName() + "_" + QString::number( i + 1 ) + "." + fi.suffix();
-	  image.save( outputFilePath, format.toLocal8Bit().constData() );
-	}
+        QImage image = mComposition->printPageAsRaster( i );
+
+        if ( i == 0 )
+        {
+          image.save( filename, format.toLocal8Bit().constData() );
+        }
+        else
+        {
+          QFileInfo fi( filename );
+          QString outputFilePath = fi.absolutePath() + "/" + fi.baseName() + "_" + QString::number( i + 1 ) + "." + fi.suffix();
+          image.save( outputFilePath, format.toLocal8Bit().constData() );
+        }
       }
     }
     atlasMap->endRender();
@@ -1027,12 +1043,12 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
   {
     QString lastUsedFile = settings.value( "/UI/lastSaveAsSvgFile", "qgis.svg" ).toString();
     QFileInfo file( lastUsedFile );
-    
+
     outputFileName = QFileDialog::getSaveFileName(
-						  this,
-						  tr( "Choose a file name to save the map as" ),
-						  file.path(),
-						  tr( "SVG Format" ) + " (*.svg *.SVG)" );
+                       this,
+                       tr( "Choose a file name to save the map as" ),
+                       file.path(),
+                       tr( "SVG Format" ) + " (*.svg *.SVG)" );
     if ( outputFileName.isEmpty() )
       return;
 
@@ -1040,7 +1056,7 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
     {
       outputFileName += ".svg";
     }
-    
+
     settings.setValue( "/UI/lastSaveAsSvgFile", outputFileName );
   }
   else
@@ -1049,12 +1065,12 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
     if ( atlasMap->filenamePattern().size() == 0 )
     {
       int res = QMessageBox::warning( 0, tr( "Empty filename pattern" ),
-				      tr( "The filename pattern is empty. A default one will be used." ),
-				      QMessageBox::Ok | QMessageBox::Cancel,
-				      QMessageBox::Ok );
+                                      tr( "The filename pattern is empty. A default one will be used." ),
+                                      QMessageBox::Ok | QMessageBox::Cancel,
+                                      QMessageBox::Ok );
       if ( res == QMessageBox::Cancel )
       {
-	return;
+        return;
       }
       atlasMap->setFilenamePattern( "'output_'||$feature" );
     }
@@ -1062,27 +1078,27 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
     QSettings myQSettings;
     QString lastUsedDir = myQSettings.value( "/UI/lastSaveAtlasAsSvgDir", "." ).toString();
 
-    outputDir = QFileDialog::getExistingDirectory(this,
-						    tr("Directory where to save SVG files"),
-						    lastUsedDir,
-						    QFileDialog::ShowDirsOnly);
+    outputDir = QFileDialog::getExistingDirectory( this,
+                tr( "Directory where to save SVG files" ),
+                lastUsedDir,
+                QFileDialog::ShowDirsOnly );
     if ( outputDir.isEmpty() )
     {
       return;
     }
     // test directory (if it exists and is writeable)
-    if ( !QDir(outputDir).exists() || !QFileInfo(outputDir).isWritable() )
+    if ( !QDir( outputDir ).exists() || !QFileInfo( outputDir ).isWritable() )
     {
       QMessageBox::warning( 0, tr( "Unable to write into the directory" ),
-			    tr( "The given output directory is not writeable. Cancelling." ),
-			    QMessageBox::Ok,
-			    QMessageBox::Ok );
+                            tr( "The given output directory is not writeable. Cancelling." ),
+                            QMessageBox::Ok,
+                            QMessageBox::Ok );
       return;
     }
-    
+
     myQSettings.setValue( "/UI/lastSaveAtlasAsSvgDir", outputDir );
   }
-    
+
   mView->setPaintingEnabled( false );
 
   size_t featureI = 0;
@@ -1090,36 +1106,36 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
   {
     atlasMap->beginRender();
   }
-  QProgressDialog progress( tr("Rendering maps..."), tr("Abort"), 0, atlasMap->numFeatures(), this );
+  QProgressDialog progress( tr( "Rendering maps..." ), tr( "Abort" ), 0, atlasMap->numFeatures(), this );
 
   do
   {
     if ( hasAnAtlas )
     {
       if ( atlasMap->numFeatures() == 0 )
-	break;
+        break;
 
       progress.setValue( featureI );
       // process input events in order to allow aborting
       QCoreApplication::processEvents();
       if ( progress.wasCanceled() )
       {
-	atlasMap->endRender();
-	break;
+        atlasMap->endRender();
+        break;
       }
       try
       {
-	atlasMap->prepareForFeature( featureI );
+        atlasMap->prepareForFeature( featureI );
       }
       catch ( std::runtime_error& e )
       {
-	QMessageBox::warning( this, tr( "Atlas processing error" ),
-			      e.what(),
-			      QMessageBox::Ok,
-			      QMessageBox::Ok);
-	break;
+        QMessageBox::warning( this, tr( "Atlas processing error" ),
+                              e.what(),
+                              QMessageBox::Ok,
+                              QMessageBox::Ok );
+        break;
       }
-      outputFileName = QDir(outputDir).filePath( atlasMap->currentFilename() ) + ".svg";
+      outputFileName = QDir( outputDir ).filePath( atlasMap->currentFilename() ) + ".svg";
     }
 
     for ( int i = 0; i < mComposition->numPages(); ++i )
@@ -1130,14 +1146,14 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
 #endif
       if ( i == 0 )
       {
-	generator.setFileName( outputFileName );
+        generator.setFileName( outputFileName );
       }
       else
       {
-	QFileInfo fi( outputFileName );
-	generator.setFileName( fi.absolutePath() + "/" + fi.baseName() + "_" + QString::number( i + 1 ) + "." + fi.suffix() );
+        QFileInfo fi( outputFileName );
+        generator.setFileName( fi.absolutePath() + "/" + fi.baseName() + "_" + QString::number( i + 1 ) + "." + fi.suffix() );
       }
-      
+
       //width in pixel
       int width = ( int )( mComposition->paperWidth() * mComposition->printResolution() / 25.4 );
       //height in pixel
@@ -1147,14 +1163,15 @@ void QgsComposer::on_mActionExportAsSVG_triggered()
       generator.setViewBox( QRect( 0, 0, width, height ) );
 #endif
       generator.setResolution( mComposition->printResolution() ); //because the rendering is done in mm, convert the dpi
-      
+
       QPainter p( &generator );
-      
+
       mComposition->renderPage( &p, i );
       p.end();
     }
     featureI++;
-  } while ( hasAnAtlas && featureI < atlasMap->numFeatures() );
+  }
+  while ( hasAnAtlas && featureI < atlasMap->numFeatures() );
 
   if ( hasAnAtlas )
     atlasMap->endRender();
diff --git a/src/app/composer/qgscomposer.h b/src/app/composer/qgscomposer.h
index ce50a4b493a9..582b63176edc 100644
--- a/src/app/composer/qgscomposer.h
+++ b/src/app/composer/qgscomposer.h
@@ -78,7 +78,7 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
     QgsComposerView *view( void );
 
     //! Return current composition
-    QgsComposition* composition(void){ return mComposition; }
+    QgsComposition* composition( void ) { return mComposition; }
 
     //! Restore the window and toolbar state
     void restoreWindowState();
@@ -346,6 +346,10 @@ class QgsComposer: public QMainWindow, private Ui::QgsComposerBase
 
     QMenu* mPanelMenu;
     QMenu* mToolbarMenu;
+
+    //! Save parent Project action
+    //! @note added in 1.9
+    QAction *mSaveProjectAction;
 };
 
 #endif
diff --git a/src/app/composer/qgscomposerlabelwidget.cpp b/src/app/composer/qgscomposerlabelwidget.cpp
index 0a71cc6484ad..ad5f3ab117a7 100644
--- a/src/app/composer/qgscomposerlabelwidget.cpp
+++ b/src/app/composer/qgscomposerlabelwidget.cpp
@@ -102,7 +102,7 @@ void QgsComposerLabelWidget::on_mFontColorButton_clicked()
 
 void QgsComposerLabelWidget::on_mInsertExpressionButton_clicked()
 {
-  if ( !mComposerLabel)
+  if ( !mComposerLabel )
   {
     return;
   }
diff --git a/src/app/composer/qgscomposerlegendwidget.cpp b/src/app/composer/qgscomposerlegendwidget.cpp
index 3f5db9206e9e..a74eee5fde7a 100644
--- a/src/app/composer/qgscomposerlegendwidget.cpp
+++ b/src/app/composer/qgscomposerlegendwidget.cpp
@@ -17,6 +17,7 @@
 
 #include "qgscomposerlegendwidget.h"
 #include "qgscomposerlegend.h"
+#include "qgscomposerlegenditem.h"
 #include "qgscomposerlegenditemdialog.h"
 #include "qgscomposerlegendlayersdialog.h"
 #include "qgscomposeritemwidget.h"
@@ -26,8 +27,10 @@
 #include "qgsapplegendinterface.h"
 #include "qgisapp.h"
 #include "qgsmapcanvas.h"
+#include "qgsmaplayerregistry.h"
 #include "qgsmaprenderer.h"
 #include "qgsapplication.h"
+#include "qgsvectorlayer.h"
 
 #include 
 
@@ -41,6 +44,7 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m
   mRemoveToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyRemove.png" ) ) );
   mMoveUpToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyUp.png" ) ) );
   mMoveDownToolButton->setIcon( QIcon( QgsApplication::iconPath( "symbologyDown.png" ) ) );
+  mCountToolButton->setIcon( QIcon( QgsApplication::iconPath( "mActionSum.png" ) ) );
 
   //add widget for item properties
   QgsComposerItemWidget* itemPropertiesWidget = new QgsComposerItemWidget( this, legend );
@@ -58,7 +62,9 @@ QgsComposerLegendWidget::QgsComposerLegendWidget( QgsComposerLegend* legend ): m
   mWrapCharLineEdit->setText( legend->wrapChar() );
 
   setGuiElements();
-  connect( mItemTreeView, SIGNAL( itemChanged() ), this, SLOT( setGuiElements() ) );
+
+  connect( mItemTreeView->selectionModel(), SIGNAL( currentChanged( const QModelIndex &, const QModelIndex & ) ),
+           this, SLOT( selectedChanged( const QModelIndex &, const QModelIndex & ) ) );
 }
 
 QgsComposerLegendWidget::QgsComposerLegendWidget(): mLegend( 0 )
@@ -80,6 +86,9 @@ void QgsComposerLegendWidget::setGuiElements()
 
   blockAllSignals( true );
   mTitleLineEdit->setText( mLegend->title() );
+  mColumnCountSpinBox->setValue( mLegend->columnCount() );
+  mSplitLayerCheckBox->setChecked( mLegend->splitLayer() );
+  mEqualColumnWidthCheckBox->setChecked( mLegend->equalColumnWidth() );
   mSymbolWidthSpinBox->setValue( mLegend->symbolWidth() );
   mSymbolHeightSpinBox->setValue( mLegend->symbolHeight() );
   mGroupSpaceSpinBox->setValue( mLegend->groupSpace() );
@@ -87,6 +96,7 @@ void QgsComposerLegendWidget::setGuiElements()
   mSymbolSpaceSpinBox->setValue( mLegend->symbolSpace() );
   mIconLabelSpaceSpinBox->setValue( mLegend->iconLabelSpace() );
   mBoxSpaceSpinBox->setValue( mLegend->boxSpace() );
+  mColumnSpaceSpinBox->setValue( mLegend->columnSpace() );
   if ( mLegend->model() )
   {
     mCheckBoxAutoUpdate->setChecked( mLegend->model()->autoUpdate() );
@@ -102,7 +112,6 @@ void QgsComposerLegendWidget::setGuiElements()
   {
     mMapComboBox->setCurrentIndex( mMapComboBox->findData( -1 ) );
   }
-
   blockAllSignals( false );
 }
 
@@ -130,6 +139,44 @@ void QgsComposerLegendWidget::on_mTitleLineEdit_textChanged( const QString& text
   }
 }
 
+void QgsComposerLegendWidget::on_mColumnCountSpinBox_valueChanged( int c )
+{
+  if ( mLegend )
+  {
+    mLegend->beginCommand( tr( "Legend column count" ), QgsComposerMergeCommand::LegendColumnCount );
+    mLegend->setColumnCount( c );
+    mLegend->adjustBoxSize();
+    mLegend->update();
+    mLegend->endCommand();
+  }
+  mSplitLayerCheckBox->setEnabled( c > 1 );
+  mEqualColumnWidthCheckBox->setEnabled( c > 1 );
+}
+
+void QgsComposerLegendWidget::on_mSplitLayerCheckBox_toggled( bool checked )
+{
+  if ( mLegend )
+  {
+    mLegend->beginCommand( tr( "Legend split layers" ), QgsComposerMergeCommand::LegendSplitLayer );
+    mLegend->setSplitLayer( checked );
+    mLegend->adjustBoxSize();
+    mLegend->update();
+    mLegend->endCommand();
+  }
+}
+
+void QgsComposerLegendWidget::on_mEqualColumnWidthCheckBox_toggled( bool checked )
+{
+  if ( mLegend )
+  {
+    mLegend->beginCommand( tr( "Legend equal column width" ), QgsComposerMergeCommand::LegendEqualColumnWidth );
+    mLegend->setEqualColumnWidth( checked );
+    mLegend->adjustBoxSize();
+    mLegend->update();
+    mLegend->endCommand();
+  }
+}
+
 void QgsComposerLegendWidget::on_mSymbolWidthSpinBox_valueChanged( double d )
 {
   if ( mLegend )
@@ -290,7 +337,6 @@ void QgsComposerLegendWidget::on_mItemFontButton_clicked()
   }
 }
 
-
 void QgsComposerLegendWidget::on_mBoxSpaceSpinBox_valueChanged( double d )
 {
   if ( mLegend )
@@ -303,6 +349,18 @@ void QgsComposerLegendWidget::on_mBoxSpaceSpinBox_valueChanged( double d )
   }
 }
 
+void QgsComposerLegendWidget::on_mColumnSpaceSpinBox_valueChanged( double d )
+{
+  if ( mLegend )
+  {
+    mLegend->beginCommand( tr( "Legend box space" ), QgsComposerMergeCommand::LegendColumnSpace );
+    mLegend->setColumnSpace( d );
+    mLegend->adjustBoxSize();
+    mLegend->update();
+    mLegend->endCommand();
+  }
+}
+
 void QgsComposerLegendWidget::on_mMoveDownToolButton_clicked()
 {
   if ( !mLegend )
@@ -612,6 +670,52 @@ void QgsComposerLegendWidget::on_mUpdatePushButton_clicked()
   mLegend->endCommand();
 }
 
+void QgsComposerLegendWidget::on_mCountToolButton_clicked( bool checked )
+{
+  QgsDebugMsg( "Entered." );
+  if ( !mLegend )
+  {
+    return;
+  }
+
+  //get current item
+  QStandardItemModel* itemModel = qobject_cast( mItemTreeView->model() );
+  if ( !itemModel )
+  {
+    return;
+  }
+
+  //get current item
+  QModelIndex currentIndex = mItemTreeView->currentIndex();
+  if ( !currentIndex.isValid() )
+  {
+    return;
+  }
+
+  QStandardItem* currentItem = itemModel->itemFromIndex( currentIndex );
+  if ( !currentItem )
+  {
+    return;
+  }
+
+  QgsComposerLayerItem* layerItem = dynamic_cast( currentItem );
+
+  if ( !layerItem )
+  {
+    return;
+  }
+
+  mLegend->beginCommand( tr( "Legend updated" ) );
+  layerItem->setShowFeatureCount( checked );
+  if ( mLegend->model() )
+  {
+    mLegend->model()->updateItem( currentItem );
+  }
+  mLegend->update();
+  mLegend->adjustBoxSize();
+  mLegend->endCommand();
+}
+
 void QgsComposerLegendWidget::on_mUpdateAllPushButton_clicked()
 {
   updateLegend();
@@ -665,6 +769,9 @@ void QgsComposerLegendWidget::blockAllSignals( bool b )
   mItemTreeView->blockSignals( b );
   mCheckBoxAutoUpdate->blockSignals( b );
   mMapComboBox->blockSignals( b );
+  mColumnCountSpinBox->blockSignals( b );
+  mSplitLayerCheckBox->blockSignals( b );
+  mEqualColumnWidthCheckBox->blockSignals( b );
   mSymbolWidthSpinBox->blockSignals( b );
   mSymbolHeightSpinBox->blockSignals( b );
   mGroupSpaceSpinBox->blockSignals( b );
@@ -672,6 +779,7 @@ void QgsComposerLegendWidget::blockAllSignals( bool b )
   mSymbolSpaceSpinBox->blockSignals( b );
   mIconLabelSpaceSpinBox->blockSignals( b );
   mBoxSpaceSpinBox->blockSignals( b );
+  mColumnSpaceSpinBox->blockSignals( b );
 }
 
 void QgsComposerLegendWidget::refreshMapComboBox()
@@ -715,3 +823,27 @@ void QgsComposerLegendWidget::showEvent( QShowEvent * event )
   refreshMapComboBox();
   QWidget::showEvent( event );
 }
+
+void QgsComposerLegendWidget::selectedChanged( const QModelIndex & current, const QModelIndex & previous )
+{
+  Q_UNUSED( previous );
+  QgsDebugMsg( "Entered" );
+
+  mCountToolButton->setChecked( false );
+  mCountToolButton->setEnabled( false );
+
+  QStandardItemModel* itemModel = qobject_cast( mItemTreeView->model() );
+  if ( !itemModel ) return;
+
+  QStandardItem* currentItem = itemModel->itemFromIndex( current );
+  if ( !currentItem ) return;
+
+  QgsComposerLayerItem* layerItem = dynamic_cast( currentItem );
+  if ( !layerItem ) return;
+
+  QgsVectorLayer* vectorLayer = dynamic_cast( QgsMapLayerRegistry::instance()->mapLayer( layerItem->layerID() ) );
+  if ( !vectorLayer ) return;
+
+  mCountToolButton->setChecked( layerItem->showFeatureCount() );
+  mCountToolButton->setEnabled( true );
+}
diff --git a/src/app/composer/qgscomposerlegendwidget.h b/src/app/composer/qgscomposerlegendwidget.h
index 318213794352..4dc38b5d2b5b 100644
--- a/src/app/composer/qgscomposerlegendwidget.h
+++ b/src/app/composer/qgscomposerlegendwidget.h
@@ -41,6 +41,9 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
 
     void on_mWrapCharLineEdit_textChanged( const QString& text );
     void on_mTitleLineEdit_textChanged( const QString& text );
+    void on_mColumnCountSpinBox_valueChanged( int c );
+    void on_mSplitLayerCheckBox_toggled( bool checked );
+    void on_mEqualColumnWidthCheckBox_toggled( bool checked );
     void on_mSymbolWidthSpinBox_valueChanged( double d );
     void on_mSymbolHeightSpinBox_valueChanged( double d );
     void on_mGroupSpaceSpinBox_valueChanged( double d );
@@ -52,6 +55,7 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
     void on_mLayerFontButton_clicked();
     void on_mItemFontButton_clicked();
     void on_mBoxSpaceSpinBox_valueChanged( double d );
+    void on_mColumnSpaceSpinBox_valueChanged( double d );
     void on_mCheckBoxAutoUpdate_stateChanged( int state );
     void on_mMapComboBox_currentIndexChanged( int index );
 
@@ -61,10 +65,13 @@ class QgsComposerLegendWidget: public QWidget, private Ui::QgsComposerLegendWidg
     void on_mRemoveToolButton_clicked();
     void on_mAddToolButton_clicked();
     void on_mEditPushButton_clicked();
+    void on_mCountToolButton_clicked( bool checked );
     void on_mUpdatePushButton_clicked();
     void on_mUpdateAllPushButton_clicked();
     void on_mAddGroupButton_clicked();
 
+    void selectedChanged( const QModelIndex & current, const QModelIndex & previous );
+
   protected:
     void showEvent( QShowEvent * event );
 
diff --git a/src/app/composer/qgscomposermanager.cpp b/src/app/composer/qgscomposermanager.cpp
index bcf4045cb85f..e65279bbf6b9 100644
--- a/src/app/composer/qgscomposermanager.cpp
+++ b/src/app/composer/qgscomposermanager.cpp
@@ -172,11 +172,16 @@ void QgsComposerManager::show_clicked()
       c = it.value();
       if ( c )
       {
+        bool shown = isVisible();
         c->show();
         c->activate();
         c->stackUnder( this );
         raise();
         activateWindow();
+        if ( !shown )
+        {
+          c->on_mActionZoomAll_triggered();
+        }
       }
     }
   }
diff --git a/src/app/composer/qgscomposermapwidget.cpp b/src/app/composer/qgscomposermapwidget.cpp
index 6d5502016741..1b1c84c38d26 100644
--- a/src/app/composer/qgscomposermapwidget.cpp
+++ b/src/app/composer/qgscomposermapwidget.cpp
@@ -81,6 +81,7 @@ QgsComposerMapWidget::QgsComposerMapWidget( QgsComposerMap* composerMap ): QWidg
   }
 
   updateOverviewSymbolMarker();
+  updateLineSymbolMarker();
 
   updateGuiElements();
   blockAllSignals( false );
@@ -412,10 +413,6 @@ void QgsComposerMapWidget::updateGuiElements()
 
     mCoordinatePrecisionSpinBox->setValue( mComposerMap->gridAnnotationPrecision() );
 
-    QPen gridPen = mComposerMap->gridPen();
-    mLineWidthSpinBox->setValue( gridPen.widthF() );
-    mLineColorButton->setColor( gridPen.color() );
-
     blockAllSignals( false );
   }
 }
@@ -468,8 +465,7 @@ void QgsComposerMapWidget::blockAllSignals( bool b )
   mKeepLayerListCheckBox->blockSignals( b );
   mSetToMapCanvasExtentButton->blockSignals( b );
   mUpdatePreviewButton->blockSignals( b );
-  mLineWidthSpinBox->blockSignals( b );
-  mLineColorButton->blockSignals( b );
+  mGridLineStyleButton->blockSignals( b );
   mDrawAnnotationCheckBox->blockSignals( b );
   mAnnotationFontButton->blockSignals( b );
   mAnnotationFormatComboBox->blockSignals( b );
@@ -696,20 +692,19 @@ void QgsComposerMapWidget::on_mLineWidthSpinBox_valueChanged( double d )
   mComposerMap->endCommand();
 }
 
-void QgsComposerMapWidget::on_mLineColorButton_clicked()
+void QgsComposerMapWidget::on_mGridLineStyleButton_clicked()
 {
   if ( !mComposerMap )
   {
     return;
   }
-  QColor newColor = QColorDialog::getColor( mLineColorButton->color() );
-  if ( newColor.isValid() )
+
+  QgsSymbolV2SelectorDialog d( mComposerMap->gridLineSymbol(), QgsStyleV2::defaultStyle(), 0 );
+  if ( d.exec() == QDialog::Accepted )
   {
-    mComposerMap->beginCommand( tr( "Grid pen changed" ) );
-    mLineColorButton->setColor( newColor );
-    mComposerMap->setGridPenColor( newColor );
-    mComposerMap->endCommand();
+    updateLineSymbolMarker();
   }
+
   mComposerMap->update();
 }
 
@@ -1022,6 +1017,15 @@ void QgsComposerMapWidget::updateOverviewSymbolMarker()
   }
 }
 
+void QgsComposerMapWidget::updateLineSymbolMarker()
+{
+  if ( mComposerMap )
+  {
+    QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( mComposerMap->gridLineSymbol(), mGridLineStyleButton->iconSize() );
+    mGridLineStyleButton->setIcon( icon );
+  }
+}
+
 void QgsComposerMapWidget::refreshMapComboBox()
 {
   if ( !mComposerMap )
diff --git a/src/app/composer/qgscomposermapwidget.h b/src/app/composer/qgscomposermapwidget.h
index 52490bd7edff..20dad33703c4 100644
--- a/src/app/composer/qgscomposermapwidget.h
+++ b/src/app/composer/qgscomposermapwidget.h
@@ -58,7 +58,7 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
     void on_mOffsetXSpinBox_editingFinished();
     void on_mOffsetYSpinBox_editingFinished();
     void on_mLineWidthSpinBox_valueChanged( double d );
-    void on_mLineColorButton_clicked();
+    void on_mGridLineStyleButton_clicked();
     void on_mGridTypeComboBox_currentIndexChanged( const QString& text );
     void on_mCrossWidthSpinBox_valueChanged( double d );
     void on_mAnnotationFontButton_clicked();
@@ -116,6 +116,7 @@ class QgsComposerMapWidget: public QWidget, private Ui::QgsComposerMapWidgetBase
     void initAnnotationDirectionBox( QComboBox* c, QgsComposerMap::GridAnnotationDirection dir );
 
     void updateOverviewSymbolMarker();
+    void updateLineSymbolMarker();
 
     /**Updates the map combo box with the current composer map ids*/
     void refreshMapComboBox();
diff --git a/src/app/legend/qgsapplegendinterface.cpp b/src/app/legend/qgsapplegendinterface.cpp
index 50c4400d072c..6ef6abdd552a 100644
--- a/src/app/legend/qgsapplegendinterface.cpp
+++ b/src/app/legend/qgsapplegendinterface.cpp
@@ -166,6 +166,11 @@ bool QgsAppLegendInterface::isLayerVisible( QgsMapLayer * ml )
   return ( Qt::Checked == mLegend->layerCheckState( ml ) );
 }
 
+QList QgsAppLegendInterface::selectedLayers( bool inDrawOrder ) const
+{
+  return mLegend->selectedLayers( inDrawOrder );
+}
+
 QList< QgsMapLayer * > QgsAppLegendInterface::layers() const
 {
   return mLegend->layers();
diff --git a/src/app/legend/qgsapplegendinterface.h b/src/app/legend/qgsapplegendinterface.h
index a7b0c7652d34..00295eff7237 100644
--- a/src/app/legend/qgsapplegendinterface.h
+++ b/src/app/legend/qgsapplegendinterface.h
@@ -46,7 +46,10 @@ class QgsAppLegendInterface : public QgsLegendInterface
     //! Return the relationship between groups and layers in the legend
     QList< GroupLayerInfo > groupLayerRelationship();
 
-    //! Return all layers in the project in legend order
+    //! Returns the currently selected layers of QgsLegendLayers.
+    QList selectedLayers( bool inDrawOrder = false ) const;
+
+    //! Return all layers in the project in drawing order
     QList< QgsMapLayer * > layers() const;
 
     //! Check if a group exists
diff --git a/src/app/legend/qgslayerorder.cpp b/src/app/legend/qgslayerorder.cpp
index 83c3a540a225..f60d62277624 100644
--- a/src/app/legend/qgslayerorder.cpp
+++ b/src/app/legend/qgslayerorder.cpp
@@ -20,6 +20,8 @@
 #include "qgsmaplayer.h"
 #include "qgslogger.h"
 #include "qgslegend.h"
+#include "qgslegendgroup.h"
+#include "qgslegendlayer.h"
 #include "qgslegendlayer.h"
 #include "qgsproject.h"
 
@@ -33,10 +35,6 @@ QgsLayerOrder::QgsLayerOrder( QgsLegend *legend, QWidget * parent, const char *n
 {
   setObjectName( name );
 
-  // track visibility changed in legend
-  connect( mLegend, SIGNAL( itemChanged( QTreeWidgetItem *, int ) ),
-           this, SLOT( legendItemChanged( QTreeWidgetItem *, int ) ) );
-
   // track if legend mode changes
   connect( mLegend, SIGNAL( updateDrawingOrderChecked( bool ) ),
            this, SLOT( updateDrawingOrderChecked( bool ) ) );
@@ -85,13 +83,14 @@ void QgsLayerOrder::refreshLayerList()
 {
   clear();
 
-  foreach ( QgsLegendLayer *layer, mLegend->legendLayers() )
+  QList drawingOrderList = mLegend->drawingOrder();
+  QList::const_iterator it = drawingOrderList.constBegin();
+  for ( ; it != drawingOrderList.constEnd(); ++it )
   {
-    QListWidgetItem *item = new QListWidgetItem( layer->layer()->name() );
-    item->setData( 1, QString::number( layer->drawingOrder() ) );
-    item->setData( Qt::UserRole, qVariantFromValue( qobject_cast( layer->layer() ) ) );
-    item->setCheckState( layer->isVisible() ? Qt::Checked : Qt::Unchecked );
-    QgsDebugMsg( QString( "add item=%1 at %2" ).arg( item ? item->text() : "(null item)" ).arg( count() ) );
+    QListWidgetItem *item = new QListWidgetItem( it->name );
+    item->setCheckState( it->checked ? Qt::Checked : Qt::Unchecked );
+    item->setData( Qt::UserRole, it->id );
+    item->setData( Qt::UserRole + 1, it->embeddedGroup );
     addItem( item );
   }
 }
@@ -113,35 +112,28 @@ QListWidgetItem *QgsLayerOrder::layerItem( QgsMapLayer *layer ) const
 
 void QgsLayerOrder::itemChanged( QListWidgetItem *item )
 {
-  QgsDebugMsg( "Entering." );
-  QgsDebugMsg( QString( "item=%1" ).arg( item ? item->text() : "(null item)" ) );
-
-  QgsMapLayer *layer = qobject_cast( item->data( Qt::UserRole ).value() );
-  mLegend->setLayerVisible( layer, item->checkState() == Qt::Checked );
-
+  QString name = item->text();
+  QString id = item->data( Qt::UserRole ).toString();
+  bool embeddedGroup = item->data( Qt::UserRole + 1 ).toBool();
+  if ( embeddedGroup )
+  {
+    QgsLegendGroup* grp = mLegend->findLegendGroup( name, id );
+    if ( grp )
+    {
+      grp->setCheckState( 0, item->checkState() );
+    }
+  }
+  else
+  {
+    QgsLegendLayer* ll = mLegend->findLegendLayer( id );
+    if ( ll )
+    {
+      ll->setCheckState( 0, item->checkState() );
+    }
+  }
   updateLayerOrder();
 }
 
-void QgsLayerOrder::legendItemChanged( QTreeWidgetItem *item, int col )
-{
-  QgsDebugMsg( "Entering." );
-
-  if ( col != 0 )
-    return;
-
-  QgsDebugMsg( QString( "legendItem changed=%1" ).arg( item ? item->text( 0 ) : "(null item)" ) );
-
-  QgsLegendLayer *ll = dynamic_cast< QgsLegendLayer * >( item );
-  if ( !ll )
-    return;
-
-  QListWidgetItem *lwi = layerItem( ll->layer() );
-  if ( !lwi )
-    return;
-
-  lwi->setCheckState( item->checkState( col ) );
-}
-
 void QgsLayerOrder::mousePressEvent( QMouseEvent * e )
 {
   QgsDebugMsg( "Entering." );
@@ -261,14 +253,24 @@ void QgsLayerOrder::updateLayerOrder()
   if ( !isEnabled() )
     return;
 
-  QList layers;
+  QList drawingOrder;
 
   for ( int i = 0; i < count(); i++ )
   {
-    layers << qobject_cast( item( i )->data( Qt::UserRole ).value() );
+    QListWidgetItem* listItem = item( i );
+    if ( !listItem )
+    {
+      continue;
+    }
+    DrawingOrderInfo info;
+    info.name = listItem->text();
+    info.id = listItem->data( Qt::UserRole ).toString();
+    info.checked = listItem->checkState() == Qt::Checked;
+    info.embeddedGroup = listItem->data( Qt::UserRole + 1 ).toBool();
+    drawingOrder.push_back( info );
   }
 
-  mLegend->setDrawingOrder( layers );
+  mLegend->setDrawingOrder( drawingOrder );
 }
 
 void QgsLayerOrder::hideLine()
diff --git a/src/app/legend/qgslayerorder.h b/src/app/legend/qgslayerorder.h
index fc5cab6910c3..0f282f801796 100644
--- a/src/app/legend/qgslayerorder.h
+++ b/src/app/legend/qgslayerorder.h
@@ -48,7 +48,6 @@ class QgsLayerOrder : public QListWidget
   private slots:
     void updateDrawingOrderChecked( bool );
     void itemChanged( QListWidgetItem * );
-    void legendItemChanged( QTreeWidgetItem *, int );
     void refreshLayerList();
 
   private:
diff --git a/src/app/legend/qgslegend.cpp b/src/app/legend/qgslegend.cpp
index 3e81cca837ac..640419d94d34 100644
--- a/src/app/legend/qgslegend.cpp
+++ b/src/app/legend/qgslegend.cpp
@@ -81,13 +81,16 @@ QgsLegend::QgsLegend( QgsMapCanvas *canvas, QWidget * parent, const char *name )
     , mMapCanvas( canvas )
     , mMinimumIconSize( 20, 20 )
     , mChanging( false )
-    , mUpdateDrawingOrder( false )
+    , mUpdateDrawingOrder( true )
 {
   setObjectName( name );
 
   connect( this, SIGNAL( itemChanged( QTreeWidgetItem*, int ) ),
            this, SLOT( handleItemChange( QTreeWidgetItem*, int ) ) );
 
+  connect( itemDelegate(), SIGNAL( closeEditor( QWidget *, QAbstractItemDelegate::EndEditHint ) ),
+           this, SLOT( handleCloseEditor( QWidget *, QAbstractItemDelegate::EndEditHint ) ) );
+
   connect( this, SIGNAL( currentItemChanged( QTreeWidgetItem*, QTreeWidgetItem* ) ),
            this, SLOT( handleCurrentItemChanged( QTreeWidgetItem*, QTreeWidgetItem* ) ) );
 
@@ -676,7 +679,17 @@ void QgsLegend::mouseReleaseEvent( QMouseEvent * e )
 
 void QgsLegend::mouseDoubleClickEvent( QMouseEvent *e )
 {
+#ifdef Q_WS_MAC
+  // fix for when quick left-then-right clicks (when legend is out of focus)
+  //  register as left double click: show contextual menu as user intended
+  if ( e->button() == Qt::RightButton )
+  {
+    mousePressEvent( e );
+    return;
+  }
+#else
   Q_UNUSED( e );
+#endif
 
   QSettings settings;
   switch ( settings.value( "/qgis/legendDoubleClickAction", 0 ).toInt() )
@@ -838,6 +851,9 @@ QgsLegendGroup* QgsLegend::addEmbeddedGroup( const QString& groupName, const QSt
         group = new QgsLegendGroup( this, groupName );
       }
 
+      group->setEmbedded( true );
+      group->setProjectPath( projectFilePath );
+
       QFont groupFont;
       groupFont.setItalic( true );
       group->setFont( 0, groupFont );
@@ -1077,15 +1093,26 @@ QgsMapLayer* QgsLegend::currentLayer()
   }
 }
 
-QList QgsLegend::selectedLayers()
+QList QgsLegend::selectedLayers( bool inDrawOrder )
 {
   QList layers;
 
-  foreach ( QTreeWidgetItem * item, selectedItems() )
+  if ( inDrawOrder )
   {
-    QgsLegendLayer *ll = dynamic_cast( item );
-    if ( ll )
-      layers << ll->layer();
+    foreach ( QgsLegendLayer *ll, legendLayers() )
+    {
+      if ( ll->isSelected() )
+        layers << ll->layer();
+    }
+  }
+  else
+  {
+    foreach ( QTreeWidgetItem * item, selectedItems() )
+    {
+      QgsLegendLayer *ll = dynamic_cast( item );
+      if ( ll )
+        layers << ll->layer();
+    }
   }
 
   return layers;
@@ -1143,6 +1170,68 @@ QList QgsLegend::legendLayers()
   }
 }
 
+QList QgsLegend::drawingOrder()
+{
+  QMap drawingOrder;
+  QSet embeddedGroupChildren;
+  int nEntries = 0;
+
+  QTreeWidgetItemIterator it( this );
+  while ( *it )
+  {
+    QgsLegendLayer* llayer = dynamic_cast( *it );
+    QgsLegendGroup* lgroup = dynamic_cast( *it );
+    if ( llayer )
+    {
+      if ( !embeddedGroupChildren.contains( llayer ) )
+      {
+        DrawingOrderInfo dInfo;
+        dInfo.name = llayer->layerName();
+        dInfo.id = llayer->layer()->id();
+        dInfo.checked = ( llayer->checkState( 0 ) == Qt::Checked );
+        dInfo.embeddedGroup = false;
+        if ( mUpdateDrawingOrder )
+        {
+          drawingOrder.insertMulti( nEntries, dInfo );
+        }
+        else
+        {
+          drawingOrder.insertMulti( llayer->drawingOrder(), dInfo );
+        }
+        ++nEntries;
+      }
+    }
+    else if ( lgroup )
+    {
+      if ( lgroup->isEmbedded() && !( lgroup->parent() ) )
+      {
+        QList groupLayers = lgroup->legendLayers();
+        QList::const_iterator groupLayerIt = groupLayers.constBegin();
+        for ( ; groupLayerIt != groupLayers.constEnd(); ++groupLayerIt )
+        {
+          embeddedGroupChildren.insert( *groupLayerIt );
+        }
+        DrawingOrderInfo dInfo;
+        dInfo.name = lgroup->text( 0 );
+        dInfo.id = lgroup->projectPath();
+        dInfo.checked = ( lgroup->checkState( 0 ) != Qt::Unchecked );
+        dInfo.embeddedGroup = true;
+        if ( mUpdateDrawingOrder )
+        {
+          drawingOrder.insertMulti( nEntries, dInfo );
+        }
+        else
+        {
+          drawingOrder.insertMulti( lgroup->drawingOrder(), dInfo );
+        }
+        ++nEntries;
+      }
+    }
+    ++it;
+  }
+  return drawingOrder.values();
+}
+
 QList QgsLegend::layers()
 {
   QList ls;
@@ -1157,14 +1246,58 @@ QList QgsLegend::layers()
 
 QList QgsLegend::canvasLayers()
 {
-  QList ls;
+  QMap layers;
+  QSet embeddedGroupChildren;
+  int nEntries = 0;
 
-  foreach ( QgsLegendLayer *l, legendLayers() )
+  QTreeWidgetItemIterator it( this );
+  while ( *it )
   {
-    ls << l->canvasLayer();
+    QgsLegendLayer* llayer = dynamic_cast( *it );
+    QgsLegendGroup* lgroup = dynamic_cast( *it );
+    if ( llayer && !embeddedGroupChildren.contains( llayer ) )
+    {
+      QgsMapCanvasLayer canvasLayer = llayer->canvasLayer();
+      if ( mUpdateDrawingOrder )
+      {
+        layers.insertMulti( nEntries + embeddedGroupChildren.size(), canvasLayer );
+      }
+      else
+      {
+        layers.insertMulti( llayer->drawingOrder(), canvasLayer );
+      }
+    }
+    else if ( lgroup )
+    {
+      if ( lgroup->isEmbedded() )
+      {
+        int groupDrawingOrder = lgroup->drawingOrder();
+        QList groupLayers = lgroup->legendLayers();
+        for ( int i = groupLayers.size() - 1; i >= 0; --i )
+        {
+          QgsLegendLayer* ll = groupLayers.at( i );
+          if ( !ll || embeddedGroupChildren.contains( ll ) )
+          {
+            continue;
+          }
+
+          if ( mUpdateDrawingOrder )
+          {
+            layers.insertMulti( nEntries, ll->canvasLayer() );
+          }
+          else
+          {
+            layers.insertMulti( groupDrawingOrder,  ll->canvasLayer() );
+          }
+          embeddedGroupChildren.insert( ll );
+        }
+      }
+    }
+    ++it;
+    ++nEntries;
   }
 
-  return ls;
+  return layers.values();
 }
 
 void QgsLegend::setDrawingOrder( QList layers )
@@ -1183,6 +1316,44 @@ void QgsLegend::setDrawingOrder( QList layers )
   updateMapCanvasLayerSet();
 }
 
+void QgsLegend::setDrawingOrder( const QList& order )
+{
+  QList layers;
+
+  QList::const_iterator orderIt = order.constBegin();
+  int i = 0;
+  for ( ; orderIt != order.constEnd(); ++orderIt )
+  {
+    if ( orderIt->embeddedGroup )
+    {
+      //find group
+      QgsLegendGroup* group = findLegendGroup( orderIt->name, orderIt->id );
+      if ( group )
+      {
+        group->setDrawingOrder( i );
+        QList groupLayers = group->legendLayers();
+        QList::iterator groupIt = groupLayers.begin();
+        for ( ; groupIt != groupLayers.end(); ++groupIt )
+        {
+          layers.push_back(( *groupIt )->canvasLayer() );
+        }
+        ++i;
+      }
+    }
+    else
+    {
+      QgsLegendLayer *ll = findLegendLayer( orderIt->id );
+      if ( ll )
+      {
+        ll->setDrawingOrder( i );
+        layers.push_back( ll->canvasLayer() );
+        ++i;
+      }
+    }
+  }
+  mMapCanvas->setLayerSet( layers );
+}
+
 bool QgsLegend::setCurrentLayer( QgsMapLayer *layer )
 {
   QgsLegendLayer *ll = findLegendLayer( layer );
@@ -1402,6 +1573,11 @@ bool QgsLegend::writeXML( QList items, QDomNode &node, QDomDo
       {
         legendgroupnode.setAttribute( "embedded", 1 );
         legendgroupnode.setAttribute( "project", QgsProject::instance()->writePath( embedIt.value() ) );
+        QgsLegendGroup* group = dynamic_cast( item );
+        if ( group )
+        {
+          legendgroupnode.setAttribute( "drawingOrder", group->drawingOrder() );
+        }
       }
       else
       {
@@ -1528,6 +1704,10 @@ bool QgsLegend::readXML( QgsLegendGroup *parent, const QDomNode &node )
       if ( childelem.attribute( "embedded" ) == "1" )
       {
         theGroup = addEmbeddedGroup( name, QgsProject::instance()->readPath( childelem.attribute( "project" ) ) );
+        if ( childelem.hasAttribute( "drawingOrder" ) )
+        {
+          theGroup->setDrawingOrder( childelem.attribute( "drawingOrder" ).toInt() );
+        }
         updateGroupCheckStates( theGroup );
       }
       else
@@ -1739,6 +1919,23 @@ QgsLegendLayer* QgsLegend::findLegendLayer( const QgsMapLayer *layer )
   return 0;
 }
 
+QgsLegendGroup* QgsLegend::findLegendGroup( const QString& name, const QString& projectPath )
+{
+  QgsLegendGroup* group = 0;
+  for ( QTreeWidgetItem* theItem = firstItem(); theItem; theItem = nextItem( theItem ) )
+  {
+    group = dynamic_cast( theItem );
+    if ( group )
+    {
+      if ( group->text( 0 ) == name && group->projectPath() == projectPath )
+      {
+        return group;
+      }
+    }
+  }
+  return 0;
+}
+
 
 void QgsLegend::adjustIconSize()
 {
@@ -2104,6 +2301,24 @@ void QgsLegend::refreshLayerSymbology( QString key, bool expandItem )
   setItemExpanded( theLegendLayer, expandItem );//make sure the symbology items are visible
 }
 
+void QgsLegend::refreshLayerSymbology( QString key, QgsLegendItem::Expansion expandItem )
+{
+  bool expand = true;
+  if ( expandItem == QgsLegendItem::DontChange )
+  {
+    QgsLegendLayer* theLegendLayer = findLegendLayer( key );
+    if ( !theLegendLayer )
+    {
+      return;
+    }
+    expand = theLegendLayer->isExpanded();
+  }
+  else if ( expandItem == QgsLegendItem::Collapse )
+  {
+    expand = false;
+  }
+  return refreshLayerSymbology( key, expand );
+}
 
 void QgsLegend::addPixmapWidthValue( int width )
 {
@@ -2135,6 +2350,16 @@ void QgsLegend::removePixmapHeightValue( int height )
   //todo: adapt the icon size if height is the largest value and the size of the next element is higher than the minimum
 }
 
+void QgsLegend::handleCloseEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint )
+{
+  Q_UNUSED( editor );
+  Q_UNUSED( hint );
+  QgsLegendItem *item = dynamic_cast( currentItem() );
+  if ( item )
+  {
+    item->afterEdit();
+  }
+}
 
 void QgsLegend::handleItemChange( QTreeWidgetItem* item, int column )
 {
@@ -2167,8 +2392,10 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int column )
   if ( ll )
   {
     //if the text of a QgsLegendLayer has changed, change the display names of all its maplayers
-    // TODO: is this still necessary?
-    ll->layer()->setLayerName( ll->text( 0 ) );
+    if ( ll->layerName() != ll->layer()->name() )
+    {
+      ll->layer()->setLayerName( ll->layerName() );
+    }
   }
 
   bool changing = mChanging;
@@ -2239,11 +2466,12 @@ void QgsLegend::handleItemChange( QTreeWidgetItem* item, int column )
 
 void QgsLegend::openEditor()
 {
-  QTreeWidgetItem* theItem = currentItem();
+  QgsLegendItem* theItem = dynamic_cast( currentItem() );
   if ( theItem )
   {
     if ( !groupEmbedded( theItem ) && !parentGroupEmbedded( theItem ) )
     {
+      theItem->beforeEdit();
       editItem( theItem, 0 );
     }
   }
diff --git a/src/app/legend/qgslegend.h b/src/app/legend/qgslegend.h
index d7891f940e63..e7dd980672d3 100644
--- a/src/app/legend/qgslegend.h
+++ b/src/app/legend/qgslegend.h
@@ -23,9 +23,10 @@
 #include 
 #include 
 
+#include "qgslegenditem.h"
+
 class QgsLegendGroup;
 class QgsLegendLayer;
-class QgsLegendItem;
 class QgsMapLayer;
 class QgsMapCanvas;
 class QDomDocument;
@@ -41,6 +42,14 @@ class QgsMapCanvasLayer;
 //value: containter with layer ids contained in the group
 typedef QPair< QString, QList > GroupLayerInfo;
 
+struct DrawingOrderInfo
+{
+  QString name;
+  QString id;
+  bool checked;
+  bool embeddedGroup;
+};
+
 /**
    \class QgsLegend
    \brief A Legend treeview for QGIS
@@ -108,9 +117,10 @@ class QgsLegend : public QTreeWidget
     Else, 0 is returned.*/
     QgsMapLayer* currentLayer();
 
-    /*!Returns the currently selected layer QgsLegendLayers.
-    Else, an empty list is returned.*/
-    QList selectedLayers();
+    /** Returns the currently selected layers of QgsLegendLayers.
+      * @param inDrawOrder return layers in drawing order (added in 1.9)
+      * @returns list of layers, else an empty list */
+    QList selectedLayers( bool inDrawOrder = false );
 
     /*!Returns all layers loaded in QgsMapCanvas in drawing order
     Else, an empty list is returned.*/
@@ -119,8 +129,15 @@ class QgsLegend : public QTreeWidget
     //!Return all layers in drawing order
     QList legendLayers();
 
+    //!Return info about layers and embedded groups in drawing order
+    QList drawingOrder();
+
+    QStringList drawingOrderLayers();
+
     void setDrawingOrder( QList );
 
+    void setDrawingOrder( const QList& order );
+
     /*!set the current layer
     returns true if the layer exists, false otherwise*/
     bool setCurrentLayer( QgsMapLayer *layer );
@@ -205,8 +222,16 @@ class QgsLegend : public QTreeWidget
     /** return canvas */
     QgsMapCanvas *canvas() { return mMapCanvas; }
 
-  public slots:
+    /**Returns the legend layer to which a map layer belongs to*/
+    QgsLegendLayer* findLegendLayer( const QString& layerKey );
 
+    /**Returns the legend layer to which a map layer belongs to*/
+    QgsLegendLayer* findLegendLayer( const QgsMapLayer *layer );
+
+    /**Returns legend group by group name and project path (empty for not-embedded groups)*/
+    QgsLegendGroup* findLegendGroup( const QString& name, const QString& projectPath = QString() );
+
+  public slots:
 
     /*!Adds a new layer group with the maplayers to the canvas*/
     void addLayers( QList );
@@ -220,6 +245,7 @@ class QgsLegend : public QTreeWidget
 
     /**Updates symbology items for a layer*/
     void refreshLayerSymbology( QString key, bool expandItem = true );
+    void refreshLayerSymbology( QString key, QgsLegendItem::Expansion expandItem );
 
     /*!
       * Slot called to clear the tree of all items
@@ -370,12 +396,6 @@ class QgsLegend : public QTreeWidget
     void mouseReleaseEvent( QMouseEvent * e );
     void mouseDoubleClickEvent( QMouseEvent* e );
 
-    /**Returns the legend layer to which a map layer belongs to*/
-    QgsLegendLayer* findLegendLayer( const QString& layerKey );
-
-    /**Returns the legend layer to which a map layer belongs to*/
-    QgsLegendLayer* findLegendLayer( const QgsMapLayer *layer );
-
     /**Checks mPixmapWidthValues and mPixmapHeightValues and sets a new icon size if necessary*/
     void adjustIconSize();
 
@@ -441,6 +461,7 @@ class QgsLegend : public QTreeWidget
     /** toogle update drawing order */
     void toggleDrawingOrderUpdate();
     void handleItemChange( QTreeWidgetItem* item, int row );
+    void handleCloseEditor( QWidget * editor, QAbstractItemDelegate::EndEditHint hint );
     /** delegates current layer to map canvas */
     void handleCurrentItemChanged( QTreeWidgetItem* current, QTreeWidgetItem* previous );
     /**Calls openPersistentEditor for the current item*/
diff --git a/src/app/legend/qgslegendgroup.cpp b/src/app/legend/qgslegendgroup.cpp
index 43aaafcd17fc..84212e63ecb7 100644
--- a/src/app/legend/qgslegendgroup.cpp
+++ b/src/app/legend/qgslegendgroup.cpp
@@ -27,6 +27,8 @@ QgsLegendGroup::QgsLegendGroup( QTreeWidgetItem * theItem, QString theName )
   setCheckState( 0, Qt::Checked );
   QIcon myIcon = QgsApplication::getThemeIcon( "/mActionFolder.png" );
   setIcon( 0, myIcon );
+  mEmbedded = false;
+  mDrawingOrder = -1;
 }
 QgsLegendGroup::QgsLegendGroup( QTreeWidget* theListView, QString theString )
     : QgsLegendItem( theListView, theString )
@@ -36,6 +38,8 @@ QgsLegendGroup::QgsLegendGroup( QTreeWidget* theListView, QString theString )
   setCheckState( 0, Qt::Checked );
   QIcon myIcon = QgsApplication::getThemeIcon( "/mActionFolder.png" );
   setIcon( 0, myIcon );
+  mEmbedded = false;
+  mDrawingOrder = -1;
 }
 
 QgsLegendGroup::QgsLegendGroup( QString name ): QgsLegendItem()
@@ -46,6 +50,8 @@ QgsLegendGroup::QgsLegendGroup( QString name ): QgsLegendItem()
   QIcon myIcon = QgsApplication::getThemeIcon( + "/mActionFolder.png" );
   setText( 0, name );
   setIcon( 0, myIcon );
+  mEmbedded = false;
+  mDrawingOrder = -1;
 }
 
 QgsLegendGroup::~QgsLegendGroup()
diff --git a/src/app/legend/qgslegendgroup.h b/src/app/legend/qgslegendgroup.h
index 939e54a0a168..dc34a718bb2f 100644
--- a/src/app/legend/qgslegendgroup.h
+++ b/src/app/legend/qgslegendgroup.h
@@ -37,6 +37,22 @@ class QgsLegendGroup : public QgsLegendItem
     QList legendLayers( bool recurse = true );
 
     Qt::CheckState pendingCheckState();
+
+    bool isEmbedded() const { return mEmbedded; }
+    void setEmbedded( bool b ) { mEmbedded = b; }
+
+    QString projectPath() const { return mProjectPath; }
+    void setProjectPath( const QString& path ) { mProjectPath = path; }
+
+    int drawingOrder() const { return mDrawingOrder; }
+    void setDrawingOrder( int i ) { mDrawingOrder = i; }
+
+  private:
+    bool mEmbedded;
+    /**Path to project from which the group is embedded. Empty for not-embedded groups*/
+    QString mProjectPath;
+    int mDrawingOrder;
+
 };
 
 #endif
diff --git a/src/app/legend/qgslegenditem.h b/src/app/legend/qgslegenditem.h
index 60785d7793a9..f87aad88d910 100644
--- a/src/app/legend/qgslegenditem.h
+++ b/src/app/legend/qgslegenditem.h
@@ -57,6 +57,13 @@ class QgsLegendItem : public QTreeWidgetItem, public QObject
       NO_ACTION //do nothing
     };
 
+    enum Expansion
+    {
+      Expand,
+      Collapse,
+      DontChange   // keep current state
+    };
+
     virtual LEGEND_ITEM_TYPE type() const { return mType; }
 
     /**Subclasses which allow insertion of other items may implement this method.
@@ -99,6 +106,10 @@ class QgsLegendItem : public QTreeWidgetItem, public QObject
     virtual void receive( QgsLegendItem *newChild ) { Q_UNUSED( newChild ); }
     /**Do cleanups after a child item leaves (default empty)*/
     virtual void release( QgsLegendItem *formerChild ) { Q_UNUSED( formerChild ); }
+    /**Called before edit*/
+    virtual void beforeEdit() {}
+    /**Called after edit*/
+    virtual void afterEdit() {}
 
   protected:
     LEGEND_ITEM_TYPE mType;
diff --git a/src/app/legend/qgslegendlayer.cpp b/src/app/legend/qgslegendlayer.cpp
index 9b223af93d7b..52f82fd6c7e7 100644
--- a/src/app/legend/qgslegendlayer.cpp
+++ b/src/app/legend/qgslegendlayer.cpp
@@ -66,7 +66,7 @@ QgsLegendLayer::QgsLegendLayer( QgsMapLayer* layer )
 
   setCheckState( 0, Qt::Checked );
 
-  setText( 0, layer->name() );
+  layerNameChanged();
   setupFont();
 
   // Set the initial visibility flag for layers
@@ -296,6 +296,7 @@ void QgsLegendLayer::vectorLayerSymbologyV2( QgsVectorLayer* layer )
     }
 
     changeSymbologySettings( layer, itemList );
+    layerNameChanged(); // update total count
   }
 }
 
@@ -334,7 +335,16 @@ void QgsLegendLayer::updateIcon()
   //editable
   if ( theLayer->isEditable() )
   {
-    QPixmap myPixmap = QgsApplication::getThemePixmap( "/mIconEditable.png" );
+    QPixmap myPixmap;
+    QgsVectorLayer* vlayer = qobject_cast( theLayer );
+    if ( vlayer->isModified() )
+    {
+      myPixmap = QgsApplication::getThemePixmap( "/mIconEditableEdits.png" );
+    }
+    else
+    {
+      myPixmap = QgsApplication::getThemePixmap( "/mIconEditable.png" );
+    }
     // use editable icon instead of the layer's type icon
     newIcon = myPixmap;
 
@@ -430,6 +440,9 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
   // remove from canvas
   theMenu.addAction( QgsApplication::getThemeIcon( "/mActionRemoveLayer.png" ), tr( "&Remove" ), QgisApp::instance(), SLOT( removeLayer() ) );
 
+  // duplicate layer
+  QAction* duplicateLayersAction = theMenu.addAction( QgsApplication::getThemeIcon( "/mActionAddMap.png" ), tr( "&Duplicate" ), QgisApp::instance(), SLOT( duplicateLayers() ) );
+
   // set layer crs
   theMenu.addAction( QgsApplication::getThemeIcon( "/mActionSetCRS.png" ), tr( "&Set Layer CRS" ), QgisApp::instance(), SLOT( setLayerCRS() ) );
 
@@ -457,6 +470,12 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
       }
     }
 
+    // disable duplication of memory layers
+    if ( vlayer->storageType() == "Memory storage" && legend()->selectedLayers().count() == 1 )
+    {
+      duplicateLayersAction->setEnabled( false );
+    }
+
     // save as vector file
     theMenu.addAction( tr( "Save As..." ), QgisApp::instance(), SLOT( saveAsFile() ) );
 
@@ -482,6 +501,11 @@ void QgsLegendLayer::addToPopupMenu( QMenu& theMenu )
   {
     theMenu.addAction( tr( "Save As..." ), QgisApp::instance(), SLOT( saveAsRasterFile() ) );
   }
+  else if ( lyr->type() == QgsMapLayer::PluginLayer && legend()->selectedLayers().count() == 1 )
+  {
+    // disable duplication of plugin layers
+    duplicateLayersAction->setEnabled( false );
+  }
 
   // properties goes on bottom of menu for consistency with normal ui standards
   // e.g. kde stuff
@@ -542,10 +566,42 @@ QgsMapCanvasLayer& QgsLegendLayer::canvasLayer()
   return mLyr;
 }
 
-void QgsLegendLayer::layerNameChanged()
+QString QgsLegendLayer::label()
 {
   QString name = mLyr.layer()->name();
-  setText( 0, name );
+  QgsVectorLayer *vlayer = dynamic_cast( mLyr.layer() );
+  if ( mShowFeatureCount && vlayer && vlayer->featureCount() >= 0 )
+  {
+    name += QString( " [%1]" ).arg( vlayer->featureCount() );
+  }
+  return name;
+}
+
+void QgsLegendLayer::layerNameChanged()
+{
+  setText( 0, label() );
+}
+
+void QgsLegendLayer::beforeEdit()
+{
+  // Reset to layer name without possible feature count
+  setText( 0, mLyr.layer()->name() );
+}
+
+void QgsLegendLayer::afterEdit()
+{
+  // Reset label with possible feature count, important if text was not changed
+  layerNameChanged();
+}
+
+QString QgsLegendLayer::layerName()
+{
+  // The text could be edited (Rename), in that case we have to return the new name
+  if ( text( 0 ) != label() && text( 0 ) != mLyr.layer()->name() )
+  {
+    return text( 0 );
+  }
+  return mLyr.layer()->name();
 }
 
 void QgsLegendLayer::updateAfterLayerModification()
@@ -554,8 +610,12 @@ void QgsLegendLayer::updateAfterLayerModification()
 }
 void QgsLegendLayer::updateAfterLayerModification( bool onlyGeomChanged )
 {
+  QgisApp::instance()->actionSaveAllEdits()->setEnabled(
+    QgisApp::instance()->unsavedEditableLayers().count() > 0 );
+
   if ( onlyGeomChanged )
   {
+    updateIcon();
     return;
   }
 
@@ -566,6 +626,7 @@ void QgsLegendLayer::updateAfterLayerModification( bool onlyGeomChanged )
     widthScale = canvas->map()->paintDevice().logicalDpiX() / 25.4;
   }
   refreshSymbology( mLyr.layer()->id(), widthScale );
+  layerNameChanged();
 }
 
 void QgsLegendLayer::updateItemListCountV2( SymbologyList& itemList, QgsVectorLayer* layer )
@@ -580,48 +641,13 @@ void QgsLegendLayer::updateItemListCountV2( SymbologyList& itemList, QgsVectorLa
   {
     return;
   }
-  QgsRenderContext dummyContext;
-  renderer->startRender( dummyContext, layer );
-
-  //create map holding the symbol count
-  QMap< QgsSymbolV2*, int > mSymbolCountMap;
-  QgsLegendSymbolList symbolList = renderer->legendSymbolItems();
-  QgsLegendSymbolList::const_iterator symbolIt = symbolList.constBegin();
-  for ( ; symbolIt != symbolList.constEnd(); ++symbolIt )
-  {
-    mSymbolCountMap.insert( symbolIt->second, 0 );
-  }
-
-  //go through all features and count the number of occurrences
-  int nFeatures = layer->pendingFeatureCount();
-  QProgressDialog p( tr( "Updating feature count for layer %1" ).arg( layer->name() ), tr( "Abort" ), 0, nFeatures );
-  p.setWindowModality( Qt::WindowModal );
-  int featuresCounted = 0;
-
-
-  layer->select( layer->pendingAllAttributesList(), QgsRectangle(), false, false );
-  QgsFeature f;
-  QgsSymbolV2* currentSymbol = 0;
 
-  while ( layer->nextFeature( f ) )
+  // Count features
+  if ( !layer->countSymbolFeatures() )
   {
-    currentSymbol = renderer->symbolForFeature( f );
-    mSymbolCountMap[currentSymbol] += 1;
-    ++featuresCounted;
-    if ( featuresCounted % 50 == 0 )
-    {
-      if ( featuresCounted > nFeatures ) //sometimes the feature count is not correct
-      {
-        p.setMaximum( 0 );
-      }
-      p.setValue( featuresCounted );
-      if ( p.wasCanceled() )
-      {
-        return;
-      }
-    }
+    QgsDebugMsg( "Cannot get feature counts" );
+    return;
   }
-  p.setValue( nFeatures );
 
   QMap itemMap;
   SymbologyList::const_iterator symbologyIt = itemList.constBegin();
@@ -629,13 +655,15 @@ void QgsLegendLayer::updateItemListCountV2( SymbologyList& itemList, QgsVectorLa
   {
     itemMap.insert( symbologyIt->first, symbologyIt->second );
   }
+
   itemList.clear();
 
-  //
+  QgsLegendSymbolList symbolList = renderer->legendSymbolItems();
+  QgsLegendSymbolList::const_iterator symbolIt = symbolList.constBegin();
   symbolIt = symbolList.constBegin();
   for ( ; symbolIt != symbolList.constEnd(); ++symbolIt )
   {
-    itemList.push_back( qMakePair( symbolIt->first + " [" + QString::number( mSymbolCountMap[symbolIt->second] ) + "]", itemMap[symbolIt->first] ) );
+    itemList.push_back( qMakePair( symbolIt->first + " [" + QString::number( layer->featureCount( symbolIt->second ) ) + "]", itemMap[symbolIt->first] ) );
   }
 }
 
diff --git a/src/app/legend/qgslegendlayer.h b/src/app/legend/qgslegendlayer.h
index 6628e082bd0b..97923acb1b9c 100644
--- a/src/app/legend/qgslegendlayer.h
+++ b/src/app/legend/qgslegendlayer.h
@@ -75,6 +75,15 @@ class QgsLegendLayer : public QgsLegendItem
     void setDrawingOrder( int order );
     int drawingOrder() const { return mDrawingOrder; }
 
+    /** Get layer name currently set in legend */
+    QString layerName();
+
+    /**Called before edit*/
+    void beforeEdit();
+
+    /**Called after edit*/
+    void afterEdit();
+
   public slots:
 
     /**Toggle show in overview*/
@@ -120,6 +129,9 @@ class QgsLegendLayer : public QgsLegendItem
      */
     void setupFont();
 
+    /** Label, may be layer name or layer name + [feature count] */
+    QString label();
+
   protected:
 
     /** layer identified by its layer id */
diff --git a/src/app/main.cpp b/src/app/main.cpp
index 301543b36dc0..17d77cd94042 100644
--- a/src/app/main.cpp
+++ b/src/app/main.cpp
@@ -35,6 +35,7 @@
 #include "qgscustomization.h"
 #include "qgspluginregistry.h"
 #include "qgsmessagelog.h"
+#include "qgspythonrunner.h"
 
 #include 
 #include 
@@ -104,8 +105,10 @@ void usage( std::string const & appName )
             << "\t[--nologo]\thide splash screen\n"
             << "\t[--noplugins]\tdon't restore plugins on startup\n"
             << "\t[--nocustomization]\tdon't apply GUI customization\n"
+            << "\t[--customizationfile]\tuse the given ini file as GUI customization\n"
             << "\t[--optionspath path]\tuse the given QSettings path\n"
             << "\t[--configpath path]\tuse the given path for all user configuration\n"
+            << "\t[--code path]\tRun the given python file on load. \n"
             << "\t[--help]\t\tthis text\n\n"
             << "  FILES:\n"
             << "    Files specified on the command line can include rasters,\n"
@@ -266,6 +269,10 @@ int main( int argc, char *argv[] )
   QString configpath;
   QString optionpath;
 
+  QString pythonfile;
+
+  QString customizationfile;
+
 #if defined(ANDROID)
   QgsDebugMsg( QString( "Android: All params stripped" ) );// Param %1" ).arg( argv[0] ) );
   //put all QGIS settings in the same place
@@ -325,6 +332,14 @@ int main( int argc, char *argv[] )
     {
       configpath = argv[++i];
     }
+    else if ( i + 1 < argc && ( arg == "--code" || arg == "-f" ) )
+    {
+      pythonfile = argv[++i];
+    }
+    else if ( i + 1 < argc && ( arg == "--customizationfile" || arg == "-z" ) )
+    {
+      customizationfile = argv[++i];
+    }
     else
     {
       myFileList.append( QDir::convertSeparators( QFileInfo( QFile::decodeName( argv[i] ) ).absoluteFilePath() ) );
@@ -358,6 +373,8 @@ int main( int argc, char *argv[] )
         {"extent",   required_argument, 0, 'e'},
         {"optionspath", required_argument, 0, 'o'},
         {"configpath", required_argument, 0, 'c'},
+        {"customizationfile", required_argument, 0, 'z'},
+        {"code", required_argument, 0, 'f'},
         {"android", required_argument, 0, 'a'},
         {0, 0, 0, 0}
       };
@@ -428,6 +445,14 @@ int main( int argc, char *argv[] )
           configpath = optarg;
           break;
 
+        case 'f':
+          pythonfile = optarg;
+          break;
+
+        case 'z':
+          customizationfile = optarg;
+          break;
+
         case '?':
           usage( argv[0] );
           return 2;   // XXX need standard exit codes
@@ -487,8 +512,12 @@ int main( int argc, char *argv[] )
     QSettings::setPath( QSettings::IniFormat, QSettings::UserScope, optionpath.isEmpty() ? configpath : optionpath );
   }
 
-  // GUI customization is enabled by default unless --nocustomization argument is used
-  QgsCustomization::instance()->setEnabled( myCustomization );
+  // GUI customization is enabled according to settings (loaded when instance is created)
+  // we force disabled here if --nocustomization argument is used
+  if ( !myCustomization )
+  {
+    QgsCustomization::instance()->setEnabled( false );
+  }
 
   QgsApplication myApp( argc, argv, myUseGuiFlag, configpath );
 
@@ -518,6 +547,12 @@ int main( int argc, char *argv[] )
     customizationsettings = new QSettings( "QuantumGIS", "QGISCUSTOMIZATION" );
   }
 
+  // Using the customizationfile option always overrides the option and config path options.
+  if ( !customizationfile.isEmpty() )
+  {
+    customizationsettings = new QSettings( customizationfile, QSettings::IniFormat );
+  }
+
   // Load and set possible default customization, must be done afterQgsApplication init and QSettings ( QCoreApplication ) init
   QgsCustomization::instance()->setSettings( customizationsettings );
   QgsCustomization::instance()->loadDefault();
@@ -649,8 +684,12 @@ int main( int argc, char *argv[] )
     QStringList myPathList;
     QCoreApplication::setLibraryPaths( myPathList );
     // Now set the paths inside the bundle
-    myPath += "/Contents/plugins";
+    myPath += "/Contents/Plugins";
     QCoreApplication::addLibraryPath( myPath );
+    if ( QgsApplication::isRunningFromBuildDir() )
+    {
+      QCoreApplication::addLibraryPath( QTPLUGINSDIR );
+    }
     //next two lines should not be needed, testing only
     //QCoreApplication::addLibraryPath( myPath + "/imageformats" );
     //QCoreApplication::addLibraryPath( myPath + "/sqldrivers" );
@@ -769,7 +808,16 @@ int main( int argc, char *argv[] )
     }
   }
 
-  /////////////////////////////////////////////////////////////////////
+  if ( !pythonfile.isEmpty() )
+  {
+#ifdef Q_WS_WIN
+    //replace backslashes with forward slashes
+    pythonfile.replace( "\\", "/" );
+#endif
+    QgsPythonRunner::run( QString( "execfile('%1')" ).arg( pythonfile ) );
+  }
+
+  /////////////////////////////////`////////////////////////////////////
   // Take a snapshot of the map view then exit if snapshot mode requested
   /////////////////////////////////////////////////////////////////////
   if ( mySnapshotFileName != "" )
@@ -797,7 +845,6 @@ int main( int argc, char *argv[] )
     return 1;
   }
 
-
   /////////////////////////////////////////////////////////////////////
   // Continue on to interactive gui...
   /////////////////////////////////////////////////////////////////////
diff --git a/src/app/nodetool/qgsmaptoolnodetool.cpp b/src/app/nodetool/qgsmaptoolnodetool.cpp
index 5c47c26d1207..368555892f0e 100644
--- a/src/app/nodetool/qgsmaptoolnodetool.cpp
+++ b/src/app/nodetool/qgsmaptoolnodetool.cpp
@@ -78,7 +78,7 @@ void QgsMapToolNodeTool::createMovingRubberBands()
       }
       // we have first vertex of moving part
       // create rubberband and set default paramaters
-      QgsRubberBand* rb = new QgsRubberBand( mCanvas, false );
+      QgsRubberBand* rb = new QgsRubberBand( mCanvas, QGis::Line );
       rb->setWidth( 2 );
       rb->setColor( Qt::blue );
       int index = 0;
@@ -137,7 +137,7 @@ void QgsMapToolNodeTool::createTopologyRubberBands( QgsVectorLayer* vlayer, cons
           continue;
         }
       }
-      QgsRubberBand* trb = new QgsRubberBand( mCanvas, false );
+      QgsRubberBand* trb = new QgsRubberBand( mCanvas, QGis::Line );
       mTopologyRubberBand.append( trb );
       int rbId = mTopologyRubberBand.size() - 1;
       trb->setWidth( 1 );
@@ -701,7 +701,7 @@ void QgsMapToolNodeTool::keyReleaseEvent( QKeyEvent* e )
 QgsRubberBand* QgsMapToolNodeTool::createRubberBandMarker( QgsPoint center, QgsVectorLayer* vlayer )
 {
   // create rubberband marker for moving points
-  QgsRubberBand* marker = new QgsRubberBand( mCanvas, true );
+  QgsRubberBand* marker = new QgsRubberBand( mCanvas, QGis::Polygon );
   marker->setColor( Qt::red );
   marker->setWidth( 2 );
   double movement = 4;
diff --git a/src/app/ogr/qgsvectorlayersaveasdialog.cpp b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
index b1e4873a3db4..8d2b48e928d7 100644
--- a/src/app/ogr/qgsvectorlayersaveasdialog.cpp
+++ b/src/app/ogr/qgsvectorlayersaveasdialog.cpp
@@ -38,10 +38,6 @@ QgsVectorLayerSaveAsDialog::QgsVectorLayerSaveAsDialog( long srsid, QWidget* par
   for ( QMap< QString, QString>::const_iterator it = map.constBegin(); it != map.constEnd(); ++it )
   {
     mFormatComboBox->addItem( it.key(), it.value() );
-    if ( it.key() == "SQLite" )
-    {
-      mFormatComboBox->addItem( "SpatiaLite", tr( "SpatiaLite" ) );
-    }
   }
 
   QString format = settings.value( "/UI/lastVectorFormat", "ESRI Shapefile" ).toString();
diff --git a/src/app/qgisapp.cpp b/src/app/qgisapp.cpp
index 04ee0b691935..62d79dacbaea 100644
--- a/src/app/qgisapp.cpp
+++ b/src/app/qgisapp.cpp
@@ -120,6 +120,8 @@
 #include "qgsdecorationscalebar.h"
 #include "qgsdecorationgrid.h"
 #include "qgsencodingfiledialog.h"
+#include "qgserror.h"
+#include "qgserrordialog.h"
 #include "qgsexception.h"
 #include "qgsfeature.h"
 #include "qgsformannotationitem.h"
@@ -175,6 +177,7 @@
 #include "qgssinglebandgrayrenderer.h"
 #include "qgssnappingdialog.h"
 #include "qgssponsors.h"
+#include "qgssvgannotationitem.h"
 #include "qgstextannotationitem.h"
 #include "qgstipgui.h"
 #include "qgsundowidget.h"
@@ -231,6 +234,7 @@
 #include "qgsmaptoolselectfreehand.h"
 #include "qgsmaptoolselectpolygon.h"
 #include "qgsmaptoolselectradius.h"
+#include "qgsmaptoolsvgannotation.h"
 #include "qgsmaptoolreshape.h"
 #include "qgsmaptoolrotatepointsymbols.h"
 #include "qgsmaptoolsplitfeatures.h"
@@ -508,22 +512,9 @@ QgisApp::QgisApp( QSplashScreen *splash, bool restorePlugins, QWidget * parent,
   readSettings();
   updateRecentProjectPaths();
   updateProjectFromTemplates();
+  legendLayerSelectionChanged();
   activateDeactivateLayerRelatedActions( NULL );
 
-  // create the notification widget for macros
-  mMacrosWarn = QgsMessageBar::createMessage( tr( "Security warning:" ),
-                tr( "macros have been disabled." ),
-                QgsApplication::getThemeIcon( "/mIconWarn.png" ),
-                mInfoBar );
-
-  QToolButton *btnEnableMacros = new QToolButton( mMacrosWarn );
-  btnEnableMacros->setText( tr( "Enable" ) );
-  btnEnableMacros->setStyleSheet( "background-color: rgba(255, 255, 255, 0); color: black; text-decoration: underline;" );
-  btnEnableMacros->setCursor( Qt::PointingHandCursor );
-  connect( btnEnableMacros, SIGNAL( clicked() ), mInfoBar, SLOT( popWidget() ) );
-  connect( btnEnableMacros, SIGNAL( clicked() ), this, SLOT( enableProjectMacros() ) );
-  mMacrosWarn->layout()->addWidget( btnEnableMacros );
-
   addDockWidget( Qt::LeftDockWidgetArea, mUndoWidget );
   mUndoWidget->hide();
 
@@ -732,6 +723,7 @@ QgisApp::~QgisApp()
   delete mMapTools.mTextAnnotation;
   delete mMapTools.mFormAnnotation;
   delete mMapTools.mHtmlAnnotation;
+  delete mMapTools.mSvgAnnotation;
   delete mMapTools.mAnnotation;
   delete mMapTools.mAddFeature;
   delete mMapTools.mMoveFeature;
@@ -936,6 +928,7 @@ void QgisApp::createActions()
   connect( mActionTextAnnotation, SIGNAL( triggered() ), this, SLOT( addTextAnnotation() ) );
   connect( mActionFormAnnotation, SIGNAL( triggered() ), this, SLOT( addFormAnnotation() ) );
   connect( mActionHtmlAnnotation, SIGNAL( triggered() ), this, SLOT( addHtmlAnnotation() ) );
+  connect( mActionSvgAnnotation, SIGNAL( triggered() ), this, SLOT( addSvgAnnotation() ) );
   connect( mActionAnnotation, SIGNAL( triggered() ), this, SLOT( modifyAnnotation() ) );
   connect( mActionLabeling, SIGNAL( triggered() ), this, SLOT( labeling() ) );
 
@@ -956,9 +949,11 @@ void QgisApp::createActions()
   connect( mActionOpenTable, SIGNAL( triggered() ), this, SLOT( attributeTable() ) );
   connect( mActionToggleEditing, SIGNAL( triggered() ), this, SLOT( toggleEditing() ) );
   connect( mActionSaveEdits, SIGNAL( triggered() ), this, SLOT( saveEdits() ) );
+  connect( mActionSaveAllEdits, SIGNAL( triggered() ), this, SLOT( saveAllEdits() ) );
   connect( mActionLayerSaveAs, SIGNAL( triggered() ), this, SLOT( saveAsFile() ) );
   connect( mActionLayerSelectionSaveAs, SIGNAL( triggered() ), this, SLOT( saveSelectionAsVectorFile() ) );
   connect( mActionRemoveLayer, SIGNAL( triggered() ), this, SLOT( removeLayer() ) );
+  connect( mActionDuplicateLayer, SIGNAL( triggered() ), this, SLOT( duplicateLayers() ) );
   connect( mActionSetLayerCRS, SIGNAL( triggered() ), this, SLOT( setLayerCRS() ) );
   connect( mActionSetProjectCRSFromLayer, SIGNAL( triggered() ), this, SLOT( setProjectCRSFromLayer() ) );
   connect( mActionLayerProperties, SIGNAL( triggered() ), this, SLOT( layerProperties() ) );
@@ -1400,6 +1395,7 @@ void QgisApp::createToolBars()
   bt->addAction( mActionTextAnnotation );
   bt->addAction( mActionFormAnnotation );
   bt->addAction( mActionHtmlAnnotation );
+  bt->addAction( mActionSvgAnnotation );
   bt->addAction( mActionAnnotation );
 
   QAction* defAnnotationAction = mActionTextAnnotation;
@@ -1407,8 +1403,10 @@ void QgisApp::createToolBars()
   {
     case 0: defAnnotationAction = mActionTextAnnotation; break;
     case 1: defAnnotationAction = mActionFormAnnotation; break;
-    case 2: defAnnotationAction =  mActionAnnotation; break;
-    case 3: defAnnotationAction =  mActionHtmlAnnotation; break;
+    case 2: defAnnotationAction = mActionHtmlAnnotation; break;
+    case 3: defAnnotationAction = mActionSvgAnnotation; break;
+    case 4: defAnnotationAction =  mActionAnnotation; break;
+
   }
   bt->setDefaultAction( defAnnotationAction );
   QAction* annotationAction = mAttributesToolBar->addWidget( bt );
@@ -1628,6 +1626,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionAddMssqlLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddMssqlLayer.png" ) );
 #endif
   mActionRemoveLayer->setIcon( QgsApplication::getThemeIcon( "/mActionRemoveLayer.png" ) );
+  mActionDuplicateLayer->setIcon( QgsApplication::getThemeIcon( "/mActionAddMap.png" ) );
   mActionSetLayerCRS->setIcon( QgsApplication::getThemeIcon( "/mActionSetLayerCRS.png" ) );
   mActionSetProjectCRSFromLayer->setIcon( QgsApplication::getThemeIcon( "/mActionSetProjectCRSFromLayer.png" ) );
   mActionNewVectorLayer->setIcon( QgsApplication::getThemeIcon( "/mActionNewVectorLayer.png" ) );
@@ -1652,6 +1651,7 @@ void QgisApp::setTheme( QString theThemeName )
   mActionDraw->setIcon( QgsApplication::getThemeIcon( "/mActionDraw.png" ) );
   mActionToggleEditing->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.png" ) );
   mActionSaveEdits->setIcon( QgsApplication::getThemeIcon( "/mActionSaveEdits.png" ) );
+  mActionSaveAllEdits->setIcon( QgsApplication::getThemeIcon( "/mActionSaveAllEdits.png" ) );
   mActionCutFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditCut.png" ) );
   mActionCopyFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditCopy.png" ) );
   mActionPasteFeatures->setIcon( QgsApplication::getThemeIcon( "/mActionEditPaste.png" ) );
@@ -1838,6 +1838,8 @@ void QgisApp::createCanvasTools()
   mMapTools.mFormAnnotation->setAction( mActionFormAnnotation );
   mMapTools.mHtmlAnnotation = new QgsMapToolHtmlAnnotation( mMapCanvas );
   mMapTools.mHtmlAnnotation->setAction( mActionHtmlAnnotation );
+  mMapTools.mSvgAnnotation = new QgsMapToolSvgAnnotation( mMapCanvas );
+  mMapTools.mSvgAnnotation->setAction( mActionSvgAnnotation );
   mMapTools.mAnnotation = new QgsMapToolAnnotation( mMapCanvas );
   mMapTools.mAnnotation->setAction( mActionAnnotation );
   mMapTools.mAddFeature = new QgsMapToolAddFeature( mMapCanvas );
@@ -2532,7 +2534,7 @@ bool QgisApp::askUserForZipItemLayers( QString path )
   QgsDebugMsg( "askUserForZipItemLayers( " + path + ")" );
 
   // if scanZipBrowser == no: skip to the next file
-  if ( settings.value( "/qgis/scanZipInBrowser", "basic" ).toString() == "no" )
+  if ( settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString() == "no" )
   {
     return false;
   }
@@ -2699,11 +2701,12 @@ bool QgisApp::shouldAskUserForGDALSublayers( QgsRasterLayer *layer )
 
   QSettings settings;
   int promptLayers = settings.value( "/qgis/promptForRasterSublayers", 1 ).toInt();
-  // 0 = always -> always ask (if there are existing sublayers)
-  // 1 = if needed -> ask if layer has no bands, but has sublayers
-  // 2 = never
+  // 0 = Always -> always ask (if there are existing sublayers)
+  // 1 = If needed -> ask if layer has no bands, but has sublayers
+  // 2 = Never -> never prompt, will not load anything
+  // 3 = Load all -> never prompt, but load all sublayers
 
-  return promptLayers == 0 || ( promptLayers == 1 && layer->bandCount() == 0 );
+  return promptLayers == 0 || promptLayers == 3 || ( promptLayers == 1 && layer->bandCount() == 0 );
 }
 
 // This method will load with GDAL the layers in parameter.
@@ -3354,12 +3357,31 @@ bool QgisApp::addProject( QString projectFile )
       }
       else if ( enableMacros == 1 ) // ask
       {
+        // create the notification widget for macros
+
+        QWidget *macroMsg = QgsMessageBar::createMessage( tr( "Security warning:" ),
+                            tr( "project macros have been disabled." ),
+                            QgsApplication::getThemeIcon( "/mIconWarn.png" ),
+                            mInfoBar );
+
+        QToolButton *btnEnableMacros = new QToolButton( macroMsg );
+        btnEnableMacros->setText( tr( "Enable macros" ) );
+        btnEnableMacros->setStyleSheet( "background-color: rgba(255, 255, 255, 0); color: black; text-decoration: underline;" );
+        btnEnableMacros->setCursor( Qt::PointingHandCursor );
+        btnEnableMacros->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );
+        connect( btnEnableMacros, SIGNAL( clicked() ), mInfoBar, SLOT( popWidget() ) );
+        connect( btnEnableMacros, SIGNAL( clicked() ), this, SLOT( enableProjectMacros() ) );
+        macroMsg->layout()->addWidget( btnEnableMacros );
+
         // display the macros notification widget
-        mInfoBar->pushWidget( mMacrosWarn, 1 );
+        mInfoBar->pushWidget( macroMsg, 1 );
       }
     }
   }
 
+  // load PAL engine settings
+  mLBL->loadEngineSettings();
+
   emit projectRead(); // let plug-ins know that we've read in a new
   // project so that they can check any project
   // specific plug-in state
@@ -3561,6 +3583,12 @@ bool QgisApp::openLayer( const QString & fileName, bool allowInteractive )
   {
     ok  = addRasterLayer( fileName, fileInfo.completeBaseName() );
   }
+  // TODO - should we really call isValidRasterFileName() before addRasterLayer()
+  //        this results in 2 calls to GDALOpen()
+  // if ( addRasterLayer( fileName, fileInfo.completeBaseName() ) )
+  // {
+  //   ok  = true );
+  // }
   else // nope - try to load it as a shape/ogr
   {
     if ( allowInteractive )
@@ -3930,6 +3958,11 @@ void QgisApp::addTextAnnotation()
   mMapCanvas->setMapTool( mMapTools.mTextAnnotation );
 }
 
+void QgisApp::addSvgAnnotation()
+{
+  mMapCanvas->setMapTool( mMapTools.mSvgAnnotation );
+}
+
 void QgisApp::modifyAnnotation()
 {
   mMapCanvas->setMapTool( mMapTools.mAnnotation );
@@ -4145,13 +4178,6 @@ void QgisApp::saveAsVectorFileGeneral( bool saveOnlySelection )
     QString format = dialog->format();
     QStringList datasourceOptions = dialog->datasourceOptions();
 
-    if ( format == "SpatiaLite" )
-    {
-      if ( !datasourceOptions.contains( "SPATIALITE=YES" ) )
-        datasourceOptions.append( "SPATIALITE=YES" );
-      format = "SQLite";
-    }
-
     switch ( dialog->crs() )
     {
       case -2: // Project CRS
@@ -4466,6 +4492,13 @@ bool QgisApp::loadAnnotationItemsFromProject( const QDomDocument& doc )
     QgsHtmlAnnotationItem* newHtmlItem = new QgsHtmlAnnotationItem( mMapCanvas );
     newHtmlItem->readXML( doc, htmlItemList.at( i ).toElement() );
   }
+
+  QDomNodeList svgItemList = doc.elementsByTagName( "SVGAnnotationItem" );
+  for ( int i = 0; i < svgItemList.size(); ++i )
+  {
+    QgsSvgAnnotationItem* newSvgItem = new QgsSvgAnnotationItem( mMapCanvas );
+    newSvgItem->readXML( doc, svgItemList.at( i ).toElement() );
+  }
   return true;
 }
 
@@ -5068,6 +5101,38 @@ void QgisApp::saveEdits( QgsMapLayer *layer )
 
   vlayer->startEditing();
   vlayer->triggerRepaint();
+
+  actionSaveAllEdits()->setEnabled( unsavedEditableLayers().count() > 0 );
+}
+
+void QgisApp::saveAllEdits()
+{
+  if ( mMapCanvas && mMapCanvas->isDrawing() )
+    return;
+
+  foreach ( QgsMapLayer * layer, unsavedEditableLayers() )
+  {
+    saveEdits( layer );
+  }
+}
+
+QList QgisApp::unsavedEditableLayers() const
+{
+  QList unsavedLayers;
+  // use legend layers (instead of registry) so message listing mirrors its order
+  QList layers = mMapLegend->layers();
+  if ( layers.count() > 0 )
+  {
+    foreach ( QgsMapLayer* layer, layers )
+    {
+      QgsVectorLayer *vl = qobject_cast( layer );
+      if ( vl && vl->isEditable() && vl->isModified() )
+      {
+        unsavedLayers.append( vl );
+      }
+    }
+  }
+  return unsavedLayers;
 }
 
 void QgisApp::layerSubsetString()
@@ -5103,7 +5168,6 @@ void QgisApp::layerSubsetString()
   delete qb;
 }
 
-
 bool QgisApp::toggleEditing( QgsMapLayer *layer, bool allowCancel )
 {
   QgsVectorLayer *vlayer = qobject_cast( layer );
@@ -5339,6 +5403,138 @@ void QgisApp::removeLayer()
   mMapCanvas->refresh();
 }
 
+void QgisApp::duplicateLayers( QList lyrList )
+{
+  if ( mMapCanvas && mMapCanvas->isDrawing() )
+  {
+    return;
+  }
+
+  if ( !mMapLegend )
+  {
+    return;
+  }
+
+  const QList selectedLyrs = lyrList.empty() ? mMapLegend->selectedLayers() : lyrList;
+  if ( selectedLyrs.empty() )
+  {
+    return;
+  }
+
+  mMapCanvas->freeze();
+  QgsMapLayer *dupLayer;
+  QString layerDupName, unSppType;
+  QList msgBars;
+
+  foreach ( QgsMapLayer * selectedLyr, selectedLyrs )
+  {
+    dupLayer = 0;
+    unSppType = QString( "" );
+    layerDupName = selectedLyr->name() + " " + tr( "copy" );
+
+    if ( selectedLyr->type() == QgsMapLayer::PluginLayer )
+    {
+      unSppType = tr( "Plugin layer" );
+    }
+
+    // duplicate the layer's basic parameters
+
+    if ( unSppType.isEmpty() )
+    {
+      QgsVectorLayer *vlayer = qobject_cast( selectedLyr );
+      // TODO: add other layer types that can be duplicated
+      // currently memory and plugin layers are skipped
+      if ( vlayer && vlayer->storageType() == "Memory storage" )
+      {
+        unSppType = tr( "Memory layer" );
+      }
+      else if ( vlayer )
+      {
+        dupLayer = new QgsVectorLayer( vlayer->source(), layerDupName, vlayer->providerType() );
+      }
+    }
+
+    if ( unSppType.isEmpty() && !dupLayer )
+    {
+      QgsRasterLayer *rlayer = qobject_cast( selectedLyr );
+      if ( rlayer )
+      {
+        dupLayer = new QgsRasterLayer( rlayer->source(), layerDupName );
+      }
+    }
+
+    if ( unSppType.isEmpty() && dupLayer && !dupLayer->isValid() )
+    {
+      msgBars.append( QgsMessageBar::createMessage(
+                        tr( "Duplicate layer: " ),
+                        tr( "%1 (duplication resulted in invalid layer)" ).arg( selectedLyr->name() ) ,
+                        QgsApplication::getThemeIcon( "/mIconWarn.png" ),
+                        mInfoBar ) );
+      continue;
+    }
+
+    if ( !unSppType.isEmpty() || !dupLayer )
+    {
+      msgBars.append( QgsMessageBar::createMessage(
+                        tr( "Duplicate layer: " ),
+                        tr( "%1 (%2type unsupported)" )
+                        .arg( selectedLyr->name() )
+                        .arg( !unSppType.isEmpty() ? QString( "'" ) + unSppType + "' " : "" ),
+                        QgsApplication::getThemeIcon( "/mIconWarn.png" ),
+                        mInfoBar ) );
+      continue;
+    }
+
+    // add layer to layer registry and legend
+    QList myList;
+    myList << dupLayer;
+    QgsMapLayerRegistry::instance()->addMapLayers( myList );
+
+    // verify layer has been added to legend
+    QgsLegendLayer *duplLayer = 0;
+    duplLayer = mMapLegend->findLegendLayer( dupLayer );
+    if ( !duplLayer )
+    {
+      // some source layers, like items > 4th in a container, have their layer
+      // registered but do not show up in the legend, so manually add them
+      QgsLegendLayer* llayer = new QgsLegendLayer( dupLayer );
+      mMapLegend->insertTopLevelItem( 0, llayer );
+      // double-check, or move of non-existent legend layer will segfault
+      duplLayer = mMapLegend->findLegendLayer( dupLayer );
+    }
+
+    QgsLegendLayer *srclLayer = mMapLegend->findLegendLayer( selectedLyr );
+    if ( duplLayer && srclLayer )
+    {
+      // move layer to just below source layer
+      mMapLegend->moveItem( duplLayer, srclLayer );
+
+      // duplicate the layer style
+      copyStyle( selectedLyr );
+      pasteStyle( dupLayer );
+
+      // always set duplicated layers to not visible
+      // so layer can be configured before being turned on,
+      // and no map canvas refresh needed when doing multiple duplications
+      mMapLegend->setLayerVisible( dupLayer, false );
+    }
+  }
+
+  dupLayer = 0;
+
+  // update UI
+  qApp->processEvents();
+
+  mMapCanvas->freeze( false );
+
+  // display errors in message bar after duplication of layers
+  foreach ( QWidget * msgBar, msgBars )
+  {
+    mInfoBar->pushWidget( msgBar, 1 );
+  }
+
+}
+
 void QgisApp::setLayerCRS()
 {
   if ( mMapCanvas && mMapCanvas->isDrawing() )
@@ -5913,6 +6109,37 @@ void QgisApp::setExtent( QgsRectangle theRect )
  */
 bool QgisApp::saveDirty()
 {
+  QString whyDirty = "";
+  bool hasUnsavedEdits = false;
+  // extra check to see if there are any vector layers with unsaved provider edits
+  // to ensure user has opportunity to save any editing
+  if ( QgsMapLayerRegistry::instance()->count() > 0 )
+  {
+    QMap layers = QgsMapLayerRegistry::instance()->mapLayers();
+    for ( QMap::iterator it = layers.begin(); it != layers.end(); it++ )
+    {
+      QgsVectorLayer *vl = qobject_cast( it.value() );
+      if ( !vl )
+      {
+        continue;
+      }
+
+      hasUnsavedEdits = ( vl->isEditable() && vl->isModified() );
+      if ( hasUnsavedEdits )
+      {
+        break;
+      }
+    }
+
+    if ( hasUnsavedEdits )
+    {
+      markDirty();
+      whyDirty = "
        ";
+      whyDirty += tr( "Project has layer(s) in edit mode with unsaved edits, which will NOT be saved!" );
+      whyDirty += "
        ";
+    }
+  }
+
   QMessageBox::StandardButton answer( QMessageBox::Discard );
   mMapCanvas->freeze( true );
 
@@ -5933,8 +6160,10 @@ bool QgisApp::saveDirty()
 
     // prompt user to save
     answer = QMessageBox::information( this, tr( "Save?" ),
-                                       tr( "Do you want to save the current project?" ),
-                                       QMessageBox::Save | QMessageBox::Cancel | QMessageBox::Discard );
+                                       tr( "Do you want to save the current project?%1" )
+                                       .arg( whyDirty ),
+                                       QMessageBox::Save | QMessageBox::Cancel | QMessageBox::Discard,
+                                       hasUnsavedEdits ? QMessageBox::Cancel : QMessageBox::Save );
     if ( QMessageBox::Save == answer )
     {
       if ( !fileSave() )
@@ -5955,8 +6184,8 @@ void QgisApp::closeProject()
     QgsPythonRunner::run( "qgis.utils.unloadProjectMacros();" );
   }
 
-  // remove the warning message from the bar if present
-  mInfoBar->popWidget( mMacrosWarn );
+  // remove any message widgets from the message bar
+  mInfoBar->clearWidgets();
 
   mTrustedMacros = false;
 
@@ -6831,6 +7060,7 @@ void QgisApp::selectionChanged( QgsMapLayer *layer )
 void QgisApp::legendLayerSelectionChanged( void )
 {
   mActionRemoveLayer->setEnabled( mMapLegend && mMapLegend->selectedLayers().size() > 0 );
+  mActionDuplicateLayer->setEnabled( mMapLegend && mMapLegend->selectedLayers().size() > 0 );
   mActionSetLayerCRS->setEnabled( mMapLegend && mMapLegend->selectedLayers().size() > 0 );
   mActionSetProjectCRSFromLayer->setEnabled( mMapLegend && mMapLegend->selectedLayers().size() == 1 );
 }
@@ -6893,6 +7123,7 @@ void QgisApp::activateDeactivateLayerRelatedActions( QgsMapLayer* layer )
     mActionOpenTable->setEnabled( false );
     mActionToggleEditing->setEnabled( false );
     mActionSaveEdits->setEnabled( false );
+    mActionSaveAllEdits->setEnabled( false );
     mActionLayerSaveAs->setEnabled( false );
     mActionLayerSelectionSaveAs->setEnabled( false );
     mActionLayerProperties->setEnabled( false );
@@ -7293,22 +7524,37 @@ QgsRasterLayer* QgisApp::addRasterLayer( QString const & rasterFile, QString con
   // XXX why do we have to pass it in for it?
   QgsRasterLayer *layer =
     new QgsRasterLayer( rasterFile, baseName ); // fi.completeBaseName());
-
+  QgsError error;
+  QString title;
   bool ok = false;
 
-  if ( shouldAskUserForGDALSublayers( layer ) )
+  if ( !layer->isValid() )
   {
-    askUserForGDALSublayers( layer );
-    ok = true;
+    error = layer->error();
+    title = tr( "Invalid Layer" );
 
-    // The first layer loaded is not useful in that case. The user can select it in
-    // the list if he wants to load it.
-    delete layer;
-    layer = 0;
+    if ( shouldAskUserForGDALSublayers( layer ) )
+    {
+      askUserForGDALSublayers( layer );
+      ok = true;
+
+      // The first layer loaded is not useful in that case. The user can select it in
+      // the list if he wants to load it.
+      // TODO fix this - provider is not deleted in ~QgsRasterLayer()
+      delete layer->dataProvider();
+      delete layer;
+      layer = 0;
+    }
   }
   else
   {
     ok = addRasterLayer( layer );
+    if ( !ok )
+    {
+      error.append( QGS_ERROR_MESSAGE( tr( "Error adding valid layer to map canvas" ),
+                                       tr( "Raster layer" ) ) );
+      title = tr( "Error" );
+    }
   }
 
   if ( !ok )
@@ -7319,12 +7565,15 @@ QgsRasterLayer* QgisApp::addRasterLayer( QString const & rasterFile, QString con
 // Let render() do its own cursor management
 //    QApplication::restoreOverrideCursor();
 
+    // don't show the gui warning if we are loading from command line
     if ( guiWarning )
     {
-      // don't show the gui warning (probably because we are loading from command line)
-      QString msg( tr( "%1 is not a valid or recognized raster data source" ).arg( rasterFile ) );
-      QMessageBox::critical( this, tr( "Invalid Data Source" ), msg );
+      QgsErrorDialog::show( error, title );
     }
+
+    if ( layer )
+      delete layer;
+
     return NULL;
   }
   else
@@ -7377,7 +7626,7 @@ QgsRasterLayer* QgisApp::addRasterLayer(
 
   QgsDebugMsg( "Constructed new layer." );
 
-  if ( layer && layer->isValid() )
+  if ( layer->isValid() )
   {
     addRasterLayer( layer );
 
@@ -7385,8 +7634,7 @@ QgsRasterLayer* QgisApp::addRasterLayer(
   }
   else
   {
-    QMessageBox::critical( this, tr( "Layer is not valid" ),
-                           tr( "The layer is not a valid layer and can not be added to the map" ) );
+    QgsErrorDialog::show( layer->error(), tr( "Invalid Layer" ) );
   }
 
   // update UI
@@ -7430,6 +7678,9 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g
         ++myIterator )
   {
     QString errMsg;
+    QgsError error;
+    QString title;
+    bool ok = false;
 
     // if needed prompt for zipitem layers
     QString vsiPrefix = QgsZipItem::vsiPrefix( *myIterator );
@@ -7454,17 +7705,33 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g
       // create the layer
       QgsRasterLayer *layer = new QgsRasterLayer( *myIterator, myBaseNameQString );
 
-      if ( shouldAskUserForGDALSublayers( layer ) )
+      if ( !layer->isValid() )
       {
-        askUserForGDALSublayers( layer );
+        error = layer->error();
+        title = tr( "Invalid Layer" );
 
-        // The first layer loaded is not useful in that case. The user can select it in
-        // the list if he wants to load it.
-        delete layer;
-      }
+        if ( shouldAskUserForGDALSublayers( layer ) )
+        {
+          askUserForGDALSublayers( layer );
+          ok = true;
+
+          // The first layer loaded is not useful in that case. The user can select it in
+          // the list if he wants to load it.
+          // TODO fix this - provider is not deleted in ~QgsRasterLayer()
+          delete layer->dataProvider();
+          delete layer;
+          layer = 0;
+        }
+      } // invalid layer
       else
       {
-        addRasterLayer( layer );
+        ok = addRasterLayer( layer );
+        if ( !ok )
+        {
+          error.append( QGS_ERROR_MESSAGE( tr( "Error adding valid layer to map canvas" ),
+                                           tr( "Raster layer" ) ) );
+          title = tr( "Error" );
+        }
 
         //only allow one copy of a ai grid file to be loaded at a
         //time to prevent the user selecting all adfs in 1 dir which
@@ -7478,20 +7745,27 @@ bool QgisApp::addRasterLayers( QStringList const &theFileNameQStringList, bool g
     } // valid raster filename
     else
     {
+      QString msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );
+      if ( errMsg.size() > 0 )
+        msg += "\n" + errMsg;
+
+      error.append( QGS_ERROR_MESSAGE( msg, tr( "Raster layer" ) ) );
+      title = tr( "Unsupported Data Source" );
+      ok = false;
+    }
+
+    if ( ! ok )
+    {
+      returnValue = false;
+
       // Issue message box warning unless we are loading from cmd line since
       // non-rasters are passed to this function first and then successfully
       // loaded afterwards (see main.cpp)
-
       if ( guiWarning )
       {
-        QString msg = tr( "%1 is not a supported raster data source" ).arg( *myIterator );
-
-        if ( errMsg.size() > 0 )
-          msg += "\n" + errMsg;
-
-        QMessageBox::critical( this, tr( "Unsupported Data Source" ), msg );
+        QgsErrorDialog::show( error, title );
       }
-      returnValue = false;
+
     }
   }
 
@@ -7746,7 +8020,7 @@ void QgisApp::showLayerProperties( QgsMapLayer *ml )
     else
     {
       vlp = new QgsVectorLayerProperties( vlayer, this );
-      connect( vlp, SIGNAL( refreshLegend( QString, bool ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, bool ) ) );
+      connect( vlp, SIGNAL( refreshLegend( QString, QgsLegendItem::Expansion ) ), mMapLegend, SLOT( refreshLayerSymbology( QString, QgsLegendItem::Expansion ) ) );
     }
 
     if ( vlp->exec() )
@@ -7831,6 +8105,9 @@ void QgisApp::namSslErrors( QNetworkReply *reply, const QList &errors
 
   foreach ( QSslError error, errors )
   {
+    if ( error.error() == QSslError::NoError )
+      continue;
+
     QgsDebugMsg( QString( "SSL error %1: %2" ).arg( error.error() ).arg( error.errorString() ) );
 
     otherError = otherError || !ignoreErrors.contains( error.error() );
@@ -7961,11 +8238,12 @@ void QgisApp::toolButtonActionTriggered( QAction *action )
     settings.setValue( "/UI/annotationTool", 0 );
   else if ( action == mActionFormAnnotation )
     settings.setValue( "/UI/annotationTool", 1 );
-  else if ( action == mActionAnnotation )
-    settings.setValue( "/UI/annotationTool", 2 );
   else if ( action == mActionHtmlAnnotation )
-    settings.setValue( "/UI/annotationTool", 3 );
-
+    settings.setValue( "/UI/annotationTool", 2 );
+  else if ( action == mActionSvgAnnotation )
+    settings.setValue( "UI/annotationTool", 3 );
+  else if ( action == mActionAnnotation )
+    settings.setValue( "/UI/annotationTool", 4 );
   bt->setDefaultAction( action );
 }
 
diff --git a/src/app/qgisapp.h b/src/app/qgisapp.h
index de2598b9d581..952d405bef73 100644
--- a/src/app/qgisapp.h
+++ b/src/app/qgisapp.h
@@ -280,16 +280,24 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     QAction *actionAddOgrLayer() { return mActionAddOgrLayer; }
     QAction *actionAddRasterLayer() { return mActionAddRasterLayer; }
     QAction *actionAddPgLayer() { return mActionAddPgLayer; }
-    QAction *actionAddSpatiaLiteLayer() { return mActionAddSpatiaLiteLayer; };
+    QAction *actionAddSpatiaLiteLayer() { return mActionAddSpatiaLiteLayer; }
     QAction *actionAddWmsLayer() { return mActionAddWmsLayer; }
     QAction *actionAddWcsLayer() { return mActionAddWcsLayer; }
     QAction *actionAddWfsLayer() { return mActionAddWfsLayer; }
+    /** @note added in 1.9 */
+    QAction *actionCopyLayerStyle() { return mActionCopyStyle; }
+    /** @note added in 1.9 */
+    QAction *actionPasteLayerStyle() { return mActionPasteStyle; }
     QAction *actionOpenTable() { return mActionOpenTable; }
     QAction *actionToggleEditing() { return mActionToggleEditing; }
     QAction *actionSaveEdits() { return mActionSaveEdits; }
+    /** @note added in 1.9 */
+    QAction *actionSaveAllEdits() { return mActionSaveAllEdits; }
     QAction *actionLayerSaveAs() { return mActionLayerSaveAs; }
     QAction *actionLayerSelectionSaveAs() { return mActionLayerSelectionSaveAs; }
     QAction *actionRemoveLayer() { return mActionRemoveLayer; }
+    /** @note added in 1.9 */
+    QAction *actionDuplicateLayer() { return mActionDuplicateLayer; }
     QAction *actionSetLayerCRS() { return mActionSetLayerCRS; }
     QAction *actionSetProjectCRSFromLayer() { return mActionSetProjectCRSFromLayer; }
     QAction *actionLayerProperties() { return mActionLayerProperties; }
@@ -371,6 +379,11 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     //! returns pointer to map legend
     QgsLegend *legend();
 
+    /** Return vector layers with unsaved provider edits
+     * @returns list of layers in legend order, or empty list
+     * @note added in 1.9 */
+    QList unsavedEditableLayers() const;
+
 #ifdef Q_OS_WIN
     //! ugly hack
     void skipNextContextMenuEvent();
@@ -435,13 +448,13 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
                                 (defaults to the active layer on the legend)
      */
     void editPaste( QgsMapLayer * destinationLayer = 0 );
-
+    //! copies style of the active layer to the clipboard
     /**
        \param sourceLayer  The layer where the style will be taken from
                                         (defaults to the active layer on the legend)
      */
     void copyStyle( QgsMapLayer * sourceLayer = 0 );
-    //! copies style on the clipboard to the active layer
+    //! pastes style on the clipboard to the active layer
     /**
        \param destinatioLayer  The layer that the clipboard will be pasted to
                                 (defaults to the active layer on the legend)
@@ -543,6 +556,9 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void userCenter();
     //! Remove a layer from the map and legend
     void removeLayer();
+    /** Duplicate map layer(s) in legend
+     * @note added in 1.9 */
+    void duplicateLayers( const QList lyrList = QList() );
     //! Set CRS of a layer
     void setLayerCRS();
     //! Assign layer CRS to project
@@ -765,6 +781,10 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     //! save current edits and start new transaction
     void saveEdits();
 
+    /** Save all edits and start new transactions
+     * @note added in 1.9 */
+    void saveAllEdits();
+
     //! change layer subset of current vector layer
     void layerSubsetString();
 
@@ -825,6 +845,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
     void addFormAnnotation();
     void addTextAnnotation();
     void addHtmlAnnotation();
+    void addSvgAnnotation();
     void modifyAnnotation();
 
     //! shows label settings dialog (for labeling-ng)
@@ -1094,6 +1115,7 @@ class QgisApp : public QMainWindow, private Ui::MainWindow
         QgsMapTool* mAnnotation;
         QgsMapTool* mFormAnnotation;
         QgsMapTool* mHtmlAnnotation;
+        QgsMapTool* mSvgAnnotation;
         QgsMapTool* mTextAnnotation;
         QgsMapTool* mPinLabels;
         QgsMapTool* mShowHideLabels;
diff --git a/src/app/qgisappinterface.cpp b/src/app/qgisappinterface.cpp
index bf7322a7e196..e784e1e77105 100644
--- a/src/app/qgisappinterface.cpp
+++ b/src/app/qgisappinterface.cpp
@@ -460,11 +460,16 @@ QAction *QgisAppInterface::actionAddRasterLayer() { return qgis->actionAddRaster
 QAction *QgisAppInterface::actionAddPgLayer() { return qgis->actionAddPgLayer(); }
 QAction *QgisAppInterface::actionAddWmsLayer() { return qgis->actionAddWmsLayer(); }
 QAction *QgisAppInterface::actionLayerSeparator1() { return 0; }
+QAction *QgisAppInterface::actionCopyLayerStyle() { return qgis->actionCopyLayerStyle(); }
+QAction *QgisAppInterface::actionPasteLayerStyle() { return qgis->actionPasteLayerStyle(); }
 QAction *QgisAppInterface::actionOpenTable() { return qgis->actionOpenTable(); }
 QAction *QgisAppInterface::actionToggleEditing() { return qgis->actionToggleEditing(); }
+QAction *QgisAppInterface::actionSaveEdits() { return qgis->actionSaveEdits(); }
+QAction *QgisAppInterface::actionSaveAllEdits() { return qgis->actionSaveAllEdits(); }
 QAction *QgisAppInterface::actionLayerSaveAs() { return qgis->actionLayerSaveAs(); }
 QAction *QgisAppInterface::actionLayerSelectionSaveAs() { return qgis->actionLayerSelectionSaveAs(); }
 QAction *QgisAppInterface::actionRemoveLayer() { return qgis->actionRemoveLayer(); }
+QAction *QgisAppInterface::actionDuplicateLayer() { return qgis->actionDuplicateLayer(); }
 QAction *QgisAppInterface::actionLayerProperties() { return qgis->actionLayerProperties(); }
 QAction *QgisAppInterface::actionLayerSeparator2() { return 0; }
 QAction *QgisAppInterface::actionAddToOverview() { return qgis->actionAddToOverview(); }
diff --git a/src/app/qgisappinterface.h b/src/app/qgisappinterface.h
index 867d87cfa0f9..ef0f6aabb291 100644
--- a/src/app/qgisappinterface.h
+++ b/src/app/qgisappinterface.h
@@ -308,11 +308,21 @@ class QgisAppInterface : public QgisInterface
     virtual QAction *actionAddPgLayer();
     virtual QAction *actionAddWmsLayer();
     virtual QAction *actionLayerSeparator1();
+    /** @note added in 1.9 */
+    virtual QAction *actionCopyLayerStyle();
+    /** @note added in 1.9 */
+    virtual QAction *actionPasteLayerStyle();
     virtual QAction *actionOpenTable();
     virtual QAction *actionToggleEditing();
+    /** @note added in 1.9 */
+    virtual QAction *actionSaveEdits();
+    /** @note added in 1.9 */
+    virtual QAction *actionSaveAllEdits();
     virtual QAction *actionLayerSaveAs();
     virtual QAction *actionLayerSelectionSaveAs();
     virtual QAction *actionRemoveLayer();
+    /** @note added in 1.9 */
+    virtual QAction *actionDuplicateLayer();
     virtual QAction *actionLayerProperties();
     virtual QAction *actionLayerSeparator2();
     virtual QAction *actionAddToOverview();
diff --git a/src/app/qgsaddtaborgroup.cpp b/src/app/qgsaddtaborgroup.cpp
new file mode 100644
index 000000000000..f5133735393c
--- /dev/null
+++ b/src/app/qgsaddtaborgroup.cpp
@@ -0,0 +1,81 @@
+/***************************************************************************
+                          qgsaddtaborgroup.h
+        Add a tab or a group for the tab and group display of fields
+                             -------------------
+    begin                : 2012-07-30
+    copyright            : (C) 2012 by Denis Rouzaud
+    email                : denis dot rouzaud at gmail dot com
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgisapp.h"
+#include "qgsapplication.h"
+#include "qgsvectorlayer.h"
+#include "qgsaddtaborgroup.h"
+
+#include 
+
+QgsAddTabOrGroup::QgsAddTabOrGroup(
+  QgsVectorLayer *lyr,
+  QWidget * parent,
+  QList tabList
+)
+    : QDialog( parent )
+    , layer( lyr )
+{
+  setupUi( this );
+
+  mTabButton->setChecked( true );
+  mTabList->setEnabled( false );
+  if ( tabList.size() > 0 )
+  {
+    for ( QList::iterator tab = tabList.begin(); tab != tabList.end(); tab++ )
+      mTabList->addItem( *tab );
+  }
+  else
+  {
+    mGroupButton->setEnabled( false );
+  }
+
+  connect( mTabButton, SIGNAL( toggled( bool ) ), this, SLOT( on_mTabButton_toggled( bool ) ) );
+  connect( mGroupButton, SIGNAL( toggled( bool ) ), this, SLOT( on_mGroupButton_toggled( bool ) ) );
+
+  setWindowTitle( tr( "Add tab or group for %1" ).arg( layer->name() ) );
+} // QgsVectorLayerProperties ctor
+
+QgsAddTabOrGroup::~QgsAddTabOrGroup()
+{
+}
+
+QString QgsAddTabOrGroup::name()
+{
+  return mName->text();
+}
+
+int QgsAddTabOrGroup::tabId()
+{
+  return mTabList->currentIndex();
+}
+
+bool QgsAddTabOrGroup::tabButtonIsChecked()
+{
+  return mTabButton->isChecked();
+}
+
+void QgsAddTabOrGroup::on_mGroupButton_toggled( bool checked )
+{
+  mTabList->setEnabled( checked );
+}
+
+void QgsAddTabOrGroup::on_mTabButton_toggled( bool checked )
+{
+  mTabList->setEnabled( !checked );
+}
diff --git a/src/app/qgsaddtaborgroup.h b/src/app/qgsaddtaborgroup.h
new file mode 100644
index 000000000000..da95cbd75610
--- /dev/null
+++ b/src/app/qgsaddtaborgroup.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+                          qgsaddtaborgroup.h
+        Add a tab or a group for the tab and group display of fields
+                             -------------------
+    begin                : 2012-07-30
+    copyright            : (C) 2012 by Denis Rouzaud
+    email                : denis dot rouzaud at gmail dot com
+***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSADDTABORGROUP
+#define QGSADDTABORGROUP
+
+#include "ui_qgsaddtaborgroupbase.h"
+#include "qgisgui.h"
+#include "qgsrenderer.h"
+
+
+class QgsAddTabOrGroup : public QDialog, private Ui::QgsAddTabOrGroupBase
+{
+    Q_OBJECT
+
+  public:
+    QgsAddTabOrGroup( QgsVectorLayer *lyr = 0, QWidget *parent = 0, QList tabList = QList() );
+    ~QgsAddTabOrGroup();
+
+    QString name();
+
+    int tabId();
+
+    bool tabButtonIsChecked();
+
+  public slots:
+    void on_mGroupButton_toggled( bool checked );
+    void on_mTabButton_toggled( bool checked );
+
+  protected:
+    QgsVectorLayer *layer;
+};
+
+#endif
diff --git a/src/app/qgsannotationwidget.cpp b/src/app/qgsannotationwidget.cpp
index f3b758af3283..acb55cbd0bc6 100644
--- a/src/app/qgsannotationwidget.cpp
+++ b/src/app/qgsannotationwidget.cpp
@@ -42,6 +42,7 @@ QgsAnnotationWidget::QgsAnnotationWidget( QgsAnnotationItem* item, QWidget * par
     }
     mFrameWidthSpinBox->setValue( mItem->frameBorderWidth() );
     mFrameColorButton->setColor( mItem->frameColor() );
+    mBackgroundColorButton->setColor( mItem->frameBackgroundColor() );
 
     const QgsMarkerSymbolV2* symbol = mItem->markerSymbol();
     if ( symbol )
@@ -66,6 +67,7 @@ void QgsAnnotationWidget::apply()
     mItem->setMapPositionFixed( mMapPositionFixedCheckBox->checkState() == Qt::Checked );
     mItem->setFrameBorderWidth( mFrameWidthSpinBox->value() );
     mItem->setFrameColor( mFrameColorButton->color() );
+    mItem->setFrameBackgroundColor( mBackgroundColorButton->color() );
     mItem->setMarkerSymbol( mMarkerSymbol );
     mMarkerSymbol = 0; //item takes ownership
     mItem->update();
@@ -129,3 +131,24 @@ void QgsAnnotationWidget::updateCenterIcon()
   mMapMarkerButton->setIcon( icon );
 }
 
+void QgsAnnotationWidget::on_mBackgroundColorButton_clicked()
+{
+  if ( !mItem )
+  {
+    return;
+  }
+
+  QColor bgColor;
+#if QT_VERSION >= 0x040500
+  bgColor = QColorDialog::getColor( mItem->frameBackgroundColor(), 0, tr( "Select background color" ), QColorDialog::ShowAlphaChannel );
+#else
+  bgColor = QColorDialog::getColor( mItem->frameBackgroundColor() );
+#endif
+
+  if ( bgColor.isValid() )
+  {
+    mItem->setFrameBackgroundColor( bgColor );
+    mBackgroundColorButton->setColor( bgColor );
+  }
+}
+
diff --git a/src/app/qgsannotationwidget.h b/src/app/qgsannotationwidget.h
index 9c8bc2530125..9e017e5cc02b 100644
--- a/src/app/qgsannotationwidget.h
+++ b/src/app/qgsannotationwidget.h
@@ -37,6 +37,7 @@ class QgsAnnotationWidget: public QWidget, private Ui::QgsAnnotationWidgetBase
   private slots:
     void on_mMapMarkerButton_clicked();
     void on_mFrameColorButton_clicked();
+    void on_mBackgroundColorButton_clicked();
 
   private:
     QgsAnnotationItem* mItem;
diff --git a/src/app/qgsattributeactiondialog.cpp b/src/app/qgsattributeactiondialog.cpp
index 7a6554242c49..4ac2d96f6d6a 100644
--- a/src/app/qgsattributeactiondialog.cpp
+++ b/src/app/qgsattributeactiondialog.cpp
@@ -23,6 +23,9 @@ back to QgsVectorLayer.
 #include "qgsattributeactiondialog.h"
 #include "qgsattributeaction.h"
 #include "qgsexpressionbuilderdialog.h"
+#include "qgisapp.h"
+#include "qgsproject.h"
+#include "qgsmapcanvas.h"
 
 #include 
 #include 
@@ -173,6 +176,13 @@ void QgsAttributeActionDialog::insertExpression()
   // display the expression builder
   QgsExpressionBuilderDialog dlg( mActions->layer(), selText, this );
   dlg.setWindowTitle( tr( "Insert expression" ) );
+
+  QgsDistanceArea myDa;
+  myDa.setSourceCrs( mActions->layer()->crs().srsid() );
+  myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+  myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+  dlg.setGeomCalculator( myDa );
+
   if ( dlg.exec() == QDialog::Accepted )
   {
     QString expression =  dlg.expressionBuilder()->expressionText();
@@ -330,7 +340,7 @@ void QgsAttributeActionDialog::addDefaultActions()
   insertRow( pos++, QgsAction::GenericPython, tr( "Selected field's value (Identify features tool)" ), "QtGui.QMessageBox.information(None, \"Current field's value\", \"[% $currentfield %]\")", false );
   insertRow( pos++, QgsAction::GenericPython, tr( "Clicked coordinates (Run feature actions tool)" ), "QtGui.QMessageBox.information(None, \"Clicked coords\", \"layer: [% $layerid %]\\ncoords: ([% $clickx %],[% $clickx %])\")", false );
   insertRow( pos++, QgsAction::OpenUrl, tr( "Open file" ), "[% \"PATH\" %]", false );
-  insertRow( pos++, QgsAction::OpenUrl, tr( "Search on web based on attribute's value" ), "http://www.google.it/?q=[% \"ATTRIBUTE\" %]", false );
+  insertRow( pos++, QgsAction::OpenUrl, tr( "Search on web based on attribute's value" ), "http://www.google.com/search?q=[% \"ATTRIBUTE\" %]", false );
 }
 
 void QgsAttributeActionDialog::itemSelectionChanged()
diff --git a/src/app/qgsattributedialog.cpp b/src/app/qgsattributedialog.cpp
index 81238eebddf8..665ea2f891f3 100644
--- a/src/app/qgsattributedialog.cpp
+++ b/src/app/qgsattributedialog.cpp
@@ -17,7 +17,8 @@
 #include "qgsattributedialog.h"
 #include "qgsfield.h"
 #include "qgslogger.h"
-
+#include "qgsmapcanvas.h"
+#include "qgsproject.h"
 #include "qgsvectorlayer.h"
 #include "qgsvectordataprovider.h"
 #include "qgsuniquevaluerenderer.h"
@@ -65,8 +66,9 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
 
   QDialogButtonBox *buttonBox = NULL;
 
-  if ( !vl->editForm().isEmpty() )
+  if ( vl->editorLayout() == QgsVectorLayer::UiFileLayout && !vl->editForm().isEmpty() )
   {
+    // UI-File defined layout
     QFile file( vl->editForm() );
 
     if ( file.open( QFile::ReadOnly ) )
@@ -82,6 +84,43 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
       buttonBox = myWidget->findChild();
     }
   }
+  else if ( vl->editorLayout() == QgsVectorLayer::TabLayout )
+  {
+    // Tab display
+    mDialog = new QDialog( QgisApp::instance() );
+
+    QGridLayout *gridLayout;
+    QTabWidget *tabWidget;
+
+    mDialog->resize( 447, 343 );
+    gridLayout = new QGridLayout( mDialog );
+    gridLayout->setObjectName( QString::fromUtf8( "gridLayout" ) );
+
+    tabWidget = new QTabWidget( mDialog );
+    gridLayout->addWidget( tabWidget );
+
+    for ( QList::const_iterator tIt = vl->attributeEditorElements().begin(); tIt != vl->attributeEditorElements().end(); ++tIt )
+    {
+      QgsAttributeEditorElement* widgDef = *tIt;
+
+      QWidget* tabPage = new QWidget( tabWidget );
+      tabWidget->addTab( tabPage, widgDef->name() );
+      QGridLayout *tabPageLayout = new QGridLayout( tabPage );
+
+      if ( widgDef->type() == QgsAttributeEditorElement::AeTypeContainer )
+      {
+        tabPageLayout->addWidget( QgsAttributeEditor::createWidgetFromDef( widgDef, tabPage, vl, myAttributes, mProxyWidgets, false ) );
+      }
+      else
+      {
+        QgsDebugMsg( "No support for fields in attribute editor on top level" );
+      }
+    }
+
+    buttonBox = new QDialogButtonBox( mDialog );
+    buttonBox->setObjectName( QString::fromUtf8( "buttonBox" ) );
+    gridLayout->addWidget( buttonBox );
+  }
 
   if ( !mDialog )
   {
@@ -111,19 +150,24 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
     //
     QVBoxLayout *mypOuterLayout = new QVBoxLayout();
     mypOuterLayout->setContentsMargins( 0, 0, 0, 0 );
-    //transfers layout ownership so no need to call delete
 
+    //transfers layout ownership so no need to call delete
     mFrame->setLayout( mypOuterLayout );
+
     QScrollArea *mypScrollArea = new QScrollArea();
     mypScrollArea->setFrameShape( QFrame::NoFrame );
     mypScrollArea->setFrameShadow( QFrame::Plain );
+
     //transfers scroll area ownership so no need to call delete
     mypOuterLayout->addWidget( mypScrollArea );
+
     QFrame *mypInnerFrame = new QFrame();
     mypInnerFrame->setFrameShape( QFrame::NoFrame );
     mypInnerFrame->setFrameShadow( QFrame::Plain );
+
     //transfers frame ownership so no need to call delete
     mypScrollArea->setWidget( mypInnerFrame );
+
     mypScrollArea->setWidgetResizable( true );
     QGridLayout *mypInnerLayout = new QGridLayout( mypInnerFrame );
 
@@ -134,7 +178,7 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
       QString myFieldName = vl->attributeDisplayName( it.key() );
       int myFieldType = it->type();
 
-      QWidget *myWidget = QgsAttributeEditor::createAttributeEditor( 0, 0, vl, it.key(), myAttributes.value( it.key(), QVariant() ) );
+      QWidget *myWidget = QgsAttributeEditor::createAttributeEditor( 0, 0, vl, it.key(), myAttributes.value( it.key(), QVariant() ), mProxyWidgets );
       if ( !myWidget )
         continue;
 
@@ -164,34 +208,41 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
       }
 
       mypInnerLayout->addWidget( myWidget, index, 1 );
-      mpIndizes << it.key();
-      mpWidgets << myWidget;
       ++index;
     }
 
     // Set focus to first widget in list, to help entering data without moving the mouse.
-    if ( mpWidgets.size() > 0 )
+    if ( mypInnerLayout->rowCount() > 0 )
     {
-      mpWidgets.first()->setFocus( Qt::OtherFocusReason );
+      QWidget* widget = mypInnerLayout->itemAtPosition( 0, 1 )->widget();
+      if ( widget )
+        widget->setFocus( Qt::OtherFocusReason );
     }
   }
   else
   {
+
+    QgsDistanceArea myDa;
+
+    myDa.setSourceCrs( vl->crs().srsid() );
+    myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+    myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+
     for ( QgsFieldMap::const_iterator it = theFieldMap.begin(); it != theFieldMap.end(); ++it )
     {
-      QWidget *myWidget = mDialog->findChild( it->name() );
-      if ( !myWidget )
+      QList myWidgets = mDialog->findChildren( it->name() );
+      if ( !myWidgets.size() )
         continue;
 
-      QgsAttributeEditor::createAttributeEditor( mDialog, myWidget, vl, it.key(), myAttributes.value( it.key(), QVariant() ) );
-
-      if ( vl->editType( it.key() ) != QgsVectorLayer::Immutable )
+      for ( QList::const_iterator itw = myWidgets.begin(); itw != myWidgets.end(); ++itw )
       {
-        myWidget->setEnabled( vl->isEditable() );
-      }
+        QgsAttributeEditor::createAttributeEditor( mDialog, *itw, vl, it.key(), myAttributes.value( it.key(), QVariant() ), mProxyWidgets );
 
-      mpIndizes << it.key();
-      mpWidgets << myWidget;
+        if ( vl->editType( it.key() ) != QgsVectorLayer::Immutable )
+        {
+          ( *itw )->setEnabled(( *itw )->isEnabled() && vl->isEditable() );
+        }
+      }
     }
 
     foreach ( QLineEdit *le, mDialog->findChildren() )
@@ -217,6 +268,8 @@ QgsAttributeDialog::QgsAttributeDialog( QgsVectorLayer *vl, QgsFeature *thepFeat
         }
       }
 
+      exp.setGeomCalculator( myDa );
+
       QVariant value = exp.evaluate( mFeature, vl->pendingFields() );
 
       if ( !exp.hasEvalError() )
@@ -344,16 +397,14 @@ void QgsAttributeDialog::accept()
     return;
 
   //write the new values back to the feature
-  int myIndex = 0;
   for ( QgsFieldMap::const_iterator it = mLayer->pendingFields().begin(); it != mLayer->pendingFields().end(); ++it )
   {
+    int idx = it.key();
+
     QVariant value;
 
-    int idx = mpIndizes.value( myIndex );
-    if ( QgsAttributeEditor::retrieveValue( mpWidgets.value( myIndex ), mLayer, idx, value ) )
+    if ( QgsAttributeEditor::retrieveValue( mProxyWidgets.value( idx ), mLayer, idx, value ) )
       mFeature->changeAttribute( idx, value );
-
-    ++myIndex;
   }
 }
 
diff --git a/src/app/qgsattributedialog.h b/src/app/qgsattributedialog.h
index 7efdb18b824d..40490ef4dc02 100644
--- a/src/app/qgsattributedialog.h
+++ b/src/app/qgsattributedialog.h
@@ -62,8 +62,8 @@ class QgsAttributeDialog : public QObject
 
     QDialog *mDialog;
     QString mSettingsPath;
-    QList mpWidgets;
-    QList mpIndizes;
+    // Used to sync multiple widgets for the same field
+    QMap mProxyWidgets;
     QgsVectorLayer *mLayer;
     QgsFeature *mFeature;
     bool mFeatureOwner;
diff --git a/src/app/qgsattributetabledialog.cpp b/src/app/qgsattributetabledialog.cpp
index 0b64d733be87..6153a5fa9fef 100644
--- a/src/app/qgsattributetabledialog.cpp
+++ b/src/app/qgsattributetabledialog.cpp
@@ -32,6 +32,7 @@
 #include "qgssearchquerybuilder.h"
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
+#include "qgsproject.h"
 #include "qgsfieldcalculator.h"
 #include "qgsfeatureaction.h"
 #include "qgsattributeaction.h"
@@ -536,6 +537,13 @@ void QgsAttributeTableDialog::updateSelectionFromLayer()
 
 void QgsAttributeTableDialog::doSearch( QString searchString )
 {
+
+  QgsDistanceArea myDa;
+
+  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+  myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+
   // parse search string and build parsed tree
   QgsExpression search( searchString );
   if ( search.hasParserError() )
@@ -556,6 +564,7 @@ void QgsAttributeTableDialog::doSearch( QString searchString )
   QApplication::setOverrideCursor( Qt::WaitCursor );
   mSelectedFeatures.clear();
 
+  search.setGeomCalculator( myDa );
   if ( cbxSearchSelectedOnly->isChecked() )
   {
     QgsFeatureList selectedFeatures = mLayer->selectedFeatures();
diff --git a/src/app/qgsbrowserdockwidget.cpp b/src/app/qgsbrowserdockwidget.cpp
index 11670d0e6f4e..dac67706bb9c 100644
--- a/src/app/qgsbrowserdockwidget.cpp
+++ b/src/app/qgsbrowserdockwidget.cpp
@@ -20,9 +20,9 @@
 #include 
 #include 
 #include 
+#include 
 
 #include "qgsbrowsermodel.h"
-#include "qgsdataitem.h"
 #include "qgslogger.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsrasterlayer.h"
@@ -33,6 +33,8 @@
 #include "qgsapplication.h"
 #include "qgsmapcanvas.h"
 #include 
+#include 
+
 
 #include 
 /**
@@ -81,61 +83,183 @@ class QgsBrowserTreeView : public QTreeView
     }
 };
 
+/**
+Utility class for filtering browser items
+ */
+class QgsBrowserTreeFilterProxyModel : public QSortFilterProxyModel
+{
+  public:
+
+    QgsBrowserTreeFilterProxyModel( QObject *parent )
+        : QSortFilterProxyModel( parent ), mModel( 0 ),
+        mFilter( "" ), mPatternSyntax( QRegExp::Wildcard )
+    {
+      setDynamicSortFilter( true );
+    }
+
+    void setBrowserModel( QgsBrowserModel* model )
+    {
+      mModel = model;
+      setSourceModel( model );
+    }
+
+    void setFilterSyntax( const QRegExp::PatternSyntax & syntax )
+    {
+      QgsDebugMsg( QString( "syntax = %1" ).arg(( int ) mPatternSyntax ) );
+      if ( mPatternSyntax == syntax )
+        return;
+      mPatternSyntax = syntax;
+      updateFilter();
+    }
+
+    void setFilter( const QString & filter )
+    {
+      QgsDebugMsg( QString( "filter = %1" ).arg( mFilter ) );
+      if ( mFilter == filter )
+        return;
+      mFilter = filter;
+      updateFilter();
+    }
+
+    void updateFilter( )
+    {
+      QgsDebugMsg( QString( "filter = %1 syntax = %2" ).arg( mFilter ).arg(( int ) mPatternSyntax ) );
+      mREList.clear();
+      if ( mPatternSyntax == QRegExp::Wildcard ||
+           mPatternSyntax == QRegExp::WildcardUnix )
+      {
+        foreach ( QString f, mFilter.split( "|" ) )
+        {
+          QRegExp rx( f.trimmed() );
+          rx.setPatternSyntax( mPatternSyntax );
+          mREList.append( rx );
+        }
+      }
+      else
+      {
+        QRegExp rx( mFilter.trimmed() );
+        rx.setPatternSyntax( mPatternSyntax );
+        mREList.append( rx );
+      }
+      invalidateFilter();
+    }
+
+  protected:
+
+    QgsBrowserModel* mModel;
+    QString mFilter; //filter string provided
+    QVector mREList; //list of filters, seperated by "|"
+    QRegExp::PatternSyntax mPatternSyntax;
+
+    bool filterAcceptsString( const QString & value ) const
+    {
+      if ( mPatternSyntax == QRegExp::Wildcard ||
+           mPatternSyntax == QRegExp::WildcardUnix )
+      {
+        foreach ( QRegExp rx, mREList )
+        {
+          QgsDebugMsg( QString( "value: [%1] rx: [%2] match: %3" ).arg( value ).arg( rx.pattern() ).arg( rx.exactMatch( value ) ) );
+          if ( rx.exactMatch( value ) )
+            return true;
+        }
+      }
+      else
+      {
+        foreach ( QRegExp rx, mREList )
+        {
+          QgsDebugMsg( QString( "value: [%1] rx: [%2] match: %3" ).arg( value ).arg( rx.pattern() ).arg( rx.indexIn( value ) ) );
+          if ( rx.indexIn( value ) != -1 )
+            return true;
+        }
+      }
+      return false;
+    }
+
+    bool filterAcceptsRow( int sourceRow,
+                           const QModelIndex &sourceParent ) const
+    {
+      // if ( filterRegExp().pattern() == QString( "" ) ) return true;
+      if ( mFilter == "" ) return true;
+
+      QModelIndex index = sourceModel()->index( sourceRow, 0, sourceParent );
+      QgsDataItem* item = mModel->dataItem( index );
+      QgsDataItem* parentItem = mModel->dataItem( sourceParent );
+
+      // accept "invalid" items and data collections
+      if ( ! item )
+        return true;
+      if ( qobject_cast( item ) )
+        return true;
+
+      // filter layer items - this could be delegated to the providers but a little overkill
+      if ( parentItem && qobject_cast( item ) )
+      {
+        // filter normal files by extension
+        if ( qobject_cast( parentItem ) )
+        {
+          QFileInfo fileInfo( item->path() );
+          return filterAcceptsString( fileInfo.fileName() );
+        }
+        // filter other items (postgis, etc.) by name
+        else if ( qobject_cast( parentItem ) )
+        {
+          return filterAcceptsString( item->name() );
+        }
+      }
+
+      // accept anything else
+      return true;
+    }
+
+};
 QgsBrowserDockWidget::QgsBrowserDockWidget( QWidget * parent ) :
-    QDockWidget( parent ), mModel( NULL )
+    QDockWidget( parent ), mModel( NULL ), mProxyModel( NULL )
 {
+  setupUi( this );
+
   setWindowTitle( tr( "Browser" ) );
 
   mBrowserView = new QgsBrowserTreeView( this );
-
-  QToolButton* refreshButton = new QToolButton( this );
-  refreshButton->setIcon( QgsApplication::getThemeIcon( "mActionDraw.png" ) );
-  // remove this to save space
-  refreshButton->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
-  refreshButton->setText( tr( "Refresh" ) );
-  refreshButton->setToolTip( tr( "Refresh" ) );
-  refreshButton->setAutoRaise( true );
-  connect( refreshButton, SIGNAL( clicked() ), this, SLOT( refresh() ) );
-
-  QToolButton* addLayersButton = new QToolButton( this );
-  addLayersButton->setIcon( QgsApplication::getThemeIcon( "mActionAddLayer.png" ) );
-  // remove this to save space
-  addLayersButton->setToolButtonStyle( Qt::ToolButtonTextBesideIcon );
-  addLayersButton->setText( tr( "Add Selection" ) );
-  addLayersButton->setToolTip( tr( "Add Selected Layers" ) );
-  addLayersButton->setAutoRaise( true );
-  connect( addLayersButton, SIGNAL( clicked() ), this, SLOT( addSelectedLayers() ) );
-
-  QToolButton* collapseButton = new QToolButton( this );
-  collapseButton->setIcon( QgsApplication::getThemeIcon( "mActionCollapseTree.png" ) );
-  collapseButton->setToolTip( tr( "Collapse All" ) );
-  collapseButton->setAutoRaise( true );
-  connect( collapseButton, SIGNAL( clicked() ), mBrowserView, SLOT( collapseAll() ) );
-
-  QVBoxLayout* layout = new QVBoxLayout();
-  QHBoxLayout* hlayout = new QHBoxLayout();
-  layout->setContentsMargins( 0, 0, 0, 0 );
-  layout->setSpacing( 0 );
-  hlayout->setContentsMargins( 0, 0, 0, 0 );
-  hlayout->setSpacing( 5 );
-  hlayout->setAlignment( Qt::AlignLeft );
-
-  hlayout->addSpacing( 5 );
-  hlayout->addWidget( refreshButton );
-  hlayout->addSpacing( 5 );
-  hlayout->addWidget( addLayersButton );
-  hlayout->addStretch( );
-  hlayout->addWidget( collapseButton );
-  layout->addLayout( hlayout );
-  layout->addWidget( mBrowserView );
-
-  QWidget* innerWidget = new QWidget( this );
-  innerWidget->setLayout( layout );
-  setWidget( innerWidget );
+  mLayoutBrowser->addWidget( mBrowserView );
+
+  mBtnRefresh->setIcon( QgsApplication::getThemeIcon( "mActionRefresh.png" ) );
+  mBtnAddLayers->setIcon( QgsApplication::getThemeIcon( "mActionAdd.png" ) );
+  mBtnCollapse->setIcon( QgsApplication::getThemeIcon( "mActionCollapseTree.png" ) );
+
+  mWidgetFilter->hide();
+  // icons from http://www.fatcow.com/free-icons License: CC Attribution 3.0
+  mBtnFilterShow->setIcon( QgsApplication::getThemeIcon( "mActionFilter.png" ) );
+  mBtnFilter->setIcon( QgsApplication::getThemeIcon( "mActionFilter.png" ) );
+
+  QMenu* menu = new QMenu( this );
+  menu->setSeparatorsCollapsible( false );
+  mBtnFilterOptions->setMenu( menu );
+  QActionGroup* group = new QActionGroup( menu );
+  QAction* action = new QAction( tr( "Filter Pattern Syntax" ), group );
+  action->setSeparator( true );
+  menu->addAction( action );
+  action = new QAction( tr( "Wildcard(s)" ), group );
+  action->setData( QVariant(( int ) QRegExp::Wildcard ) );
+  action->setCheckable( true );
+  action->setChecked( true );
+  menu->addAction( action );
+  action = new QAction( tr( "Regular Expression" ), group );
+  action->setData( QVariant(( int ) QRegExp::RegExp ) );
+  action->setCheckable( true );
+  menu->addAction( action );
+
+  connect( mBtnRefresh, SIGNAL( clicked() ), this, SLOT( refresh() ) );
+  connect( mBtnAddLayers, SIGNAL( clicked() ), this, SLOT( addSelectedLayers() ) );
+  connect( mBtnCollapse, SIGNAL( clicked() ), mBrowserView, SLOT( collapseAll() ) );
+  connect( mBtnFilterShow, SIGNAL( toggled( bool ) ), this, SLOT( showFilterWidget( bool ) ) );
+  connect( mBtnFilter, SIGNAL( clicked() ), this, SLOT( setFilter() ) );
+  connect( mLeFilter, SIGNAL( returnPressed() ), this, SLOT( setFilter() ) );
+  connect( mLeFilter, SIGNAL( cleared() ), this, SLOT( setFilter() ) );
+  // connect( mLeFilter, SIGNAL( textChanged( const QString & ) ), this, SLOT( setFilter() ) );
+  connect( group, SIGNAL( triggered( QAction * ) ), this, SLOT( setFilterSyntax( QAction * ) ) );
 
   connect( mBrowserView, SIGNAL( customContextMenuRequested( const QPoint & ) ), this, SLOT( showContextMenu( const QPoint & ) ) );
   connect( mBrowserView, SIGNAL( doubleClicked( const QModelIndex& ) ), this, SLOT( addLayerAtIndex( const QModelIndex& ) ) );
-
 }
 
 void QgsBrowserDockWidget::showEvent( QShowEvent * e )
@@ -144,8 +268,10 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
   if ( mModel == NULL )
   {
     mModel = new QgsBrowserModel( mBrowserView );
-    mBrowserView->setModel( mModel );
 
+    mProxyModel = new QgsBrowserTreeFilterProxyModel( this );
+    mProxyModel->setBrowserModel( mModel );
+    mBrowserView->setModel( mProxyModel );
     // provide a horizontal scroll bar instead of using ellipse (...) for longer items
     mBrowserView->setTextElideMode( Qt::ElideNone );
     mBrowserView->header()->setResizeMode( 0, QHeaderView::ResizeToContents );
@@ -166,8 +292,8 @@ void QgsBrowserDockWidget::showEvent( QShowEvent * e )
 
 void QgsBrowserDockWidget::showContextMenu( const QPoint & pt )
 {
-  QModelIndex idx = mBrowserView->indexAt( pt );
-  QgsDataItem* item = mModel->dataItem( idx );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->indexAt( pt ) );
+  QgsDataItem* item = mModel->dataItem( index );
   if ( !item )
     return;
 
@@ -189,14 +315,17 @@ void QgsBrowserDockWidget::showContextMenu( const QPoint & pt )
       // only favourites can be removed
       menu->addAction( tr( "Remove favourite" ), this, SLOT( removeFavourite() ) );
     }
-
+    menu->addAction( tr( "Properties" ), this, SLOT( showProperties( ) ) );
+    QAction *action = menu->addAction( tr( "Fast scan this dir." ), this, SLOT( toggleFastScan( ) ) );
+    action->setCheckable( true );
+    action->setChecked( settings.value( "/qgis/scanItemsFastScanUris",
+                                        QStringList() ).toStringList().contains( item->path() ) );
   }
   else if ( item->type() == QgsDataItem::Layer )
   {
     menu->addAction( tr( "Add Layer" ), this, SLOT( addCurrentLayer( ) ) );
     menu->addAction( tr( "Add Selected Layers" ), this, SLOT( addSelectedLayers() ) );
     menu->addAction( tr( "Properties" ), this, SLOT( showProperties( ) ) );
-
   }
   else if ( item->type() == QgsDataItem::Favourites )
   {
@@ -224,7 +353,8 @@ void QgsBrowserDockWidget::showContextMenu( const QPoint & pt )
 
 void QgsBrowserDockWidget::addFavourite()
 {
-  QgsDataItem* item = mModel->dataItem( mBrowserView->currentIndex() );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->currentIndex() );
+  QgsDataItem* item = mModel->dataItem( index );
   if ( !item )
     return;
 
@@ -256,7 +386,9 @@ void QgsBrowserDockWidget::addFavouriteDirectory( QString favDir )
 
 void QgsBrowserDockWidget::removeFavourite()
 {
-  QgsDataItem* item = mModel->dataItem( mBrowserView->currentIndex() );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->currentIndex() );
+  QgsDataItem* item = mModel->dataItem( index );
+
   if ( !item )
     return;
   if ( item->type() != QgsDataItem::Directory )
@@ -301,7 +433,8 @@ void QgsBrowserDockWidget::refreshModel( const QModelIndex& index )
   for ( int i = 0 ; i < mModel->rowCount( index ); i++ )
   {
     QModelIndex idx = mModel->index( i, 0, index );
-    if ( mBrowserView->isExpanded( idx ) || !mModel->hasChildren( idx ) )
+    QModelIndex proxyIdx = mProxyModel->mapFromSource( idx );
+    if ( mBrowserView->isExpanded( proxyIdx ) || !mModel->hasChildren( proxyIdx ) )
     {
       refreshModel( idx );
     }
@@ -333,11 +466,11 @@ void QgsBrowserDockWidget::addLayer( QgsLayerItem *layerItem )
 
 void QgsBrowserDockWidget::addLayerAtIndex( const QModelIndex& index )
 {
-  QgsDataItem *dataItem = mModel->dataItem( index );
+  QgsDataItem *item = mModel->dataItem( mProxyModel->mapToSource( index ) );
 
-  if ( dataItem != NULL && dataItem->type() == QgsDataItem::Layer )
+  if ( item != NULL && item->type() == QgsDataItem::Layer )
   {
-    QgsLayerItem *layerItem = qobject_cast( dataItem );
+    QgsLayerItem *layerItem = qobject_cast( item );
     if ( layerItem != NULL )
     {
       QApplication::setOverrideCursor( Qt::WaitCursor );
@@ -363,11 +496,10 @@ void QgsBrowserDockWidget::addSelectedLayers()
   // add items in reverse order so they are in correct order in the layers dock
   for ( int i = list.size() - 1; i >= 0; i-- )
   {
-    QModelIndex index = list[i];
-    QgsDataItem *dataItem = mModel->dataItem( index );
-    if ( dataItem && dataItem->type() == QgsDataItem::Layer )
+    QgsDataItem *item = mModel->dataItem( mProxyModel->mapToSource( list[i] ) );
+    if ( item && item->type() == QgsDataItem::Layer )
     {
-      QgsLayerItem *layerItem = qobject_cast( dataItem );
+      QgsLayerItem *layerItem = qobject_cast( item );
       if ( layerItem )
         addLayer( layerItem );
     }
@@ -378,12 +510,14 @@ void QgsBrowserDockWidget::addSelectedLayers()
 
 void QgsBrowserDockWidget::showProperties( )
 {
-  QgsDebugMsg( "Entered" );
-  QgsDataItem* dataItem = mModel->dataItem( mBrowserView->currentIndex() );
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->currentIndex() );
+  QgsDataItem* item = mModel->dataItem( index );
+  if ( ! item )
+    return;
 
-  if ( dataItem != NULL && dataItem->type() == QgsDataItem::Layer )
+  if ( item->type() == QgsDataItem::Layer )
   {
-    QgsLayerItem *layerItem = qobject_cast( dataItem );
+    QgsLayerItem *layerItem = qobject_cast( item );
     if ( layerItem != NULL )
     {
       QgsMapLayer::LayerType type = layerItem->mapLayerType();
@@ -458,4 +592,69 @@ void QgsBrowserDockWidget::showProperties( )
       dialog->show();
     }
   }
+  else if ( item->type() == QgsDataItem::Directory )
+  {
+    // initialize dialog
+    QDialog *dialog = new QDialog( this );
+    Ui::QgsBrowserDirectoryPropertiesBase ui;
+    ui.setupUi( dialog );
+
+    dialog->setWindowTitle( tr( "Directory Properties" ) );
+    ui.leSource->setText( item->path() );
+    QgsDirectoryParamWidget *paramWidget = new QgsDirectoryParamWidget( item->path(), dialog );
+    ui.lytWidget->addWidget( paramWidget );
+
+    dialog->show();
+  }
+}
+
+void QgsBrowserDockWidget::toggleFastScan( )
+{
+  QModelIndex index = mProxyModel->mapToSource( mBrowserView->currentIndex() );
+  QgsDataItem* item = mModel->dataItem( index );
+  if ( ! item )
+    return;
+
+  if ( item->type() == QgsDataItem::Directory )
+  {
+    QSettings settings;
+    QStringList fastScanDirs = settings.value( "/qgis/scanItemsFastScanUris",
+                               QStringList() ).toStringList();
+    int idx = fastScanDirs.indexOf( item->path() );
+    if ( idx != -1 )
+    {
+      fastScanDirs.removeAt( idx );
+    }
+    else
+    {
+      fastScanDirs << item->path();
+    }
+    settings.setValue( "/qgis/scanItemsFastScanUris", fastScanDirs );
+  }
+}
+
+
+
+void QgsBrowserDockWidget::showFilterWidget( bool visible )
+{
+  mWidgetFilter->setVisible( visible );
+  if ( ! visible )
+  {
+    mLeFilter->setText( "" );
+    setFilter();
+  }
+}
+
+void QgsBrowserDockWidget::setFilter( )
+{
+  QString filter = mLeFilter->text();
+  if ( mProxyModel )
+    mProxyModel->setFilter( filter );
+}
+
+void QgsBrowserDockWidget::setFilterSyntax( QAction * action )
+{
+  if ( !action || ! mProxyModel )
+    return;
+  mProxyModel->setFilterSyntax(( QRegExp::PatternSyntax ) action->data().toInt() );
 }
diff --git a/src/app/qgsbrowserdockwidget.h b/src/app/qgsbrowserdockwidget.h
index 714276046c08..eac527d7d2b2 100644
--- a/src/app/qgsbrowserdockwidget.h
+++ b/src/app/qgsbrowserdockwidget.h
@@ -16,13 +16,16 @@
 #define QGSBROWSERDOCKWIDGET_H
 
 #include 
+#include 
 
 class QgsBrowserModel;
 class QModelIndex;
-class QTreeView;
+class QgsBrowserTreeView;
 class QgsLayerItem;
+class QgsDataItem;
+class QgsBrowserTreeFilterProxyModel;
 
-class QgsBrowserDockWidget : public QDockWidget
+class QgsBrowserDockWidget : public QDockWidget, private Ui::QgsBrowserDockWidgetBase
 {
     Q_OBJECT
   public:
@@ -40,10 +43,15 @@ class QgsBrowserDockWidget : public QDockWidget
 
     void refresh();
 
+    void showFilterWidget( bool visible );
+    void setFilterSyntax( QAction * );
+    void setFilter();
+
     // layer menu items
     void addCurrentLayer();
     void addSelectedLayers();
     void showProperties();
+    void toggleFastScan();
 
   protected:
     void addFavouriteDirectory( QString favDir );
@@ -54,8 +62,11 @@ class QgsBrowserDockWidget : public QDockWidget
 
     void addLayer( QgsLayerItem *layerItem );
 
-    QTreeView* mBrowserView;
+    // removed dataItem(), call mModel->dataItem directly (to avoid passing index from the wrong model)
+
+    QgsBrowserTreeView* mBrowserView;
     QgsBrowserModel* mModel;
+    QgsBrowserTreeFilterProxyModel* mProxyModel;
 };
 
 #endif // QGSBROWSERDOCKWIDGET_H
diff --git a/src/app/qgscustomization.cpp b/src/app/qgscustomization.cpp
index 4a1cf1c74d15..b4333179a2a6 100644
--- a/src/app/qgscustomization.cpp
+++ b/src/app/qgscustomization.cpp
@@ -46,6 +46,7 @@ QgsCustomizationDialog::QgsCustomizationDialog( QWidget *parent, QSettings* sett
 {
   mSettings = settings;
   setupUi( this );
+
   init();
   QStringList myHeaders;
   myHeaders << tr( "Object name" ) << tr( "Label" ) << tr( "Description" );
@@ -181,6 +182,12 @@ void QgsCustomizationDialog::reset()
 {
   mSettings->sync();
   settingsToTree( mSettings );
+
+  QSettings settings;
+  bool enabled = settings.value( "/UI/Customization/enabled", "false" ).toString() == "true";
+  mCustomizationEnabledCheckBox->setChecked( enabled );
+  treeWidget->setEnabled( enabled );
+  toolBar->setEnabled( enabled );
 }
 
 void QgsCustomizationDialog::ok()
@@ -194,6 +201,9 @@ void QgsCustomizationDialog::apply()
   treeToSettings( mSettings );
   mSettings->setValue( QgsCustomization::instance()->statusPath(), QgsCustomization::User );
   mSettings->sync();
+
+  QSettings settings;
+  settings.setValue( "/UI/Customization/enabled", mCustomizationEnabledCheckBox->isChecked() );
 }
 
 void QgsCustomizationDialog::cancel()
@@ -263,6 +273,12 @@ void QgsCustomizationDialog::on_actionSelectAll_triggered( bool checked )
   }
 }
 
+void QgsCustomizationDialog::on_mCustomizationEnabledCheckBox_toggled( bool checked )
+{
+  treeWidget->setEnabled( checked );
+  toolBar->setEnabled( checked );
+}
+
 void QgsCustomizationDialog::init()
 {
   QgsDebugMsg( "Entered" );
@@ -538,7 +554,7 @@ void QgsCustomization::createTreeItemToolbars( )
 void QgsCustomization::createTreeItemDocks( )
 {
   QStringList data;
-  data << "Docks";
+  data << "Panels";
 
   QTreeWidgetItem *topItem = new QTreeWidgetItem( data );
 
@@ -598,10 +614,13 @@ QgsCustomization *QgsCustomization::instance()
 
 QgsCustomization::QgsCustomization()
     : pDialog( 0 )
-    , mEnabled( true )
+    , mEnabled( false )
     , mStatusPath( "/Customization/status" )
 {
   QgsDebugMsg( "Entered" );
+
+  QSettings settings;
+  mEnabled = settings.value( "/UI/Customization/enabled", "false" ).toString() == "true";
 }
 
 QgsCustomization::~QgsCustomization()
diff --git a/src/app/qgscustomization.h b/src/app/qgscustomization.h
index 95c6ee4e9b32..b767de79c73b 100644
--- a/src/app/qgscustomization.h
+++ b/src/app/qgscustomization.h
@@ -89,6 +89,8 @@ class QgsCustomizationDialog : public QMainWindow, private Ui::QgsCustomizationD
     void on_actionCollapseAll_triggered( bool checked );
     void on_actionSelectAll_triggered( bool checked );
 
+    void on_mCustomizationEnabledCheckBox_toggled( bool checked );
+
   private:
     void init();
     QTreeWidgetItem * createTreeItemWidgets( );
diff --git a/src/app/qgsdiagramproperties.cpp b/src/app/qgsdiagramproperties.cpp
index d3b46c6a6103..eb14d269fd72 100644
--- a/src/app/qgsdiagramproperties.cpp
+++ b/src/app/qgsdiagramproperties.cpp
@@ -303,11 +303,15 @@ void QgsDiagramProperties::on_mDiagramTypeComboBox_currentIndexChanged( int inde
   {
     mLabelPlacementComboBox->show();
     mLabelPlacementLabel->show();
+    mBackgroundColorLabel->show();
+    mBackgroundColorButton->show();
   }
   else
   {
     mLabelPlacementComboBox->hide();
     mLabelPlacementLabel->hide();
+    mBackgroundColorLabel->hide();
+    mBackgroundColorButton->hide();
   }
 
   if ( DIAGRAM_NAME_HISTOGRAM == diagramType )
diff --git a/src/app/qgsfieldcalculator.cpp b/src/app/qgsfieldcalculator.cpp
index 2178504ce88d..40687ba7064a 100644
--- a/src/app/qgsfieldcalculator.cpp
+++ b/src/app/qgsfieldcalculator.cpp
@@ -13,12 +13,17 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgisapp.h"
 #include "qgsfieldcalculator.h"
+#include "qgsdistancearea.h"
 #include "qgsexpression.h"
+#include "qgsmapcanvas.h"
+#include "qgsproject.h"
 #include "qgsvectordataprovider.h"
 #include "qgsvectorlayer.h"
 
 #include 
+#include 
 
 QgsFieldCalculator::QgsFieldCalculator( QgsVectorLayer* vl )
     : QDialog()
@@ -78,6 +83,15 @@ QgsFieldCalculator::~QgsFieldCalculator()
 
 void QgsFieldCalculator::accept()
 {
+
+  // Set up QgsDistanceArea each time we (re-)calculate
+  QgsDistanceArea myDa;
+
+  myDa.setSourceCrs( mVectorLayer->crs().srsid() );
+  myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+  myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+
+
   QString calcString = builder->expressionText();
   QgsExpression exp( calcString );
 
@@ -163,6 +177,7 @@ void QgsFieldCalculator::accept()
     }
 
     exp.setCurrentRowNumber( rownum );
+    exp.setGeomCalculator( myDa );
 
     QVariant value = exp.evaluate( &feature );
     if ( exp.hasEvalError() )
diff --git a/src/app/qgsfieldsproperties.cpp b/src/app/qgsfieldsproperties.cpp
new file mode 100644
index 000000000000..bfb586cf33b8
--- /dev/null
+++ b/src/app/qgsfieldsproperties.cpp
@@ -0,0 +1,893 @@
+/***************************************************************************
+    qgsfieldsproperties.cpp
+    ---------------------
+    begin                : September 2012
+    copyright            : (C) 2012 by Matthias Kuhn
+    email                : matthias dot kuhn at gmx dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsfieldsproperties.h"
+#include "qgsvectorlayer.h"
+#include "qgsapplication.h"
+#include "qgslogger.h"
+#include "qgsmaplayerregistry.h"
+#include "qgsattributetypedialog.h"
+#include "qgsaddattrdialog.h"
+#include "qgsfieldcalculator.h"
+#include "qgsvectordataprovider.h"
+#include "qgsaddtaborgroup.h"
+
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+#include 
+
+QTreeWidgetItem* QgsAttributesTree::addContainer( QTreeWidgetItem* parent, QString title )
+{
+  QTreeWidgetItem *newItem = new QTreeWidgetItem( QList() << title );
+  newItem->setBackground( 0 , QBrush( Qt::lightGray ) );
+  newItem->setFlags( Qt::ItemIsEditable | Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled );
+  newItem->setData( 0 , Qt::UserRole , "container" );
+  newItem->setExpanded( true );
+  parent->addChild( newItem );
+  return newItem;
+}
+
+QTreeWidgetItem* QgsAttributesTree::addItem( QTreeWidgetItem* parent , QString fieldName )
+{
+  QTreeWidgetItem* attributeItem = new QTreeWidgetItem( QList() << fieldName );
+  attributeItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable | Qt::ItemIsDragEnabled );
+  attributeItem->setData( 0 , Qt::UserRole , "field" );
+  parent->addChild( attributeItem );
+
+  return attributeItem;
+}
+
+/*
+ * Is called when mouse is moved over attributes tree before a
+ * drop event. Used to inhibit dropping fields onto the root item.
+ */
+
+void QgsAttributesTree::dragMoveEvent( QDragMoveEvent *event )
+{
+  QTreeWidgetItem* targetItem = itemAt( event->pos() );
+  const QMimeData* data = event->mimeData();
+
+  if ( data->hasFormat( "application/x-qabstractitemmodeldatalist" ) )
+  {
+    QString itemType;
+    if ( event->source() == this )
+    {
+      QByteArray itemData = data->data( "application/x-qabstractitemmodeldatalist" );
+      QDataStream stream( &itemData, QIODevice::ReadOnly );
+      int r, c;
+      QMap roleDataMap;
+      stream >> r >> c >> roleDataMap;
+
+      itemType = roleDataMap.value( Qt::UserRole ).toString();
+    }
+    else
+    {
+      itemType = "field";
+    }
+
+    // Forbid dropping fields on root item
+    if ( itemType == "field" && !targetItem )
+    {
+      event->ignore();
+      return;
+    }
+
+    // Inner drag and drop actions are always MoveAction
+    if ( event->source() == this )
+    {
+      event->setDropAction( Qt::MoveAction );
+    }
+  }
+
+  QTreeWidget::dragMoveEvent( event );
+}
+
+
+bool QgsAttributesTree::dropMimeData( QTreeWidgetItem * parent, int index, const QMimeData * data, Qt::DropAction action )
+{
+  bool bDropSuccessful = false;
+
+  if ( action == Qt::IgnoreAction )
+  {
+    bDropSuccessful = true;
+  }
+  else if ( data->hasFormat( "application/x-qabstractitemmodeldatalist" ) )
+  {
+    QByteArray itemData = data->data( "application/x-qabstractitemmodeldatalist" );
+    QDataStream stream( &itemData, QIODevice::ReadOnly );
+    int r, c;
+    QMap roleDataMap;
+    stream >> r >> c >> roleDataMap;
+
+    QString itemType = roleDataMap.value( Qt::UserRole ).toString();
+    QString itemName = roleDataMap.value( Qt::DisplayRole ).toString();
+
+    if ( itemType == "field" ) //
+    {
+      if ( parent )
+      {
+        addItem( parent, itemName );
+        bDropSuccessful = true;
+      }
+      else // Should never happen as we ignore drops of fields onto the root element in dragMoveEvent, but actually does happen. Qt?
+      {
+        // addItem( invisibleRootItem(), itemName );
+        // bDropSuccessful = true;
+      }
+    }
+    else
+    {
+      bDropSuccessful = QTreeWidget::dropMimeData( parent, index, data, Qt::MoveAction );
+    }
+  }
+
+  return bDropSuccessful;
+}
+
+void QgsAttributesTree::dropEvent( QDropEvent *event )
+{
+  if ( !event->mimeData()->hasFormat( "application/x-qabstractitemmodeldatalist" ) )
+    return;
+
+  if ( event->source() == this )
+  {
+    event->setDropAction( Qt::MoveAction );
+    QTreeWidget::dropEvent( event );
+  }
+  else
+  {
+    // Qt::DropAction dropAction;
+    QByteArray itemData = event->mimeData()->data( "application/x-qabstractitemmodeldatalist" );
+    QDataStream stream( &itemData, QIODevice::ReadOnly );
+    int r, c, rDummy, cDummy;
+    QMap roleDataMap, newRoleDataMap, roleDataMapDummy;
+    stream >> rDummy >> cDummy >> roleDataMapDummy >> r >> c >> roleDataMap; // fieldName is in second column
+
+    QString fieldName = roleDataMap.value( Qt::DisplayRole ).toString();
+    newRoleDataMap.insert( Qt::UserRole , "field" );
+    newRoleDataMap.insert( Qt::DisplayRole , fieldName );
+
+    QMimeData * mimeData = new QMimeData();
+    QByteArray mdata;
+    QDataStream newStream( &mdata, QIODevice::WriteOnly );
+    newStream << r << c << newRoleDataMap;
+    mimeData->setData( QString( "application/x-qabstractitemmodeldatalist" ), mdata );
+    QDropEvent newEvent = QDropEvent( event->pos(), Qt::CopyAction , mimeData, event->mouseButtons(), event->keyboardModifiers() );
+
+    QTreeWidget::dropEvent( &newEvent );
+  }
+}
+
+QgsFieldsProperties::QgsFieldsProperties( QgsVectorLayer *layer, QWidget* parent )
+    : QWidget( parent ), mLayer( layer )
+{
+  if ( !layer )
+    return;
+
+  setupUi( this );
+  setupEditTypes();
+
+  // Init as hidden by default, it will be enabled if project is set to
+  mAttributeEditorOptionsWidget->setVisible( false );
+
+  mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
+  mDeleteAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
+  mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.png" ) );
+  mCalculateFieldButton->setIcon( QgsApplication::getThemeIcon( "/mActionCalculateField.png" ) );
+
+  connect( mToggleEditingButton, SIGNAL( clicked() ), this, SIGNAL( toggleEditing() ) );
+  connect( mLayer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) );
+  connect( mLayer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
+  connect( mLayer, SIGNAL( attributeAdded( int ) ), this, SLOT( attributeAdded( int ) ) );
+  connect( mLayer, SIGNAL( attributeDeleted( int ) ), this, SLOT( attributeDeleted( int ) ) );
+
+  // tab and group display
+  mAddItemButton->setEnabled( false );
+
+  QVBoxLayout *attrTreeLayout = new QVBoxLayout( mAttributesTreeFrame );
+  QVBoxLayout *attrListLayout = new QVBoxLayout( mAttributesListFrame );
+
+  attrTreeLayout->setMargin( 0 );
+  attrListLayout->setMargin( 0 );
+  mAttributesTree = new QgsAttributesTree( mAttributesTreeFrame );
+  mAttributesList = new QgsAttributesList( mAttributesListFrame );
+  attrTreeLayout->addWidget( mAttributesTree );
+  attrListLayout->addWidget( mAttributesList );
+  mAttributesTreeFrame->setLayout( attrTreeLayout );
+  mAttributesListFrame->setLayout( attrListLayout );
+
+  connect( mAttributesTree, SIGNAL( itemSelectionChanged() ), this, SLOT( onAttributeSelectionChanged() ) );
+  connect( mAttributesList, SIGNAL( itemSelectionChanged() ), this, SLOT( onAttributeSelectionChanged() ) );
+
+  mAttributesTree->setHeaderLabels( QStringList() << tr( "Label" ) );
+
+  leEditForm->setText( layer->editForm() );
+  leEditFormInit->setText( layer->editFormInit() );
+
+  mEditorLayoutComboBox->setCurrentIndex( layer->editorLayout() );
+
+  loadAttributeEditorTree();
+  updateButtons();
+}
+
+void QgsFieldsProperties::init()
+{
+  loadRows();
+}
+
+void QgsFieldsProperties::onAttributeSelectionChanged()
+{
+  bool isAddPossible = false;
+  if ( mAttributesTree->selectedItems().count() == 1 && mAttributesList->selectedItems().count() > 0 )
+    if ( mAttributesTree->selectedItems()[0]->data( 0, Qt::UserRole ) != "field" )
+      isAddPossible = true;
+  mAddItemButton->setEnabled( isAddPossible );
+}
+
+QTreeWidgetItem *QgsFieldsProperties::loadAttributeEditorTreeItem( QgsAttributeEditorElement* const widgetDef, QTreeWidgetItem* parent )
+{
+  QTreeWidgetItem* newWidget = 0;
+  switch ( widgetDef->type() )
+  {
+    case QgsAttributeEditorElement::AeTypeField:
+      newWidget = mAttributesTree->addItem( parent, widgetDef->name() );
+      break;
+
+    case QgsAttributeEditorElement::AeTypeContainer:
+    {
+      newWidget = mAttributesTree->addContainer( parent, widgetDef->name() );
+
+      const QgsAttributeEditorContainer* container = dynamic_cast( widgetDef );
+      QList children = container->children();
+      for ( QList::const_iterator it = children.begin(); it != children.end(); ++it )
+      {
+        loadAttributeEditorTreeItem( *it, newWidget );
+      }
+    }
+    break;
+
+    default:
+      QgsDebugMsg( "Unknown attribute editor widget type encountered..." );
+      break;
+  }
+  return newWidget;
+}
+
+void QgsFieldsProperties::loadAttributeEditorTree()
+{
+  // tabs and groups info
+  mAttributesTree->clear();
+  mAttributesTree->setSortingEnabled( false );
+  mAttributesTree->setSelectionBehavior( QAbstractItemView::SelectRows );
+  mAttributesTree->setDragDropMode( QAbstractItemView::InternalMove );
+  mAttributesTree->setAcceptDrops( true );
+  mAttributesTree->setDragDropMode( QAbstractItemView::DragDrop );
+  // tabs and groups info
+  mAttributesTree->clear();
+  mAttributesTree->setSortingEnabled( false );
+  mAttributesTree->setSelectionBehavior( QAbstractItemView::SelectRows );
+  mAttributesTree->setDragDropMode( QAbstractItemView::InternalMove );
+  mAttributesTree->setAcceptDrops( true );
+  mAttributesTree->setDragDropMode( QAbstractItemView::DragDrop );
+
+  QList widgets = mLayer->attributeEditorElements();
+
+  for ( QList::const_iterator it = widgets.begin(); it != widgets.end(); ++it )
+  {
+    loadAttributeEditorTreeItem( *it, mAttributesTree->invisibleRootItem() );
+  }
+}
+
+void QgsFieldsProperties::loadRows()
+{
+  disconnect( mAttributesList, SIGNAL( cellChanged( int, int ) ), this, SLOT( attributesListCellChanged( int, int ) ) );
+  const QgsFieldMap &fields = mLayer->pendingFields();
+
+  mAttributesList->clear();
+
+  mAttributesList->setColumnCount( attrColCount );
+  mAttributesList->setRowCount( fields.size() );
+  mAttributesList->setSelectionBehavior( QAbstractItemView::SelectRows );
+  mAttributesList->setDragDropMode( QAbstractItemView::DragOnly );
+  mAttributesList->setHorizontalHeaderItem( attrIdCol, new QTableWidgetItem( tr( "Id" ) ) );
+  mAttributesList->setHorizontalHeaderItem( attrNameCol, new QTableWidgetItem( tr( "Name" ) ) );
+  mAttributesList->setHorizontalHeaderItem( attrTypeCol, new QTableWidgetItem( tr( "Type" ) ) );
+  mAttributesList->setHorizontalHeaderItem( attrLengthCol, new QTableWidgetItem( tr( "Length" ) ) );
+  mAttributesList->setHorizontalHeaderItem( attrPrecCol, new QTableWidgetItem( tr( "Precision" ) ) );
+  mAttributesList->setHorizontalHeaderItem( attrCommentCol, new QTableWidgetItem( tr( "Comment" ) ) );
+  mAttributesList->setHorizontalHeaderItem( attrEditTypeCol, new QTableWidgetItem( tr( "Edit widget" ) ) );
+  mAttributesList->setHorizontalHeaderItem( attrWMSCol, new QTableWidgetItem( "WMS" ) );
+  mAttributesList->setHorizontalHeaderItem( attrWFSCol, new QTableWidgetItem( "WFS" ) );
+  mAttributesList->setHorizontalHeaderItem( attrAliasCol, new QTableWidgetItem( tr( "Alias" ) ) );
+
+  mAttributesList->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch );
+  mAttributesList->horizontalHeader()->setResizeMode( 7, QHeaderView::Stretch );
+  mAttributesList->setSelectionBehavior( QAbstractItemView::SelectRows );
+  mAttributesList->setSelectionMode( QAbstractItemView::ExtendedSelection );
+  mAttributesList->verticalHeader()->hide();
+
+  int row = 0;
+  for ( QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); it++, row++ )
+    setRow( row, it.key(), it.value() );
+
+  mAttributesList->resizeColumnsToContents();
+  connect( mAttributesList, SIGNAL( cellChanged( int, int ) ), this, SLOT( attributesListCellChanged( int, int ) ) );
+}
+
+void QgsFieldsProperties::setRow( int row, int idx, const QgsField &field )
+{
+  mAttributesList->setItem( row, attrIdCol, new QTableWidgetItem( QString::number( idx ) ) );
+  mAttributesList->setItem( row, attrNameCol, new QTableWidgetItem( field.name() ) );
+  mAttributesList->setItem( row, attrTypeCol, new QTableWidgetItem( field.typeName() ) );
+  mAttributesList->setItem( row, attrLengthCol, new QTableWidgetItem( QString::number( field.length() ) ) );
+  mAttributesList->setItem( row, attrPrecCol, new QTableWidgetItem( QString::number( field.precision() ) ) );
+  mAttributesList->setItem( row, attrCommentCol, new QTableWidgetItem( field.comment() ) );
+
+  for ( int i = 0; i < attrEditTypeCol; i++ )
+    mAttributesList->item( row, i )->setFlags( mAttributesList->item( row, i )->flags() & ~Qt::ItemIsEditable );
+
+  QPushButton *pb = new QPushButton( editTypeButtonText( mLayer->editType( idx ) ) );
+  mAttributesList->setCellWidget( row, attrEditTypeCol, pb );
+  connect( pb, SIGNAL( pressed() ), this, SLOT( attributeTypeDialog( ) ) );
+  mButtonMap.insert( idx, pb );
+
+  //set the alias for the attribute
+  mAttributesList->setItem( row, attrAliasCol, new QTableWidgetItem( mLayer->attributeAlias( idx ) ) );
+
+  //published WMS/WFS attributes
+  QTableWidgetItem* wmsAttrItem = new QTableWidgetItem();
+  wmsAttrItem->setCheckState( mLayer->excludeAttributesWMS().contains( field.name() ) ? Qt::Unchecked : Qt::Checked );
+  wmsAttrItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable );
+  mAttributesList->setItem( row, attrWMSCol, wmsAttrItem );
+  QTableWidgetItem* wfsAttrItem = new QTableWidgetItem();
+  wfsAttrItem->setCheckState( mLayer->excludeAttributesWFS().contains( field.name() ) ? Qt::Unchecked : Qt::Checked );
+  wfsAttrItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable );
+  mAttributesList->setItem( row, attrWFSCol, wfsAttrItem );
+}
+
+void QgsFieldsProperties::on_mAddItemButton_clicked()
+{
+  QList listItems = mAttributesList->selectedItems();
+  QList treeItems = mAttributesTree->selectedItems();
+
+  if ( treeItems.count() != 1 && listItems.count() == 0 )
+    return;
+
+  QTreeWidgetItem *parent = treeItems[0];
+  if ( parent->data( 0, Qt::UserRole ) == "field" )
+    return;
+
+  for ( QList::const_iterator it = listItems.begin(); it != listItems.end(); it++ )
+  {
+    if (( *it )->column() == attrNameCol )
+      mAttributesTree->addItem( parent , ( *it )->text() );
+  }
+}
+
+void QgsFieldsProperties::on_mAddTabOrGroupButton_clicked()
+{
+  QList tabList;
+  QList tabWidgetList;
+  QTreeWidgetItemIterator it( mAttributesTree );
+  while ( *it )
+  {
+    if (( *it )->data( 0 , Qt::UserRole ) == "container" )
+      tabList.append(( *it )->text( 0 ) );
+    tabWidgetList.append( *it );
+    ++it;
+  }
+  QgsAddTabOrGroup addTabOrGroup( mLayer , this, tabList );
+
+  if ( !addTabOrGroup.exec() )
+    return;
+
+  QString name = addTabOrGroup.name();
+  if ( addTabOrGroup.tabButtonIsChecked() )
+  {
+    mAttributesTree->addContainer( mAttributesTree->invisibleRootItem(), name );
+  }
+  else
+  {
+    int tabId = addTabOrGroup.tabId();
+    QTreeWidgetItem* tabItem = tabWidgetList[tabId];
+    mAttributesTree->addContainer( tabItem , name );
+  }
+}
+
+void QgsFieldsProperties::on_mRemoveTabGroupItemButton_clicked()
+{
+  QList items = mAttributesTree->selectedItems();
+  for ( QList::const_iterator it = items.begin(); it != items.end(); it++ )
+  {
+    delete *it;
+  }
+}
+
+void QgsFieldsProperties::on_mMoveDownItem_clicked()
+{
+  QList itemList = mAttributesTree->selectedItems();
+  if ( itemList.count() != 1 )
+    return;
+
+  QTreeWidgetItem* itemToMoveDown = itemList.first();
+  QTreeWidgetItem* parent = itemToMoveDown->parent();
+  if ( !parent )
+  {
+    parent = mAttributesTree->invisibleRootItem();
+  }
+  int itemIndex = parent->indexOfChild( itemToMoveDown );
+
+  if ( itemIndex < parent->childCount() - 1 )
+  {
+    parent->takeChild( itemIndex );
+    parent->insertChild( itemIndex + 1, itemToMoveDown );
+
+    itemToMoveDown->setSelected( true );
+    parent->child( itemIndex )->setSelected( false );
+  }
+}
+
+void QgsFieldsProperties::on_mMoveUpItem_clicked()
+{
+  QList itemList = mAttributesTree->selectedItems();
+  if ( itemList.count() != 1 )
+    return;
+
+  QTreeWidgetItem* itemToMoveUp = itemList.first();
+  QTreeWidgetItem* parent = itemToMoveUp->parent();
+  if ( !parent )
+  {
+    parent = mAttributesTree->invisibleRootItem();
+  }
+  int itemIndex = parent->indexOfChild( itemToMoveUp );
+
+  if ( itemIndex > 0 )
+  {
+    parent->takeChild( itemIndex );
+    parent->insertChild( itemIndex - 1, itemToMoveUp );
+
+    itemToMoveUp->setSelected( true );
+    parent->child( itemIndex )->setSelected( false );
+  }
+}
+
+void QgsFieldsProperties::attributeTypeDialog()
+{
+  QPushButton *pb = qobject_cast( sender() );
+  if ( !pb )
+    return;
+
+  int index = mButtonMap.key( pb, -1 );
+  if ( index == -1 )
+    return;
+
+  QgsAttributeTypeDialog attributeTypeDialog( mLayer );
+
+  attributeTypeDialog.setValueMap( mValueMaps.value( index, mLayer->valueMap( index ) ) );
+  attributeTypeDialog.setRange( mRanges.value( index, mLayer->range( index ) ) );
+  attributeTypeDialog.setValueRelation( mValueRelationData.value( index, mLayer->valueRelation( index ) ) );
+
+  QPair checkStates = mCheckedStates.value( index, mLayer->checkedState( index ) );
+  attributeTypeDialog.setCheckedState( checkStates.first, checkStates.second );
+
+  attributeTypeDialog.setIndex( index, mEditTypeMap.value( index, mLayer->editType( index ) ) );
+
+  if ( !attributeTypeDialog.exec() )
+    return;
+
+  QgsVectorLayer::EditType editType = attributeTypeDialog.editType();
+
+  mEditTypeMap.insert( index, editType );
+
+  QString buttonText;
+  switch ( editType )
+  {
+    case QgsVectorLayer::ValueMap:
+      mValueMaps.insert( index, attributeTypeDialog.valueMap() );
+      break;
+    case QgsVectorLayer::EditRange:
+    case QgsVectorLayer::SliderRange:
+    case QgsVectorLayer::DialRange:
+      mRanges.insert( index, attributeTypeDialog.rangeData() );
+      break;
+    case QgsVectorLayer::CheckBox:
+      mCheckedStates.insert( index, attributeTypeDialog.checkedState() );
+      break;
+    case QgsVectorLayer::ValueRelation:
+      mValueRelationData.insert( index, attributeTypeDialog.valueRelationData() );
+      break;
+    case QgsVectorLayer::LineEdit:
+    case QgsVectorLayer::TextEdit:
+    case QgsVectorLayer::UniqueValues:
+    case QgsVectorLayer::UniqueValuesEditable:
+    case QgsVectorLayer::Classification:
+    case QgsVectorLayer::FileName:
+    case QgsVectorLayer::Enumeration:
+    case QgsVectorLayer::Immutable:
+    case QgsVectorLayer::Hidden:
+    case QgsVectorLayer::Calendar:
+    case QgsVectorLayer::UuidGenerator:
+      break;
+  }
+
+  pb->setText( editTypeButtonText( editType ) );
+}
+
+
+void QgsFieldsProperties::attributeAdded( int idx )
+{
+  const QgsFieldMap &fields = mLayer->pendingFields();
+  int row = mAttributesList->rowCount();
+  mAttributesList->insertRow( row );
+  setRow( row, idx, fields[idx] );
+  mAttributesList->setCurrentCell( row, idx );
+}
+
+
+void QgsFieldsProperties::attributeDeleted( int idx )
+{
+  for ( int i = 0; i < mAttributesList->rowCount(); i++ )
+  {
+    if ( mAttributesList->item( i, 0 )->text().toInt() == idx )
+    {
+      mAttributesList->removeRow( i );
+      break;
+    }
+  }
+}
+
+void QgsFieldsProperties::addAttribute()
+{
+  QgsAddAttrDialog dialog( mLayer, this );
+  if ( dialog.exec() == QDialog::Accepted )
+  {
+    mLayer->beginEditCommand( "Attribute added" );
+    if ( !addAttribute( dialog.field() ) )
+    {
+      mLayer->destroyEditCommand();
+      QMessageBox::information( this, tr( "Name conflict" ), tr( "The attribute could not be inserted. The name already exists in the table." ) );
+    }
+    else
+    {
+      mLayer->endEditCommand();
+    }
+  }
+}
+
+bool QgsFieldsProperties::addAttribute( const QgsField &field )
+{
+  QgsDebugMsg( "inserting attribute " + field.name() + " of type " + field.typeName() );
+  mLayer->beginEditCommand( tr( "Added attribute" ) );
+  if ( mLayer->addAttribute( field ) )
+  {
+    mLayer->endEditCommand();
+    return true;
+  }
+  else
+  {
+    mLayer->destroyEditCommand();
+    return false;
+  }
+}
+
+void QgsFieldsProperties::deleteAttribute()
+{
+  QList items = mAttributesList->selectedItems();
+  QList idxs;
+
+  for ( QList::const_iterator it = items.begin(); it != items.end(); it++ )
+  {
+    if (( *it )->column() == 0 )
+      idxs << ( *it )->text().toInt();
+  }
+  for ( QList::const_iterator it = idxs.begin(); it != idxs.end(); it++ )
+  {
+    mLayer->beginEditCommand( tr( "Deleted attribute" ) );
+    mLayer->deleteAttribute( *it );
+    mLayer->endEditCommand();
+  }
+}
+
+void QgsFieldsProperties::editingToggled()
+{
+  if ( !mLayer->isEditable() )
+    loadRows();
+
+  updateButtons();
+}
+
+void QgsFieldsProperties::on_mAddAttributeButton_clicked()
+{
+  QgsAddAttrDialog dialog( mLayer, this );
+  if ( dialog.exec() == QDialog::Accepted )
+  {
+    mLayer->beginEditCommand( "Attribute added" );
+    if ( !addAttribute( dialog.field() ) )
+    {
+      mLayer->destroyEditCommand();
+      QMessageBox::information( this, tr( "Name conflict" ), tr( "The attribute could not be inserted. The name already exists in the table." ) );
+    }
+    else
+    {
+      mLayer->endEditCommand();
+    }
+  }
+}
+
+void QgsFieldsProperties::on_mDeleteAttributeButton_clicked()
+{
+  QList items = mAttributesList->selectedItems();
+  QList idxs;
+
+  for ( QList::const_iterator it = items.begin(); it != items.end(); it++ )
+  {
+    if (( *it )->column() == 0 )
+      idxs << ( *it )->text().toInt();
+  }
+  for ( QList::const_iterator it = idxs.begin(); it != idxs.end(); it++ )
+  {
+    mLayer->beginEditCommand( tr( "Deleted attribute" ) );
+    mLayer->deleteAttribute( *it );
+    mLayer->endEditCommand();
+  }
+}
+
+void QgsFieldsProperties::updateButtons()
+{
+  int cap = mLayer->dataProvider()->capabilities();
+
+  mToggleEditingButton->setEnabled(( cap & QgsVectorDataProvider::ChangeAttributeValues ) && !mLayer->isReadOnly() );
+
+  if ( mLayer->isEditable() )
+  {
+    mAddAttributeButton->setEnabled( cap & QgsVectorDataProvider::AddAttributes );
+    mDeleteAttributeButton->setEnabled( cap & QgsVectorDataProvider::DeleteAttributes );
+    mCalculateFieldButton->setEnabled( cap & ( QgsVectorDataProvider::ChangeAttributeValues | QgsVectorDataProvider::AddAttributes ) );
+    mToggleEditingButton->setChecked( true );
+  }
+  else
+  {
+    mAddAttributeButton->setEnabled( false );
+    mDeleteAttributeButton->setEnabled( false );
+    mToggleEditingButton->setChecked( false );
+    mCalculateFieldButton->setEnabled( false );
+  }
+}
+
+
+void QgsFieldsProperties::attributesListCellChanged( int row, int column )
+{
+  if ( column == attrAliasCol && mLayer ) //only consider attribute aliases in this function
+  {
+    int idx = mAttributesList->item( row, attrIdCol )->text().toInt();
+
+    const QgsFieldMap &fields = mLayer->pendingFields();
+
+    if ( !fields.contains( idx ) )
+    {
+      return; // index must be wrong
+    }
+
+    QTableWidgetItem *aliasItem = mAttributesList->item( row, column );
+    if ( aliasItem )
+    {
+      mLayer->addAttributeAlias( idx, aliasItem->text() );
+    }
+  }
+}
+
+void QgsFieldsProperties::on_mCalculateFieldButton_clicked()
+{
+  if ( !mLayer )
+  {
+    return;
+  }
+
+  QgsFieldCalculator calc( mLayer );
+  calc.exec();
+}
+
+
+//
+// methods reimplemented from qt designer base class
+//
+
+QMap< QgsVectorLayer::EditType, QString > QgsFieldsProperties::editTypeMap;
+
+void QgsFieldsProperties::setupEditTypes()
+{
+  if ( !editTypeMap.isEmpty() )
+    return;
+
+  editTypeMap.insert( QgsVectorLayer::LineEdit, tr( "Line edit" ) );
+  editTypeMap.insert( QgsVectorLayer::UniqueValues, tr( "Unique values" ) );
+  editTypeMap.insert( QgsVectorLayer::UniqueValuesEditable, tr( "Unique values editable" ) );
+  editTypeMap.insert( QgsVectorLayer::Classification, tr( "Classification" ) );
+  editTypeMap.insert( QgsVectorLayer::ValueMap, tr( "Value map" ) );
+  editTypeMap.insert( QgsVectorLayer::EditRange, tr( "Edit range" ) );
+  editTypeMap.insert( QgsVectorLayer::SliderRange, tr( "Slider range" ) );
+  editTypeMap.insert( QgsVectorLayer::DialRange, tr( "Dial range" ) );
+  editTypeMap.insert( QgsVectorLayer::FileName, tr( "File name" ) );
+  editTypeMap.insert( QgsVectorLayer::Enumeration, tr( "Enumeration" ) );
+  editTypeMap.insert( QgsVectorLayer::Immutable, tr( "Immutable" ) );
+  editTypeMap.insert( QgsVectorLayer::Hidden, tr( "Hidden" ) );
+  editTypeMap.insert( QgsVectorLayer::CheckBox, tr( "Checkbox" ) );
+  editTypeMap.insert( QgsVectorLayer::TextEdit, tr( "Text edit" ) );
+  editTypeMap.insert( QgsVectorLayer::Calendar, tr( "Calendar" ) );
+  editTypeMap.insert( QgsVectorLayer::ValueRelation, tr( "Value relation" ) );
+  editTypeMap.insert( QgsVectorLayer::UuidGenerator, tr( "UUID generator" ) );
+}
+
+QString QgsFieldsProperties::editTypeButtonText( QgsVectorLayer::EditType type )
+{
+  return editTypeMap[ type ];
+}
+
+QgsVectorLayer::EditType QgsFieldsProperties::editTypeFromButtonText( QString text )
+{
+  return editTypeMap.key( text );
+}
+
+QgsAttributeEditorElement* QgsFieldsProperties::createAttributeEditorWidget( QTreeWidgetItem* item, QObject *parent )
+{
+  QgsAttributeEditorElement* widgetDef;
+
+  if ( item->data( 0, Qt::UserRole ) == "field" )
+  {
+    int idx = *mLayer->dataProvider()->fieldNameMap().find( item->text( 0 ) );
+    widgetDef = new QgsAttributeEditorField( item->text( 0 ), idx, parent );
+  }
+  else
+  {
+    QgsAttributeEditorContainer* container = new QgsAttributeEditorContainer( item->text( 0 ), parent );
+
+    for ( int t = 0; t < item->childCount(); t++ )
+    {
+      container->addChildElement( createAttributeEditorWidget( item->child( t ), container ) );
+    }
+
+    widgetDef = container;
+  }
+
+  return widgetDef;
+}
+
+void QgsFieldsProperties::on_pbnSelectEditForm_clicked()
+{
+  QSettings myQSettings;
+  QString lastUsedDir = myQSettings.value( "style/lastUIDir", "." ).toString();
+  QString uifilename = QFileDialog::getOpenFileName( this, tr( "Select edit form" ), lastUsedDir, tr( "UI file" )  + " (*.ui)" );
+
+  if ( uifilename.isNull() )
+    return;
+
+  leEditForm->setText( uifilename );
+}
+
+void QgsFieldsProperties::on_mEditorLayoutComboBox_currentIndexChanged( int index )
+{
+  switch ( index )
+  {
+    case 0:
+      mAttributeEditorOptionsWidget->setVisible( false );
+      break;
+
+    case 1:
+      mAttributeEditorOptionsWidget->setVisible( true );
+      mAttributeEditorOptionsWidget->setCurrentIndex( 1 );
+      break;
+
+    case 2:
+      mAttributeEditorOptionsWidget->setVisible( true );
+      mAttributeEditorOptionsWidget->setCurrentIndex( 0 );
+      break;
+  }
+}
+
+void QgsFieldsProperties::apply()
+{
+  QSet excludeAttributesWMS, excludeAttributesWFS;
+
+  for ( int i = 0; i < mAttributesList->rowCount(); i++ )
+  {
+    int idx = mAttributesList->item( i, attrIdCol )->text().toInt();
+
+    QPushButton *pb = qobject_cast( mAttributesList->cellWidget( i, attrEditTypeCol ) );
+    if ( !pb )
+      continue;
+
+    QgsVectorLayer::EditType editType = editTypeFromButtonText( pb->text() );
+    mLayer->setEditType( idx, editType );
+
+    switch ( editType )
+    {
+      case QgsVectorLayer::ValueMap:
+        if ( mValueMaps.contains( idx ) )
+        {
+          QMap &map = mLayer->valueMap( idx );
+          map.clear();
+          map = mValueMaps[idx];
+        }
+        break;
+
+      case QgsVectorLayer::EditRange:
+      case QgsVectorLayer::SliderRange:
+      case QgsVectorLayer::DialRange:
+        if ( mRanges.contains( idx ) )
+        {
+          mLayer->range( idx ) = mRanges[idx];
+        }
+        break;
+
+      case QgsVectorLayer::CheckBox:
+        if ( mCheckedStates.contains( idx ) )
+        {
+          mLayer->setCheckedState( idx, mCheckedStates[idx].first, mCheckedStates[idx].second );
+        }
+        break;
+
+      case QgsVectorLayer::ValueRelation:
+        if ( mValueRelationData.contains( idx ) )
+        {
+          mLayer->valueRelation( idx ) = mValueRelationData[idx];
+        }
+        break;
+
+      case QgsVectorLayer::LineEdit:
+      case QgsVectorLayer::UniqueValues:
+      case QgsVectorLayer::UniqueValuesEditable:
+      case QgsVectorLayer::Classification:
+      case QgsVectorLayer::FileName:
+      case QgsVectorLayer::Enumeration:
+      case QgsVectorLayer::Immutable:
+      case QgsVectorLayer::Hidden:
+      case QgsVectorLayer::TextEdit:
+      case QgsVectorLayer::Calendar:
+      case QgsVectorLayer::UuidGenerator:
+        break;
+    }
+
+    if ( mAttributesList->item( i, attrWMSCol )->checkState() == Qt::Unchecked )
+    {
+      excludeAttributesWMS.insert( mAttributesList->item( i, attrNameCol )->text() );
+    }
+    if ( mAttributesList->item( i, attrWFSCol )->checkState() == Qt::Unchecked )
+    {
+      excludeAttributesWFS.insert( mAttributesList->item( i, attrNameCol )->text() );
+    }
+  }
+
+  //tabs and groups
+  mLayer->clearAttributeEditorWidgets();
+  for ( int t = 0; t < mAttributesTree->invisibleRootItem()->childCount(); t++ )
+  {
+    QTreeWidgetItem* tabItem = mAttributesTree->invisibleRootItem()->child( t );
+
+    mLayer->addAttributeEditorWidget( createAttributeEditorWidget( tabItem, mLayer ) );
+  }
+
+  mLayer->setEditorLayout(( QgsVectorLayer::EditorLayout )mEditorLayoutComboBox->currentIndex() );
+  mLayer->setEditForm( leEditForm->text() );
+  mLayer->setEditFormInit( leEditFormInit->text() );
+
+  mLayer->setExcludeAttributesWMS( excludeAttributesWMS );
+  mLayer->setExcludeAttributesWFS( excludeAttributesWFS );
+}
diff --git a/src/app/qgsfieldsproperties.h b/src/app/qgsfieldsproperties.h
new file mode 100644
index 000000000000..8ada6de05d29
--- /dev/null
+++ b/src/app/qgsfieldsproperties.h
@@ -0,0 +1,155 @@
+/***************************************************************************
+    qgsfieldsproperties.h
+    ---------------------
+    begin                : September 2012
+    copyright            : (C) 2012 by Matthias Kuhn
+    email                : matthias dot kuhn at gmx dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSFIELDSPROPERTIES_H
+#define QGSFIELDSPROPERTIES_H
+
+#include 
+#include 
+#include 
+#include 
+
+#include "qgsvectorlayer.h"
+#include "ui_qgsfieldspropertiesbase.h"
+
+class QgsAttributesList : public QTableWidget
+{
+    Q_OBJECT
+  public:
+    QgsAttributesList( QWidget* parent = 0 )
+        : QTableWidget( parent )
+    {}
+
+  protected:
+    // virtual void dragMoveEvent( QDragMoveEvent *event );
+    //QMimeData *mimeData( const QList items ) const;
+    //Qt::DropActions supportedDropActions() const;
+};
+
+class QgsAttributesTree : public QTreeWidget
+{
+    Q_OBJECT
+  public:
+    QgsAttributesTree( QWidget* parent = 0 )
+        : QTreeWidget( parent )
+    {}
+    QTreeWidgetItem* addContainer( QTreeWidgetItem* parent , QString title );
+    QTreeWidgetItem* addItem( QTreeWidgetItem* parent , QString fieldName );
+
+  protected:
+    virtual void dragMoveEvent( QDragMoveEvent *event );
+    virtual void dropEvent( QDropEvent *event );
+    virtual bool dropMimeData( QTreeWidgetItem * parent, int index, const QMimeData * data, Qt::DropAction action );
+    /* Qt::DropActions supportedDropActions() const;*/
+};
+
+
+class QgsFieldsProperties : public QWidget, private Ui_QgsFieldsPropertiesBase
+{
+    Q_OBJECT
+
+  public:
+    QgsFieldsProperties( QgsVectorLayer *layer, QWidget* parent = 0 );
+
+    /**Adds an attribute to the table (but does not commit it yet)
+    @param field the field to add
+    @return false in case of a name conflict, true in case of success */
+    bool addAttribute( const QgsField &field );
+
+    /**Deletes an attribute (but does not commit it)
+      @param name attribute name
+      @return false in case of a non-existing attribute.*/
+    bool deleteAttribute( int attr );
+
+    /**Creates the a proper item to save from the tree
+     * @param item The tree widget item to process
+     * @return A widget definition. Containing another container or the final field
+     */
+    QgsAttributeEditorElement* createAttributeEditorWidget( QTreeWidgetItem* item, QObject *parent );
+
+    void init();
+    void apply();
+
+    void updateButtons();
+    void loadRows();
+    void setRow( int row, int idx, const QgsField &field );
+
+    void loadAttributeEditorTree();
+    QTreeWidgetItem *loadAttributeEditorTreeItem( QgsAttributeEditorElement* const widgetDef, QTreeWidgetItem* parent );
+
+  signals:
+    void toggleEditing();
+
+  public slots:
+    void on_mAddAttributeButton_clicked();
+    void on_mDeleteAttributeButton_clicked();
+    void on_mCalculateFieldButton_clicked();
+    void onAttributeSelectionChanged();
+    void on_pbnSelectEditForm_clicked();
+    void on_mEditorLayoutComboBox_currentIndexChanged( int index );
+
+    void addAttribute();
+    void deleteAttribute();
+    void attributeAdded( int idx );
+    void attributeDeleted( int idx );
+    void attributeTypeDialog();
+
+    void on_mAddTabOrGroupButton_clicked();
+    void on_mAddItemButton_clicked();
+    void on_mRemoveTabGroupItemButton_clicked();
+    void on_mMoveDownItem_clicked();
+    void on_mMoveUpItem_clicked();
+
+    void attributesListCellChanged( int row, int column );
+
+  protected slots:
+    /** editing of layer was toggled */
+    void editingToggled();
+
+  protected:
+    QgsVectorLayer* mLayer;
+    QgsAttributesTree* mAttributesTree;
+    QgsAttributesList* mAttributesList;
+
+    QMap mValueRelationData;
+    QMap > mValueMaps;
+    QMap mRanges;
+    QMap > mCheckedStates;
+    QMap mEditTypeMap;
+    QMap mButtonMap;
+
+    enum attrColumns
+    {
+      attrIdCol = 0,
+      attrNameCol,
+      attrTypeCol,
+      attrLengthCol,
+      attrPrecCol,
+      attrCommentCol,
+      attrEditTypeCol,
+      attrAliasCol,
+      attrWMSCol,
+      attrWFSCol,
+      attrColCount,
+    };
+
+    static QMap< QgsVectorLayer::EditType, QString > editTypeMap;
+    static void setupEditTypes();
+    static QString editTypeButtonText( QgsVectorLayer::EditType type );
+    static QgsVectorLayer::EditType editTypeFromButtonText( QString text );
+
+};
+
+#endif // QGSFIELDSPROPERTIES_H
diff --git a/src/app/qgsidentifyresults.cpp b/src/app/qgsidentifyresults.cpp
index 2eac6146c7a4..801f45097f50 100644
--- a/src/app/qgsidentifyresults.cpp
+++ b/src/app/qgsidentifyresults.cpp
@@ -41,6 +41,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 #include 
 #include 
 
@@ -92,6 +94,7 @@ QgsIdentifyResults::QgsIdentifyResults( QgsMapCanvas *canvas, QWidget *parent, Q
   mExpandToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandTree.png" ) );
   mCollapseToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionCollapseTree.png" ) );
   mExpandNewToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionExpandNewTree.png" ) );
+  mPrintToolButton->setIcon( QgsApplication::getThemeIcon( "/mActionFilePrint.png" ) );
 
   QSettings mySettings;
   restoreGeometry( mySettings.value( "/Windows/Identify/geometry" ).toByteArray() );
@@ -118,6 +121,9 @@ QgsIdentifyResults::QgsIdentifyResults( QgsMapCanvas *canvas, QWidget *parent, Q
 
   connect( lstResults, SIGNAL( itemClicked( QTreeWidgetItem*, int ) ),
            this, SLOT( itemClicked( QTreeWidgetItem*, int ) ) );
+
+  connect( mPrintToolButton, SIGNAL( clicked() ),
+           this, SLOT( printCurrentItem() ) );
 }
 
 QgsIdentifyResults::~QgsIdentifyResults()
@@ -286,6 +292,14 @@ void QgsIdentifyResults::addFeature( QgsRasterLayer *layer,
     QWebView *wv = new QWebView( attrItem->treeWidget() );
     wv->setHtml( attributes.begin().value() );
     wv->page()->setLinkDelegationPolicy( QWebPage::DelegateAllLinks );
+
+    QAction *action = new QAction( tr( "Print" ), wv );
+    connect( action, SIGNAL( triggered() ), this, SLOT( print() ) );
+    wv->insertAction( 0, action );
+
+    wv->setContextMenuPolicy( Qt::ActionsContextMenu );
+    mPrintToolButton->setVisible( true );
+
     connect( wv, SIGNAL( linkClicked( const QUrl & ) ), this, SLOT( openUrl( const QUrl & ) ) );
     attrItem->treeWidget()->setItemWidget( attrItem, 1, wv );
   }
@@ -537,6 +551,9 @@ void QgsIdentifyResults::clear()
 
   lstResults->clear();
   clearHighlights();
+
+  mPrintToolButton->setDisabled( true );
+  mPrintToolButton->setHidden( true );
 }
 
 void QgsIdentifyResults::activate()
@@ -690,6 +707,9 @@ void QgsIdentifyResults::handleCurrentItemChanged( QTreeWidgetItem *current, QTr
     return;
   }
 
+  QWebView *wv = qobject_cast( current->treeWidget()->itemWidget( current, 1 ) );
+  mPrintToolButton->setEnabled( wv != 0 );
+
   QTreeWidgetItem *layItem = layerItem( current );
 
   if ( current == layItem )
@@ -1020,6 +1040,38 @@ void QgsIdentifyResults::openUrl( const QUrl &url )
   }
 }
 
+void QgsIdentifyResults::print()
+{
+  QAction *action = qobject_cast( sender() );
+  if ( !action )
+    return;
+
+  QWebView *wv = qobject_cast( action->parent() );
+  if ( !wv )
+    return;
+
+  QPrinter printer;
+  QPrintDialog *dialog = new QPrintDialog( &printer );
+  if ( dialog->exec() == QDialog::Accepted )
+    wv->print( &printer );
+}
+
+void QgsIdentifyResults::printCurrentItem()
+{
+  QTreeWidgetItem *item = lstResults->currentItem();
+  if ( !item )
+    return;
+
+  QWebView *wv = qobject_cast( item->treeWidget()->itemWidget( item, 1 ) );
+  if ( !wv )
+    return;
+
+  QPrinter printer;
+  QPrintDialog *dialog = new QPrintDialog( &printer );
+  if ( dialog->exec() == QDialog::Accepted )
+    wv->print( &printer );
+}
+
 void QgsIdentifyResults:: on_mExpandNewToolButton_toggled( bool checked )
 {
   QSettings settings;
diff --git a/src/app/qgsidentifyresults.h b/src/app/qgsidentifyresults.h
index 98325d97961e..7b2383784458 100644
--- a/src/app/qgsidentifyresults.h
+++ b/src/app/qgsidentifyresults.h
@@ -115,10 +115,12 @@ class QgsIdentifyResults: public QDialog, private Ui::QgsIdentifyResultsBase
 
     void on_mExpandNewToolButton_toggled( bool checked );
 
-    void on_mExpandToolButton_clicked( bool checked ) { Q_UNUSED( checked); expandAll(); }
-    void on_mCollapseToolButton_clicked( bool checked ) { Q_UNUSED( checked); collapseAll(); }
+    void on_mExpandToolButton_clicked( bool checked ) { Q_UNUSED( checked ); expandAll(); }
+    void on_mCollapseToolButton_clicked( bool checked ) { Q_UNUSED( checked ); collapseAll(); }
 
     void openUrl( const QUrl &url );
+    void print();
+    void printCurrentItem();
 
   private:
     QMenu *mActionPopup;
diff --git a/src/app/qgslabelengineconfigdialog.cpp b/src/app/qgslabelengineconfigdialog.cpp
index 2742de68cd24..7e20f4ac0134 100644
--- a/src/app/qgslabelengineconfigdialog.cpp
+++ b/src/app/qgslabelengineconfigdialog.cpp
@@ -15,6 +15,9 @@
 #include "qgslabelengineconfigdialog.h"
 
 #include "qgspallabeling.h"
+#include 
+
+#include 
 
 QgsLabelEngineConfigDialog::QgsLabelEngineConfigDialog( QgsPalLabeling* lbl, QWidget* parent )
     : QDialog( parent ), mLBL( lbl )
@@ -22,6 +25,8 @@ QgsLabelEngineConfigDialog::QgsLabelEngineConfigDialog( QgsPalLabeling* lbl, QWi
   setupUi( this );
 
   connect( buttonBox, SIGNAL( accepted() ), this, SLOT( onOK() ) );
+  connect( buttonBox->button( QDialogButtonBox::RestoreDefaults ), SIGNAL( clicked() ),
+           this, SLOT( setDefaults() ) );
 
   // search method
   cboSearchMethod->setCurrentIndex( mLBL->searchMethod() );
@@ -36,6 +41,8 @@ QgsLabelEngineConfigDialog::QgsLabelEngineConfigDialog( QgsPalLabeling* lbl, QWi
   chkShowCandidates->setChecked( mLBL->isShowingCandidates() );
 
   chkShowAllLabels->setChecked( mLBL->isShowingAllLabels() );
+
+  mSaveWithProjectChkBox->setChecked( mLBL->isStoredWithProject() );
 }
 
 
@@ -52,5 +59,24 @@ void QgsLabelEngineConfigDialog::onOK()
 
   mLBL->setShowingAllLabels( chkShowAllLabels->isChecked() );
 
+  if ( mSaveWithProjectChkBox->isChecked() )
+  {
+    mLBL->saveEngineSettings();
+  }
+  else if ( mLBL->isStoredWithProject() )
+  {
+    mLBL->clearEngineSettings();
+  }
   accept();
 }
+
+void QgsLabelEngineConfigDialog::setDefaults()
+{
+  pal::Pal p;
+  cboSearchMethod->setCurrentIndex(( int )p.getSearch() );
+  spinCandPoint->setValue( p.getPointP() );
+  spinCandLine->setValue( p.getLineP() );
+  spinCandPolygon->setValue( p.getPolyP() );
+  chkShowCandidates->setChecked( false );
+  chkShowAllLabels->setChecked( false );
+}
diff --git a/src/app/qgslabelengineconfigdialog.h b/src/app/qgslabelengineconfigdialog.h
index c659b88eff32..7980f3378b46 100644
--- a/src/app/qgslabelengineconfigdialog.h
+++ b/src/app/qgslabelengineconfigdialog.h
@@ -29,6 +29,8 @@ class QgsLabelEngineConfigDialog : public QDialog, private Ui::QgsEngineConfigDi
 
   public slots:
     void onOK();
+    /** @note Added in QGIS 1.9 */
+    void setDefaults();
 
   protected:
     QgsPalLabeling* mLBL;
diff --git a/src/app/qgslabelinggui.cpp b/src/app/qgslabelinggui.cpp
index 5ffcbae9c00d..d92297aa2671 100644
--- a/src/app/qgslabelinggui.cpp
+++ b/src/app/qgslabelinggui.cpp
@@ -25,7 +25,9 @@
 #include "qgslabelengineconfigdialog.h"
 #include "qgsexpressionbuilderdialog.h"
 #include "qgsexpression.h"
-#include "qgsmapcanvas.h"
+#include "qgisapp.h"
+#include "qgsproject.h"
+#include "qgscharacterselectdialog.h"
 
 #include 
 #include 
@@ -41,6 +43,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
   if ( !layer ) return;
 
   setupUi( this );
+  mCharDlg = new QgsCharacterSelectorDialog( this );
 
   mRefFont = lblFontPreview->font();
   mPreviewSize = 24;
@@ -77,7 +80,7 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
 
   //mTabWidget->setEnabled( chkEnableLabeling->isChecked() );
   chkMergeLines->setEnabled( layer->geometryType() == QGis::Line );
-  chkAddDirectionSymbol->setEnabled( layer->geometryType() == QGis::Line );
+  mDirectSymbGroupBox->setEnabled( layer->geometryType() == QGis::Line );
   label_19->setEnabled( layer->geometryType() != QGis::Point );
   mMinSizeSpinBox->setEnabled( layer->geometryType() != QGis::Point );
 
@@ -172,7 +175,27 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
   mPalShowAllLabelsForLayerChkBx->setChecked( lyr.displayAll );
   chkMergeLines->setChecked( lyr.mergeLines );
   mMinSizeSpinBox->setValue( lyr.minFeatureSize );
-  chkAddDirectionSymbol->setChecked( lyr.addDirectionSymbol );
+  mLimitLabelChkBox->setChecked( lyr.limitNumLabels );
+  mLimitLabelSpinBox->setValue( lyr.maxNumLabels );
+  mDirectSymbGroupBox->setChecked( lyr.addDirectionSymbol );
+  mDirectSymbLeftLineEdit->setText( lyr.leftDirectionSymbol );
+  mDirectSymbRightLineEdit->setText( lyr.rightDirectionSymbol );
+  mDirectSymbRevChkBx->setChecked( lyr.reverseDirectionSymbol );
+  switch ( lyr.placeDirectionSymbol )
+  {
+    case QgsPalLayerSettings::SymbolLeftRight:
+      mDirectSymbRadioBtnLR->setChecked( true );
+      break;
+    case QgsPalLayerSettings::SymbolAbove:
+      mDirectSymbRadioBtnAbove->setChecked( true );
+      break;
+    case QgsPalLayerSettings::SymbolBelow:
+      mDirectSymbRadioBtnBelow->setChecked( true );
+      break;
+    default:
+      mDirectSymbRadioBtnLR->setChecked( true );
+      break;
+  }
 
   // upside-down labels
   switch ( lyr.upsidedownLabels )
@@ -190,6 +213,9 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
       mUpsidedownRadioOff->setChecked( true );
       break;
   }
+  mMaxCharAngleInDSpinBox->setValue( lyr.maxCurvedCharAngleIn );
+  // lyr.maxCurvedCharAngleOut must be negative, but it is shown as positive spinbox in GUI
+  mMaxCharAngleOutDSpinBox->setValue( qAbs( lyr.maxCurvedCharAngleOut ) );
 
   wrapCharacterEdit->setText( lyr.wrapChar );
   mFontLineHeightSpinBox->setValue( lyr.multilineHeight );
@@ -239,6 +265,12 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
     chkPlusSign->setChecked( plusSign );
   }
 
+  // set pixel size limiting checked state before unit choice so limiting can be
+  // turned on as a default for map units, if minimum trigger value of 0 is used
+  mFontLimitPixelGroupBox->setChecked( lyr.fontLimitPixelSize );
+  mMinPixelLimit = lyr.fontMinPixelSize; // ignored after first settings save
+  mFontMinPixelSpinBox->setValue( lyr.fontMinPixelSize == 0 ? 3 : lyr.fontMinPixelSize );
+  mFontMaxPixelSpinBox->setValue( lyr.fontMaxPixelSize );
   if ( lyr.fontSizeInMapUnits )
   {
     mFontSizeUnitComboBox->setCurrentIndex( 1 );
@@ -253,6 +285,9 @@ QgsLabelingGui::QgsLabelingGui( QgsPalLabeling* lbl, QgsVectorLayer* layer, QgsM
   btnTextColor->setColor( lyr.textColor );
   mFontTranspSpinBox->setValue( lyr.textTransp );
 
+  mFontWordSpacingSpinBox->setValue( lyr.textFont.wordSpacing() );
+  mFontLetterSpacingSpinBox->setValue( lyr.textFont.letterSpacing() );
+
   updateFontViaStyle( lyr.textNamedStyle );
   updateFont( mRefFont );
 
@@ -440,14 +475,24 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
     lyr.decimals = spinDecimals->value();
     lyr.plusSign = true;
   }
-  if ( chkAddDirectionSymbol->isChecked() )
+
+  lyr.addDirectionSymbol = mDirectSymbGroupBox->isChecked();
+  lyr.leftDirectionSymbol = mDirectSymbLeftLineEdit->text();
+  lyr.rightDirectionSymbol = mDirectSymbRightLineEdit->text();
+  lyr.reverseDirectionSymbol = mDirectSymbRevChkBx->isChecked();
+  if ( mDirectSymbRadioBtnLR->isChecked() )
   {
-    lyr.addDirectionSymbol = true;
+    lyr.placeDirectionSymbol = QgsPalLayerSettings::SymbolLeftRight;
   }
-  else
+  else if ( mDirectSymbRadioBtnAbove->isChecked() )
+  {
+    lyr.placeDirectionSymbol = QgsPalLayerSettings::SymbolAbove;
+  }
+  else if ( mDirectSymbRadioBtnBelow->isChecked() )
   {
-    lyr.addDirectionSymbol = false;
+    lyr.placeDirectionSymbol = QgsPalLayerSettings::SymbolBelow;
   }
+
   if ( mUpsidedownRadioOff->isChecked() )
   {
     lyr.upsidedownLabels = QgsPalLayerSettings::Upright;
@@ -460,8 +505,17 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
   {
     lyr.upsidedownLabels = QgsPalLayerSettings::ShowAll;
   }
+  lyr.maxCurvedCharAngleIn = mMaxCharAngleInDSpinBox->value();
+  // lyr.maxCurvedCharAngleOut must be negative, but it is shown as positive spinbox in GUI
+  lyr.maxCurvedCharAngleOut = -mMaxCharAngleOutDSpinBox->value();
+
   lyr.minFeatureSize = mMinSizeSpinBox->value();
+  lyr.limitNumLabels = mLimitLabelChkBox->isChecked();
+  lyr.maxNumLabels = mLimitLabelSpinBox->value();
   lyr.fontSizeInMapUnits = ( mFontSizeUnitComboBox->currentIndex() == 1 );
+  lyr.fontLimitPixelSize = mFontLimitPixelGroupBox->isChecked();
+  lyr.fontMinPixelSize = mFontMinPixelSpinBox->value();
+  lyr.fontMaxPixelSize = mFontMaxPixelSpinBox->value();
   lyr.wrapChar = wrapCharacterEdit->text();
   lyr.multilineHeight = mFontLineHeightSpinBox->value();
   lyr.multilineAlign = ( QgsPalLayerSettings::MultiLineAlign ) mFontMultiLineComboBox->currentIndex();
@@ -495,6 +549,7 @@ QgsPalLayerSettings QgsLabelingGui::layerSettings()
   setDataDefinedProperty( mMaxScaleAttributeComboBox, QgsPalLayerSettings::MaxScale, lyr );
   setDataDefinedProperty( mTranspAttributeComboBox, QgsPalLayerSettings::FontTransp, lyr );
   setDataDefinedProperty( mBufferTranspAttributeComboBox, QgsPalLayerSettings::BufferTransp, lyr );
+  setDataDefinedProperty( mAlwaysShowAttributeComboBox, QgsPalLayerSettings::AlwaysShow, lyr );
 
   return lyr;
 }
@@ -564,6 +619,7 @@ void QgsLabelingGui::populateDataDefinedCombos( QgsPalLayerSettings& s )
   comboList << mMaxScaleAttributeComboBox;
   comboList << mTranspAttributeComboBox;
   comboList << mBufferTranspAttributeComboBox;
+  comboList << mAlwaysShowAttributeComboBox;
 
   QList::iterator comboIt = comboList.begin();
   for ( ; comboIt != comboList.end(); ++comboIt )
@@ -603,6 +659,7 @@ void QgsLabelingGui::populateDataDefinedCombos( QgsPalLayerSettings& s )
   setCurrentComboValue( mMaxScaleAttributeComboBox, s, QgsPalLayerSettings::MaxScale );
   setCurrentComboValue( mTranspAttributeComboBox, s, QgsPalLayerSettings::FontTransp );
   setCurrentComboValue( mBufferTranspAttributeComboBox, s, QgsPalLayerSettings::BufferTransp );
+  setCurrentComboValue( mAlwaysShowAttributeComboBox, s, QgsPalLayerSettings::AlwaysShow );
 }
 
 void QgsLabelingGui::changeTextColor()
@@ -721,6 +778,8 @@ void QgsLabelingGui::updateFont( QFont font )
   }
 
   lblFontName->setText( QString( "%1%2" ).arg( mRefFont.family() ).arg( missingtxt ) );
+  mDirectSymbLeftLineEdit->setFont( mRefFont );
+  mDirectSymbRightLineEdit->setFont( mRefFont );
 
   blockFontChangeSignals( true );
   populateFontStyleComboBox();
@@ -728,8 +787,6 @@ void QgsLabelingGui::updateFont( QFont font )
   mFontCapitalsComboBox->setCurrentIndex( idx == -1 ? 0 : idx );
   mFontUnderlineBtn->setChecked( mRefFont.underline() );
   mFontStrikethroughBtn->setChecked( mRefFont.strikeOut() );
-  mFontWordSpacingSpinBox->setValue( mRefFont.wordSpacing() );
-  mFontLetterSpacingSpinBox->setValue( mRefFont.letterSpacing() );
   blockFontChangeSignals( false );
 
   // update font name with font face
@@ -845,6 +902,13 @@ void QgsLabelingGui::showExpressionDialog()
 {
   QgsExpressionBuilderDialog dlg( mLayer, cboFieldName->currentText() , this );
   dlg.setWindowTitle( tr( "Expression based label" ) );
+
+  QgsDistanceArea myDa;
+  myDa.setSourceCrs( mLayer->crs().srsid() );
+  myDa.setEllipsoidalMode( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() );
+  myDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
+  dlg.setGeomCalculator( myDa );
+
   if ( dlg.exec() == QDialog::Accepted )
   {
     QString expression =  dlg.expressionText();
@@ -909,6 +973,8 @@ void QgsLabelingGui::updateOptions()
            || ( stackedPlacement->currentWidget() == pageLine && radLineCurved->isChecked() ) )
   {
     stackedOptions->setCurrentWidget( pageOptionsLine );
+    mMaxCharAngleFrame->setVisible(( stackedPlacement->currentWidget() == pageLine
+                                     && radLineCurved->isChecked() ) );
   }
   else
   {
@@ -1003,25 +1069,43 @@ void QgsLabelingGui::on_mFontLetterSpacingSpinBox_valueChanged( double spacing )
 
 void QgsLabelingGui::on_mFontSizeUnitComboBox_currentIndexChanged( int index )
 {
-  double singleStep = ( index == 1 ) ? 10.0 : 1.0 ; //10 for map units, 1 for mm
-  mFontSizeSpinBox->setSingleStep( singleStep );
-  mFontWordSpacingSpinBox->setSingleStep( singleStep );
-  mFontLetterSpacingSpinBox->setSingleStep( singleStep / 10 );
+  // disable pixel size limiting for labels defined in points
+  if ( index == 0 )
+  {
+    mFontLimitPixelGroupBox->setChecked( false );
+  }
+  else if ( index == 1 && mMinPixelLimit == 0 )
+  {
+    // initial minimum trigger value set, turn on pixel size limiting by default
+    // for labels defined in map units (ignored after first settings save)
+    mFontLimitPixelGroupBox->setChecked( true );
+  }
   updateFont( mRefFont );
 }
 
-void QgsLabelingGui::on_mBufferUnitComboBox_currentIndexChanged( int index )
+void QgsLabelingGui::on_mFontMinPixelSpinBox_valueChanged( int px )
 {
-  double singleStep = ( index == 1 ) ? 1.0 : 0.1 ; //1.0 for map units, 0.1 for mm
-  spinBufferSize->setSingleStep( singleStep );
-  updateFont( mRefFont );
+  // ensure max font pixel size for map unit labels can't be lower than min
+  mFontMaxPixelSpinBox->setMinimum( px );
+  mFontMaxPixelSpinBox->update();
 }
 
-void QgsLabelingGui::on_mPointOffsetUnitsComboBox_currentIndexChanged( int index )
+void QgsLabelingGui::on_mFontMaxPixelSpinBox_valueChanged( int px )
 {
-  double singleStep = ( index == 1 ) ? 1.0 : 0.1 ; //1.0 for map units, 0.1 for mm
-  mPointOffsetXOffsetSpinBox->setSingleStep( singleStep );
-  mPointOffsetYOffsetSpinBox->setSingleStep( singleStep );
+  // ensure max font pixel size for map unit labels can't be lower than min
+  if ( px < mFontMinPixelSpinBox->value() )
+  {
+    mFontMaxPixelSpinBox->blockSignals( true );
+    mFontMaxPixelSpinBox->setValue( mFontMinPixelSpinBox->value() );
+    mFontMaxPixelSpinBox->blockSignals( false );
+  }
+  mFontMaxPixelSpinBox->setMinimum( mFontMinPixelSpinBox->value() );
+}
+
+void QgsLabelingGui::on_mBufferUnitComboBox_currentIndexChanged( int index )
+{
+  Q_UNUSED( index );
+  updateFont( mRefFont );
 }
 
 void QgsLabelingGui::on_mXCoordinateComboBox_currentIndexChanged( const QString & text )
@@ -1070,6 +1154,34 @@ void QgsLabelingGui::on_mPreviewBackgroundBtn_clicked()
   setPreviewBackground( color );
 }
 
+void QgsLabelingGui::on_mDirectSymbLeftToolBtn_clicked()
+{
+  bool gotChar = false;
+  QChar dirSymb = QChar();
+
+  dirSymb = mCharDlg->selectCharacter( &gotChar, mRefFont, mFontDB.styleString( mRefFont ) );
+
+  if ( !gotChar )
+    return;
+
+  if ( !dirSymb.isNull() )
+    mDirectSymbLeftLineEdit->setText( QString( dirSymb ) );
+}
+
+void QgsLabelingGui::on_mDirectSymbRightToolBtn_clicked()
+{
+  bool gotChar = false;
+  QChar dirSymb = QChar();
+
+  dirSymb = mCharDlg->selectCharacter( &gotChar, mRefFont, mFontDB.styleString( mRefFont ) );
+
+  if ( !gotChar )
+    return;
+
+  if ( !dirSymb.isNull() )
+    mDirectSymbRightLineEdit->setText( QString( dirSymb ) );
+}
+
 void QgsLabelingGui::disableDataDefinedAlignment()
 {
   mHorizontalAlignmentComboBox->setCurrentIndex( mHorizontalAlignmentComboBox->findText( "" ) );
diff --git a/src/app/qgslabelinggui.h b/src/app/qgslabelinggui.h
index 76a366ad4026..980aea6f08a6 100644
--- a/src/app/qgslabelinggui.h
+++ b/src/app/qgslabelinggui.h
@@ -24,6 +24,7 @@
 
 class QgsVectorLayer;
 class QgsMapCanvas;
+class QgsCharacterSelectorDialog;
 
 #include "qgspallabeling.h"
 
@@ -61,14 +62,17 @@ class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
     void on_mFontWordSpacingSpinBox_valueChanged( double spacing );
     void on_mFontLetterSpacingSpinBox_valueChanged( double spacing );
     void on_mFontSizeUnitComboBox_currentIndexChanged( int index );
+    void on_mFontMinPixelSpinBox_valueChanged( int px );
+    void on_mFontMaxPixelSpinBox_valueChanged( int px );
     void on_mBufferUnitComboBox_currentIndexChanged( int index );
-    void on_mPointOffsetUnitsComboBox_currentIndexChanged( int index );
     void on_mXCoordinateComboBox_currentIndexChanged( const QString & text );
     void on_mYCoordinateComboBox_currentIndexChanged( const QString & text );
 
     void on_mPreviewTextEdit_textChanged( const QString & text );
     void on_mPreviewTextBtn_clicked();
     void on_mPreviewBackgroundBtn_clicked();
+    void on_mDirectSymbLeftToolBtn_clicked();
+    void on_mDirectSymbRightToolBtn_clicked();
 
   protected:
     void blockFontChangeSignals( bool blk );
@@ -89,6 +93,7 @@ class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
     QgsVectorLayer* mLayer;
     QgsMapCanvas* mMapCanvas;
     QFontDatabase mFontDB;
+    QgsCharacterSelectorDialog* mCharDlg;
 
     // background reference font
     QFont mRefFont;
@@ -96,6 +101,7 @@ class QgsLabelingGui : public QWidget, private Ui::QgsLabelingGuiBase
 
     int mXQuadOffset;
     int mYQuadOffset;
+    int mMinPixelLimit;
 
     void disableDataDefinedAlignment();
     void enableDataDefinedAlignment();
diff --git a/src/app/qgslabelpropertydialog.cpp b/src/app/qgslabelpropertydialog.cpp
index 736806075807..e19c6e08be76 100644
--- a/src/app/qgslabelpropertydialog.cpp
+++ b/src/app/qgslabelpropertydialog.cpp
@@ -114,6 +114,10 @@ void QgsLabelPropertyDialog::init( const QString& layerId, int featureId )
         mShowLabelChkbx->setEnabled( true );
         mShowLabelChkbx->setChecked( attributeValues[propIt.value()].toInt() != 0 );
         break;
+      case QgsPalLayerSettings::AlwaysShow:
+        mAlwaysShowChkbx->setEnabled( true );
+        mAlwaysShowChkbx->setChecked( attributeValues[propIt.value()].toBool() );
+        break;
       case QgsPalLayerSettings::MinScale:
         mMinScaleSpinBox->setEnabled( true );
         mMinScaleSpinBox->setValue( attributeValues[propIt.value()].toInt() );
@@ -191,6 +195,7 @@ void QgsLabelPropertyDialog::init( const QString& layerId, int featureId )
 void QgsLabelPropertyDialog::disableGuiElements()
 {
   mShowLabelChkbx->setEnabled( false );
+  mAlwaysShowChkbx->setEnabled( false );
   mMinScaleSpinBox->setEnabled( false );
   mMaxScaleSpinBox->setEnabled( false );
   mFontSizeSpinBox->setEnabled( false );
@@ -209,6 +214,7 @@ void QgsLabelPropertyDialog::disableGuiElements()
 void QgsLabelPropertyDialog::blockElementSignals( bool block )
 {
   mShowLabelChkbx->blockSignals( block );
+  mAlwaysShowChkbx->blockSignals( block );
   mMinScaleSpinBox->blockSignals( block );
   mMaxScaleSpinBox->blockSignals( block );
   mFontSizeSpinBox->blockSignals( block );
@@ -243,6 +249,11 @@ void QgsLabelPropertyDialog::on_mShowLabelChkbx_toggled( bool chkd )
   insertChangedValue( QgsPalLayerSettings::Show, ( chkd ? 1 : 0 ) );
 }
 
+void QgsLabelPropertyDialog::on_mAlwaysShowChkbx_toggled( bool chkd )
+{
+  insertChangedValue( QgsPalLayerSettings::AlwaysShow, ( chkd ? 1 : 0 ) );
+}
+
 void QgsLabelPropertyDialog::on_mMinScaleSpinBox_valueChanged( int i )
 {
   insertChangedValue( QgsPalLayerSettings::MinScale, i );
diff --git a/src/app/qgslabelpropertydialog.h b/src/app/qgslabelpropertydialog.h
index 4d75055767a7..47d2fbed748b 100644
--- a/src/app/qgslabelpropertydialog.h
+++ b/src/app/qgslabelpropertydialog.h
@@ -38,6 +38,7 @@ class QgsLabelPropertyDialog: public QDialog, private Ui::QgsLabelPropertyDialog
 
   private slots:
     void on_mShowLabelChkbx_toggled( bool chkd );
+    void on_mAlwaysShowChkbx_toggled( bool chkd );
     void on_mMinScaleSpinBox_valueChanged( int i );
     void on_mMaxScaleSpinBox_valueChanged( int i );
     void on_mLabelDistanceSpinBox_valueChanged( double d );
diff --git a/src/app/qgsmaptoolannotation.cpp b/src/app/qgsmaptoolannotation.cpp
index d39949966323..b3c4d76be8d5 100644
--- a/src/app/qgsmaptoolannotation.cpp
+++ b/src/app/qgsmaptoolannotation.cpp
@@ -24,6 +24,8 @@
 #include "qgsmapcanvas.h"
 #include "qgstextannotationdialog.h"
 #include "qgstextannotationitem.h"
+#include "qgssvgannotationdialog.h"
+#include "qgssvgannotationitem.h"
 #include 
 #include 
 
@@ -68,6 +70,12 @@ QDialog* QgsMapToolAnnotation::createItemEditor( QgsAnnotationItem *item )
     return new QgsHtmlAnnotationDialog( hItem );
   }
 
+  QgsSvgAnnotationItem* sItem = dynamic_cast( item );
+  if ( sItem )
+  {
+    return new QgsSvgAnnotationDialog( sItem );
+  }
+
   return 0;
 }
 
diff --git a/src/app/qgsmaptoolcapture.cpp b/src/app/qgsmaptoolcapture.cpp
index 0288490dbbcb..2a8c8bd294be 100644
--- a/src/app/qgsmaptoolcapture.cpp
+++ b/src/app/qgsmaptoolcapture.cpp
@@ -204,7 +204,7 @@ int QgsMapToolCapture::addVertex( const QPoint &p )
 
   if ( !mRubberBand )
   {
-    mRubberBand = createRubberBand( mCaptureMode == CapturePolygon );
+    mRubberBand = createRubberBand( mCaptureMode == CapturePolygon ? QGis::Polygon : QGis::Line );
   }
 
   mRubberBand->addPoint( mapPoint );
diff --git a/src/app/qgsmaptooledit.cpp b/src/app/qgsmaptooledit.cpp
index 9da149ac3d2e..dbde6b6bc5df 100644
--- a/src/app/qgsmaptooledit.cpp
+++ b/src/app/qgsmaptooledit.cpp
@@ -66,10 +66,10 @@ QgsPoint QgsMapToolEdit::snapPointFromResults( const QList& s
   }
 }
 
-QgsRubberBand* QgsMapToolEdit::createRubberBand( bool isPolygon )
+QgsRubberBand* QgsMapToolEdit::createRubberBand( QGis::GeometryType geometryType )
 {
   QSettings settings;
-  QgsRubberBand* rb = new QgsRubberBand( mCanvas, isPolygon );
+  QgsRubberBand* rb = new QgsRubberBand( mCanvas, geometryType );
   QColor color( settings.value( "/qgis/digitizing/line_color_red", 255 ).toInt(),
                 settings.value( "/qgis/digitizing/line_color_green", 0 ).toInt(),
                 settings.value( "/qgis/digitizing/line_color_blue", 0 ).toInt() );
diff --git a/src/app/qgsmaptooledit.h b/src/app/qgsmaptooledit.h
index 7fd27f0bcc4b..ebc28d7e5661 100644
--- a/src/app/qgsmaptooledit.h
+++ b/src/app/qgsmaptooledit.h
@@ -53,7 +53,7 @@ class QgsMapToolEdit: public QgsMapTool
     /**Creates a rubber band with the color/line width from
      the QGIS settings. The caller takes ownership of the
     returned object*/
-    QgsRubberBand* createRubberBand( bool isPolygon = false );
+    QgsRubberBand* createRubberBand( QGis::GeometryType geometryType = QGis::Line );
 
     /**Returns the current vector layer of the map canvas or 0*/
     QgsVectorLayer* currentVectorLayer();
diff --git a/src/app/qgsmaptoolidentify.cpp b/src/app/qgsmaptoolidentify.cpp
index 304d693ef837..4b26f9ad4071 100644
--- a/src/app/qgsmaptoolidentify.cpp
+++ b/src/app/qgsmaptoolidentify.cpp
@@ -31,6 +31,7 @@
 #include "qgsproject.h"
 #include "qgsmaplayerregistry.h"
 #include "qgisapp.h"
+#include "qgsrendererv2.h"
 
 #include 
 #include 
@@ -196,7 +197,15 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
   if ( !layer )
     return false;
 
-  QMap< QString, QString > attributes, derivedAttributes;
+  if ( layer->hasScaleBasedVisibility() &&
+       ( layer->minimumScale() > mCanvas->mapRenderer()->scale() ||
+         layer->maximumScale() <= mCanvas->mapRenderer()->scale() ) )
+  {
+    QgsDebugMsg( "Out of scale limits" );
+    return false;
+  }
+
+  QMap< QString, QString > derivedAttributes;
 
   QgsPoint point = mCanvas->getCoordinateTransform()->toMapCoordinates( x, y );
 
@@ -205,7 +214,8 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
   // load identify radius from settings
   QSettings settings;
   double identifyValue = settings.value( "/Map/identifyRadius", QGis::DEFAULT_IDENTIFY_RADIUS ).toDouble();
-  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
+
+  QString ellipsoid = QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE );
 
   if ( identifyValue <= 0.0 )
     identifyValue = QGis::DEFAULT_IDENTIFY_RADIUS;
@@ -250,14 +260,27 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
     calc.setEllipsoid( ellipsoid );
     calc.setSourceCrs( layer->crs().srsid() );
   }
+
   QgsFeatureList::iterator f_it = featureList.begin();
 
-  for ( ; f_it != featureList.end(); ++f_it )
+  bool filter = false;
+
+  QgsFeatureRendererV2* renderer = layer->rendererV2();
+  if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent )
   {
-    featureCount++;
+    // setup scale for scale dependent visibility (rule based)
+    renderer->startRender( *( mCanvas->mapRenderer()->rendererContext() ), layer );
+    filter = renderer->capabilities() & QgsFeatureRendererV2::Filter;
+  }
 
+  for ( ; f_it != featureList.end(); ++f_it )
+  {
     QgsFeatureId fid = f_it->id();
-    QMap derivedAttributes;
+
+    if ( filter && !renderer->willRenderFeature( *f_it ) )
+      continue;
+
+    featureCount++;
 
     // Calculate derived attributes and insert:
     // measure distance or area depending on geometry type
@@ -272,33 +295,39 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
            f_it->geometry()->wkbType() == QGis::WKBLineString25D )
       {
         // Add the start and end points in as derived attributes
-        str = QLocale::system().toString( f_it->geometry()->asPolyline().first().x(), 'g', 10 );
+        QgsPoint pnt = mCanvas->mapRenderer()->layerToMapCoordinates( layer, f_it->geometry()->asPolyline().first() );
+        str = QLocale::system().toString( pnt.x(), 'g', 10 );
         derivedAttributes.insert( tr( "firstX", "attributes get sorted; translation for lastX should be lexically larger than this one" ), str );
-        str = QLocale::system().toString( f_it->geometry()->asPolyline().first().y(), 'g', 10 );
+        str = QLocale::system().toString( pnt.y(), 'g', 10 );
         derivedAttributes.insert( tr( "firstY" ), str );
-        str = QLocale::system().toString( f_it->geometry()->asPolyline().last().x(), 'g', 10 );
+        pnt = mCanvas->mapRenderer()->layerToMapCoordinates( layer, f_it->geometry()->asPolyline().last() );
+        str = QLocale::system().toString( pnt.x(), 'g', 10 );
         derivedAttributes.insert( tr( "lastX", "attributes get sorted; translation for firstX should be lexically smaller than this one" ), str );
-        str = QLocale::system().toString( f_it->geometry()->asPolyline().last().y(), 'g', 10 );
+        str = QLocale::system().toString( pnt.y(), 'g', 10 );
         derivedAttributes.insert( tr( "lastY" ), str );
       }
     }
     else if ( layer->geometryType() == QGis::Polygon )
     {
       double area = calc.measure( f_it->geometry() );
+      double perimeter = calc.measurePerimeter( f_it->geometry() );
       QGis::UnitType myDisplayUnits;
       convertMeasurement( calc, area, myDisplayUnits, true );  // area and myDisplayUnits are out params
       QString str = calc.textUnit( area, 3, myDisplayUnits, true );
       derivedAttributes.insert( tr( "Area" ), str );
+      convertMeasurement( calc, perimeter, myDisplayUnits, false );  // area and myDisplayUnits are out params
+      str = calc.textUnit( perimeter, 3, myDisplayUnits, false );
+      derivedAttributes.insert( tr( "Perimeter" ), str );
     }
     else if ( layer->geometryType() == QGis::Point &&
               ( f_it->geometry()->wkbType() == QGis::WKBPoint ||
                 f_it->geometry()->wkbType() == QGis::WKBPoint25D ) )
     {
       // Include the x and y coordinates of the point as a derived attribute
-      QString str;
-      str = QLocale::system().toString( f_it->geometry()->asPoint().x(), 'g', 10 );
+      QgsPoint pnt = mCanvas->mapRenderer()->layerToMapCoordinates( layer, f_it->geometry()->asPoint() );
+      QString str = QLocale::system().toString( pnt.x(), 'g', 10 );
       derivedAttributes.insert( "X", str );
-      str = QLocale::system().toString( f_it->geometry()->asPoint().y(), 'g', 10 );
+      str = QLocale::system().toString( pnt.y(), 'g', 10 );
       derivedAttributes.insert( "Y", str );
     }
 
@@ -307,6 +336,11 @@ bool QgsMapToolIdentify::identifyVectorLayer( QgsVectorLayer *layer, int x, int
     results()->addFeature( layer, *f_it, derivedAttributes );
   }
 
+  if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent )
+  {
+    renderer->stopRender( *( mCanvas->mapRenderer()->rendererContext() ) );
+  }
+
   QgsDebugMsg( "Feature count on identify: " + QString::number( featureCount ) );
 
   return featureCount > 0;
diff --git a/src/app/qgsmaptoollabel.cpp b/src/app/qgsmaptoollabel.cpp
index e68e1badabdb..9cca946acb7c 100644
--- a/src/app/qgsmaptoollabel.cpp
+++ b/src/app/qgsmaptoollabel.cpp
@@ -59,7 +59,7 @@ void QgsMapToolLabel::createRubberBands( )
 
   //label rubber band
   QgsRectangle rect = mCurrentLabelPos.labelRect;
-  mLabelRubberBand = new QgsRubberBand( mCanvas, false );
+  mLabelRubberBand = new QgsRubberBand( mCanvas, QGis::Line );
   mLabelRubberBand->addPoint( QgsPoint( rect.xMinimum(), rect.yMinimum() ) );
   mLabelRubberBand->addPoint( QgsPoint( rect.xMinimum(), rect.yMaximum() ) );
   mLabelRubberBand->addPoint( QgsPoint( rect.xMaximum(), rect.yMaximum() ) );
@@ -79,7 +79,7 @@ void QgsMapToolLabel::createRubberBands( )
       QgsGeometry* geom = f.geometry();
       if ( geom )
       {
-        mFeatureRubberBand = new QgsRubberBand( mCanvas, geom->type() == QGis::Polygon );
+        mFeatureRubberBand = new QgsRubberBand( mCanvas, geom->type() );
         mFeatureRubberBand->setColor( Qt::red );
         mFeatureRubberBand->setToGeometry( geom, vlayer );
         mFeatureRubberBand->show();
@@ -100,7 +100,7 @@ void QgsMapToolLabel::createRubberBands( )
       }
 
       QgsGeometry* pointGeom = QgsGeometry::fromPoint( fixPoint );
-      mFixPointRubberBand = new QgsRubberBand( mCanvas, false );
+      mFixPointRubberBand = new QgsRubberBand( mCanvas, QGis::Line );
       mFixPointRubberBand->setColor( Qt::blue );
       mFixPointRubberBand->setToGeometry( pointGeom, vlayer );
       mFixPointRubberBand->show();
diff --git a/src/app/qgsmaptoolmeasureangle.cpp b/src/app/qgsmaptoolmeasureangle.cpp
index 33a7532d97b8..b69b4c06b633 100644
--- a/src/app/qgsmaptoolmeasureangle.cpp
+++ b/src/app/qgsmaptoolmeasureangle.cpp
@@ -19,6 +19,7 @@
 #include "qgslogger.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaptopixel.h"
+#include "qgsproject.h"
 #include "qgsrubberband.h"
 #include 
 #include 
@@ -126,7 +127,7 @@ void QgsMapToolMeasureAngle::deactivate()
 void QgsMapToolMeasureAngle::createRubberBand()
 {
   delete mRubberBand;
-  mRubberBand = new QgsRubberBand( mCanvas, false );
+  mRubberBand = new QgsRubberBand( mCanvas, QGis::Line );
 
   QSettings settings;
   int myRed = settings.value( "/qgis/default_measure_color_red", 180 ).toInt();
@@ -182,7 +183,7 @@ void QgsMapToolMeasureAngle::updateSettings()
 void QgsMapToolMeasureAngle::configureDistanceArea()
 {
   QSettings settings;
-  QString ellipsoidId = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
+  QString ellipsoidId = QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE );
   mDa.setSourceCrs( mCanvas->mapRenderer()->destinationCrs().srsid() );
   mDa.setEllipsoid( ellipsoidId );
   // Only use ellipsoidal calculation when project wide transformation is enabled.
diff --git a/src/app/qgsmaptooloffsetcurve.cpp b/src/app/qgsmaptooloffsetcurve.cpp
index 975dc340d3a4..09f7f4638971 100644
--- a/src/app/qgsmaptooloffsetcurve.cpp
+++ b/src/app/qgsmaptooloffsetcurve.cpp
@@ -355,7 +355,7 @@ void QgsMapToolOffsetCurve::setOffsetForRubberBand( double offset, bool leftSide
     int quadSegments = s.value( "/qgis/digitizing/offset_quad_seg", 8 ).toInt();
     double mitreLimit = s.value( "/qgis/digitizing/offset_miter_limit", 5.0 ).toDouble();
 
-    GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, ( leftSide > 0 ) ? offset : -offset, quadSegments, joinStyle, mitreLimit );
+    GEOSGeometry* offsetGeom = GEOSOffsetCurve( geosGeom, leftSide ? offset : -offset, quadSegments, joinStyle, mitreLimit );
     if ( !offsetGeom )
     {
       deleteRubberBandAndGeometry();
diff --git a/src/app/qgsmaptoolpinlabels.cpp b/src/app/qgsmaptoolpinlabels.cpp
index ab3534f870ca..0e048184dad8 100644
--- a/src/app/qgsmaptoolpinlabels.cpp
+++ b/src/app/qgsmaptoolpinlabels.cpp
@@ -52,7 +52,7 @@ void QgsMapToolPinLabels::canvasPressEvent( QMouseEvent * e )
   mSelectRect.setRect( 0, 0, 0, 0 );
   mSelectRect.setTopLeft( e->pos() );
   mSelectRect.setBottomRight( e->pos() );
-  mRubberBand = new QgsRubberBand( mCanvas, true );
+  mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
 }
 
 void QgsMapToolPinLabels::canvasMoveEvent( QMouseEvent * e )
@@ -105,7 +105,7 @@ void QgsMapToolPinLabels::canvasReleaseEvent( QMouseEvent * e )
 
     delete selectGeom;
 
-    mRubberBand->reset( true );
+    mRubberBand->reset( QGis::Polygon );
     delete mRubberBand;
     mRubberBand = 0;
   }
diff --git a/src/app/qgsmaptoolrotatelabel.cpp b/src/app/qgsmaptoolrotatelabel.cpp
index c0d1ca37f994..95a096109c83 100644
--- a/src/app/qgsmaptoolrotatelabel.cpp
+++ b/src/app/qgsmaptoolrotatelabel.cpp
@@ -197,7 +197,7 @@ QgsRubberBand* QgsMapToolRotateLabel::createRotationPreviewBox()
     return 0;
   }
 
-  mRotationPreviewBox = new QgsRubberBand( mCanvas, false );
+  mRotationPreviewBox = new QgsRubberBand( mCanvas, QGis::Line );
   mRotationPreviewBox->setColor( Qt::blue );
   mRotationPreviewBox->setWidth( 3 );
   setRotationPreviewBox( mCurrentRotation - mStartRotation );
diff --git a/src/app/qgsmaptoolselect.cpp b/src/app/qgsmaptoolselect.cpp
index 541cb603f93e..613f041d50e2 100644
--- a/src/app/qgsmaptoolselect.cpp
+++ b/src/app/qgsmaptoolselect.cpp
@@ -40,7 +40,7 @@ void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
   {
     return;
   }
-  QgsRubberBand rubberBand( mCanvas, true );
+  QgsRubberBand rubberBand( mCanvas, QGis::Polygon );
   QRect selectRect( 0, 0, 0, 0 );
   QgsMapToolSelectUtils::expandSelectRectangle( selectRect, vlayer, e->pos() );
   QgsMapToolSelectUtils::setRubberBand( mCanvas, selectRect, &rubberBand );
@@ -48,5 +48,5 @@ void QgsMapToolSelect::canvasReleaseEvent( QMouseEvent * e )
   bool doDifference = e->modifiers() & Qt::ControlModifier ? true : false;
   QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, false, doDifference, true );
   delete selectGeom;
-  rubberBand.reset( true );
+  rubberBand.reset( QGis::Polygon );
 }
diff --git a/src/app/qgsmaptoolselectfreehand.cpp b/src/app/qgsmaptoolselectfreehand.cpp
index ca4cb382a599..38d6bc9c1177 100644
--- a/src/app/qgsmaptoolselectfreehand.cpp
+++ b/src/app/qgsmaptoolselectfreehand.cpp
@@ -43,7 +43,7 @@ void QgsMapToolSelectFreehand::canvasPressEvent( QMouseEvent * e )
   }
   if ( mRubberBand == NULL )
   {
-    mRubberBand = new QgsRubberBand( mCanvas, true );
+    mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
   }
   mRubberBand->addPoint( toMapCoordinates( e->pos() ) );
   mDragging = true;
@@ -72,7 +72,7 @@ void QgsMapToolSelectFreehand::canvasReleaseEvent( QMouseEvent * e )
     QgsMapToolSelectUtils::setSelectFeatures( mCanvas, shapeGeom, e );
     delete shapeGeom;
   }
-  mRubberBand->reset( true );
+  mRubberBand->reset( QGis::Polygon );
   delete mRubberBand;
   mRubberBand = 0;
   mDragging = false;
diff --git a/src/app/qgsmaptoolselectpolygon.cpp b/src/app/qgsmaptoolselectpolygon.cpp
index 4716348112a4..5e58314b31ad 100644
--- a/src/app/qgsmaptoolselectpolygon.cpp
+++ b/src/app/qgsmaptoolselectpolygon.cpp
@@ -39,7 +39,7 @@ void QgsMapToolSelectPolygon::canvasPressEvent( QMouseEvent * e )
 {
   if ( mRubberBand == NULL )
   {
-    mRubberBand = new QgsRubberBand( mCanvas, true );
+    mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
   }
   if ( e->button() == Qt::LeftButton )
   {
@@ -53,7 +53,7 @@ void QgsMapToolSelectPolygon::canvasPressEvent( QMouseEvent * e )
       QgsMapToolSelectUtils::setSelectFeatures( mCanvas, polygonGeom, e );
       delete polygonGeom;
     }
-    mRubberBand->reset( true );
+    mRubberBand->reset( QGis::Polygon );
     delete mRubberBand;
     mRubberBand = 0;
   }
diff --git a/src/app/qgsmaptoolselectradius.cpp b/src/app/qgsmaptoolselectradius.cpp
index 9828db2f80c7..1c4c70b3407e 100644
--- a/src/app/qgsmaptoolselectradius.cpp
+++ b/src/app/qgsmaptoolselectradius.cpp
@@ -62,7 +62,7 @@ void QgsMapToolSelectRadius::canvasMoveEvent( QMouseEvent * e )
   {
     if ( mRubberBand == NULL )
     {
-      mRubberBand = new QgsRubberBand( mCanvas, true );
+      mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
     }
     mDragging = true;
   }
@@ -81,7 +81,7 @@ void QgsMapToolSelectRadius::canvasReleaseEvent( QMouseEvent * e )
   {
     if ( mRubberBand == NULL )
     {
-      mRubberBand = new QgsRubberBand( mCanvas, true );
+      mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
     }
     mRadiusCenter = toMapCoordinates( e->pos() );
     QgsPoint radiusEdge = toMapCoordinates( QPoint( e->pos().x() + 1, e->pos().y() + 1 ) );
@@ -90,7 +90,7 @@ void QgsMapToolSelectRadius::canvasReleaseEvent( QMouseEvent * e )
   QgsGeometry* radiusGeometry = mRubberBand->asGeometry();
   QgsMapToolSelectUtils::setSelectFeatures( mCanvas, radiusGeometry, e );
   delete radiusGeometry;
-  mRubberBand->reset( true );
+  mRubberBand->reset( QGis::Polygon );
   delete mRubberBand;
   mRubberBand = 0;
   mDragging = false;
@@ -100,7 +100,7 @@ void QgsMapToolSelectRadius::canvasReleaseEvent( QMouseEvent * e )
 void QgsMapToolSelectRadius::setRadiusRubberBand( QgsPoint & radiusEdge )
 {
   double r = sqrt( mRadiusCenter.sqrDist( radiusEdge ) );
-  mRubberBand->reset( true );
+  mRubberBand->reset( QGis::Polygon );
   for ( int i = 0; i <= RADIUS_SEGMENTS; ++i )
   {
     double theta = i * ( 2.0 * M_PI / RADIUS_SEGMENTS );
diff --git a/src/app/qgsmaptoolselectrectangle.cpp b/src/app/qgsmaptoolselectrectangle.cpp
index 503ec3fe6b94..f975d58338cb 100644
--- a/src/app/qgsmaptoolselectrectangle.cpp
+++ b/src/app/qgsmaptoolselectrectangle.cpp
@@ -42,7 +42,7 @@ void QgsMapToolSelectRectangle::canvasPressEvent( QMouseEvent *e )
 {
   Q_UNUSED( e );
   mSelectRect.setRect( 0, 0, 0, 0 );
-  mRubberBand = new QgsRubberBand( mCanvas, true );
+  mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
 }
 
 
@@ -97,7 +97,7 @@ void QgsMapToolSelectRectangle::canvasReleaseEvent( QMouseEvent *e )
     QgsMapToolSelectUtils::setSelectFeatures( mCanvas, selectGeom, e );
     delete selectGeom;
 
-    mRubberBand->reset( true );
+    mRubberBand->reset( QGis::Polygon );
     delete mRubberBand;
     mRubberBand = 0;
   }
diff --git a/src/app/qgsmaptoolselectutils.cpp b/src/app/qgsmaptoolselectutils.cpp
index a982eaf6320f..ff67114f25bf 100644
--- a/src/app/qgsmaptoolselectutils.cpp
+++ b/src/app/qgsmaptoolselectutils.cpp
@@ -51,7 +51,7 @@ void QgsMapToolSelectUtils::setRubberBand( QgsMapCanvas* canvas, QRect& selectRe
 
   if ( rubberBand )
   {
-    rubberBand->reset( true );
+    rubberBand->reset( QGis::Polygon );
     rubberBand->addPoint( ll, false );
     rubberBand->addPoint( QgsPoint( ur.x(), ll.y() ), false );
     rubberBand->addPoint( ur, false );
diff --git a/src/app/qgsmaptoolshowhidelabels.cpp b/src/app/qgsmaptoolshowhidelabels.cpp
index 4340a663ec23..592b31a427c0 100644
--- a/src/app/qgsmaptoolshowhidelabels.cpp
+++ b/src/app/qgsmaptoolshowhidelabels.cpp
@@ -45,7 +45,7 @@ void QgsMapToolShowHideLabels::canvasPressEvent( QMouseEvent * e )
   mSelectRect.setRect( 0, 0, 0, 0 );
   mSelectRect.setTopLeft( e->pos() );
   mSelectRect.setBottomRight( e->pos() );
-  mRubberBand = new QgsRubberBand( mCanvas, true );
+  mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
 }
 
 void QgsMapToolShowHideLabels::canvasMoveEvent( QMouseEvent * e )
@@ -93,7 +93,7 @@ void QgsMapToolShowHideLabels::canvasReleaseEvent( QMouseEvent * e )
 
     showHideLabels( e );
 
-    mRubberBand->reset( true );
+    mRubberBand->reset( QGis::Polygon );
     delete mRubberBand;
     mRubberBand = 0;
   }
diff --git a/src/app/qgsmaptoolsvgannotation.cpp b/src/app/qgsmaptoolsvgannotation.cpp
new file mode 100644
index 000000000000..7fe67c46b0f0
--- /dev/null
+++ b/src/app/qgsmaptoolsvgannotation.cpp
@@ -0,0 +1,39 @@
+/***************************************************************************
+                              qgsmaptoolsvgannotation.cpp
+                              ---------------------------
+  begin                : November, 2012
+  copyright            : (C) 2012 by Marco Hugentobler
+  email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsmaptoolsvgannotation.h"
+#include "qgssvgannotationitem.h"
+#include 
+
+QgsMapToolSvgAnnotation::QgsMapToolSvgAnnotation( QgsMapCanvas* canvas ): QgsMapToolAnnotation( canvas )
+{
+
+}
+
+QgsMapToolSvgAnnotation::~QgsMapToolSvgAnnotation()
+{
+
+}
+
+QgsAnnotationItem* QgsMapToolSvgAnnotation::createItem( QMouseEvent* e )
+{
+  QgsSvgAnnotationItem* svgItem = new QgsSvgAnnotationItem( mCanvas );
+  svgItem->setMapPosition( toMapCoordinates( e->pos() ) );
+  svgItem->setSelected( true );
+  svgItem->setFrameSize( QSizeF( 200, 100 ) );
+  return svgItem;
+}
diff --git a/src/app/qgsmaptoolsvgannotation.h b/src/app/qgsmaptoolsvgannotation.h
new file mode 100644
index 000000000000..b5b2b894def0
--- /dev/null
+++ b/src/app/qgsmaptoolsvgannotation.h
@@ -0,0 +1,32 @@
+/***************************************************************************
+                              qgsmaptoolsvgannotation.h
+                              -------------------------
+  begin                : November, 2012
+  copyright            : (C) 2012 by Marco Hugentobler
+  email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSMAPTOOLSVGANNOTATION_H
+#define QGSMAPTOOLSVGANNOTATION_H
+
+#include "qgsmaptoolannotation.h"
+
+class QgsMapToolSvgAnnotation: public QgsMapToolAnnotation
+{
+  public:
+    QgsMapToolSvgAnnotation( QgsMapCanvas* canvas );
+    ~QgsMapToolSvgAnnotation();
+  protected:
+    QgsAnnotationItem* createItem( QMouseEvent* e );
+};
+
+#endif // QGSMAPTOOLSVGANNOTATION_H
diff --git a/src/app/qgsmeasuredialog.cpp b/src/app/qgsmeasuredialog.cpp
index f7dcaddfdd08..538b3cfc3bf7 100644
--- a/src/app/qgsmeasuredialog.cpp
+++ b/src/app/qgsmeasuredialog.cpp
@@ -22,6 +22,7 @@
 #include "qgsdistancearea.h"
 #include "qgsmapcanvas.h"
 #include "qgsmaprenderer.h"
+#include "qgsproject.h"
 #include "qgscoordinatereferencesystem.h"
 
 #include 
@@ -60,7 +61,7 @@ void QgsMeasureDialog::updateSettings()
   mDisplayUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
   // Configure QgsDistanceArea
   mDa.setSourceCrs( mTool->canvas()->mapRenderer()->destinationCrs().srsid() );
-  mDa.setEllipsoid( settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString() );
+  mDa.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ) );
   // Only use ellipsoidal calculation when project wide transformation is enabled.
   if ( mTool->canvas()->mapRenderer()->hasCrsTransformEnabled() )
   {
diff --git a/src/app/qgsmeasuretool.cpp b/src/app/qgsmeasuretool.cpp
index ce0046a7e87e..d921884dff87 100644
--- a/src/app/qgsmeasuretool.cpp
+++ b/src/app/qgsmeasuretool.cpp
@@ -35,7 +35,7 @@ QgsMeasureTool::QgsMeasureTool( QgsMapCanvas* canvas, bool measureArea )
 {
   mMeasureArea = measureArea;
 
-  mRubberBand = new QgsRubberBand( canvas, mMeasureArea );
+  mRubberBand = new QgsRubberBand( canvas, mMeasureArea ? QGis::Polygon : QGis::Line );
 
   QPixmap myCrossHairQPixmap = QPixmap(( const char ** ) cross_hair_cursor );
   mCursor = QCursor( myCrossHairQPixmap, 8, 8 );
@@ -103,7 +103,7 @@ void QgsMeasureTool::restart()
 {
   mPoints.clear();
 
-  mRubberBand->reset( mMeasureArea );
+  mRubberBand->reset( mMeasureArea ? QGis::Polygon : QGis::Line );
 
   // re-read settings
   updateSettings();
diff --git a/src/app/qgsoptions.cpp b/src/app/qgsoptions.cpp
index 09a55107faa0..e35745081375 100644
--- a/src/app/qgsoptions.cpp
+++ b/src/app/qgsoptions.cpp
@@ -58,7 +58,6 @@
 #include  // for setting gdal options
 
 #include "qgsconfig.h"
-const char * QgsOptions::GEO_NONE_DESC = QT_TRANSLATE_NOOP( "QgsOptions", "None / Planimetric" );
 
 /**
  * \class QgsOptions - Set user options and preferences
@@ -82,8 +81,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   connect( mFontFamilyRadioCustom, SIGNAL( released() ), this, SLOT( updateAppStyleSheet() ) );
   connect( mFontFamilyComboBox, SIGNAL( currentFontChanged( const QFont& ) ), this, SLOT( updateAppStyleSheet() ) );
 
-  connect( cmbEllipsoid, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateEllipsoidUI( int ) ) );
-
 #ifdef Q_WS_X11
   connect( chkEnableBackbuffer, SIGNAL( stateChanged( int ) ), this, SLOT( toggleEnableBackbuffer( int ) ) );
 #endif
@@ -216,7 +213,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   // 0 = Always -> always ask (if there are existing sublayers)
   // 1 = If needed -> ask if layer has no bands, but has sublayers
   // 2 = Never -> never prompt, will not load anything
-  // 4 = Load all -> never prompt, but load all sublayers
+  // 3 = Load all -> never prompt, but load all sublayers
   cmbPromptRasterSublayers->clear();
   cmbPromptRasterSublayers->addItem( tr( "Always" ) );
   cmbPromptRasterSublayers->addItem( tr( "If needed" ) ); //this means, prompt if there are sublayers but no band in the main dataset
@@ -228,7 +225,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   cmbScanItemsInBrowser->clear();
   cmbScanItemsInBrowser->addItem( tr( "Check file contents" ), "contents" ); // 0
   cmbScanItemsInBrowser->addItem( tr( "Check extension" ), "extension" );    // 1
-  int index = cmbScanItemsInBrowser->findData( settings.value( "/qgis/scanItemsInBrowser", "" ) );
+  int index = cmbScanItemsInBrowser->findData( settings.value( "/qgis/scanItemsInBrowser2", "" ) );
   if ( index == -1 ) index = 1;
   cmbScanItemsInBrowser->setCurrentIndex( index );
 
@@ -238,7 +235,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   // cmbScanZipInBrowser->addItem( tr( "Passthru" ) );     // 1 - removed
   cmbScanZipInBrowser->addItem( tr( "Basic scan" ), QVariant( "basic" ) );
   cmbScanZipInBrowser->addItem( tr( "Full scan" ), QVariant( "full" ) );
-  index = cmbScanZipInBrowser->findData( settings.value( "/qgis/scanZipInBrowser", "" ) );
+  index = cmbScanZipInBrowser->findData( settings.value( "/qgis/scanZipInBrowser2", "" ) );
   if ( index == -1 ) index = 1;
   cmbScanZipInBrowser->setCurrentIndex( index );
 
@@ -286,34 +283,6 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   //display the crs as friendly text rather than in wkt
   leProjectGlobalCrs->setText( mDefaultCrs.authid() + " - " + mDefaultCrs.description() );
 
-  // populate combo box with ellipsoids
-
-  QgsDebugMsg( "Setting upp ellipsoid" );
-
-  mEllipsoidIndex = 0;
-  populateEllipsoidList();
-
-  // Reading ellipsoid from setttings
-  QStringList mySplitEllipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString().split( ':' );
-
-  int myIndex = 0;
-  int i;
-  for ( i = 0; i < mEllipsoidList.length(); i++ )
-  {
-    if ( mEllipsoidList[ i ].acronym.startsWith( mySplitEllipsoid[ 0 ] ) )
-    {
-      myIndex = i;
-      break;
-    }
-  }
-  // Update paramaters if present.
-  if ( mySplitEllipsoid.length() >= 3 )
-  {
-    mEllipsoidList[ myIndex ].semiMajor =  mySplitEllipsoid[ 1 ].toDouble();
-    mEllipsoidList[ myIndex ].semiMinor =  mySplitEllipsoid[ 2 ].toDouble();
-  }
-
-  updateEllipsoidUI( myIndex );
 
   // Set the units for measuring
   QGis::UnitType myDisplayUnits = QGis::fromLiteral( settings.value( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Meters ) ).toString() );
@@ -429,7 +398,7 @@ QgsOptions::QgsOptions( QWidget *parent, Qt::WFlags fl ) :
   cbxCreateRasterLegendIcons->setChecked( settings.value( "/qgis/createRasterLegendIcons", true ).toBool() );
   cbxCopyWKTGeomFromTable->setChecked( settings.value( "/qgis/copyGeometryAsWKT", true ).toBool() );
   leNullValue->setText( settings.value( "qgis/nullValue", "NULL" ).toString() );
-  cbxIgnoreShapeEncoding->setChecked( settings.value( "/qgis/ignoreShapeEncoding", false ).toBool() );
+  cbxIgnoreShapeEncoding->setChecked( settings.value( "/qgis/ignoreShapeEncoding", true ).toBool() );
 
   cmbLegendDoubleClickAction->setCurrentIndex( settings.value( "/qgis/legendDoubleClickAction", 0 ).toInt() );
 
@@ -881,9 +850,9 @@ void QgsOptions::saveOptions()
   settings.setValue( "/qgis/attributeTableBehaviour", cmbAttrTableBehaviour->currentIndex() );
   settings.setValue( "/qgis/attributeTableRowCache", spinBoxAttrTableRowCache->value() );
   settings.setValue( "/qgis/promptForRasterSublayers", cmbPromptRasterSublayers->currentIndex() );
-  settings.setValue( "/qgis/scanItemsInBrowser",
+  settings.setValue( "/qgis/scanItemsInBrowser2",
                      cmbScanItemsInBrowser->itemData( cmbScanItemsInBrowser->currentIndex() ).toString() );
-  settings.setValue( "/qgis/scanZipInBrowser",
+  settings.setValue( "/qgis/scanZipInBrowser2",
                      cmbScanZipInBrowser->itemData( cmbScanZipInBrowser->currentIndex() ).toString() );
   settings.setValue( "/qgis/ignoreShapeEncoding", cbxIgnoreShapeEncoding->isChecked() );
   settings.setValue( "/qgis/dockIdentifyResults", cbxIdentifyResultsDocked->isChecked() );
@@ -1000,26 +969,6 @@ void QgsOptions::saveOptions()
   settings.setValue( "/Projections/otfTransformEnabled", chkOtfTransform->isChecked() );
   settings.setValue( "/Projections/projectDefaultCrs", mDefaultCrs.authid() );
 
-  if ( mEllipsoidList[ mEllipsoidIndex ].acronym.startsWith( "PARAMETER" ) )
-  {
-    double major = mEllipsoidList[ mEllipsoidIndex ].semiMajor;
-    double minor = mEllipsoidList[ mEllipsoidIndex ].semiMinor;
-    // If the user fields have changed, use them instead.
-    if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
-    {
-      QgsDebugMsg( "Using paramteric major/minor" );
-      major = QLocale::system().toDouble( leSemiMajor->text() );
-      minor = QLocale::system().toDouble( leSemiMinor->text() );
-    }
-    settings.setValue( "/qgis/measure/ellipsoid", QString( "PARAMETER:%1:%2" )
-                       .arg( major, 0, 'g', 17 )
-                       .arg( minor, 0, 'g', 17 ) );
-  }
-  else
-  {
-    settings.setValue( "/qgis/measure/ellipsoid", mEllipsoidList[ mEllipsoidIndex ].acronym );
-  }
-
   if ( radFeet->isChecked() )
   {
     settings.setValue( "/qgis/measure/displayunits", QGis::toLiteral( QGis::Feet ) );
@@ -1245,88 +1194,6 @@ bool QgsOptions::newVisible()
 {
   return chkAddedVisibility->isChecked();
 }
-void QgsOptions::populateEllipsoidList()
-{
-  //
-  // Populate the ellipsoid list
-  //
-  sqlite3      *myDatabase;
-  const char   *myTail;
-  sqlite3_stmt *myPreparedStatement;
-  int           myResult;
-  EllipsoidDefs myItem, i;
-
-  myItem.acronym = GEO_NONE;
-  myItem.description =  tr( GEO_NONE_DESC );
-  myItem.semiMajor = 0.0;
-  myItem.semiMinor = 0.0;
-  mEllipsoidList.append( myItem );
-
-  myItem.acronym = QString( "PARAMETER:6370997:6370997" );
-  myItem.description = tr( "Parameters :" );
-  myItem.semiMajor = 6370997.0;
-  myItem.semiMinor = 6370997.0;
-  mEllipsoidList.append( myItem );
-
-  //check the db is available
-  myResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().data(), &myDatabase, SQLITE_OPEN_READONLY, NULL );
-  if ( myResult )
-  {
-    QgsDebugMsg( QString( "Can't open database: %1" ).arg( sqlite3_errmsg( myDatabase ) ) );
-    // XXX This will likely never happen since on open, sqlite creates the
-    //     database if it does not exist.
-    Q_ASSERT( myResult == 0 );
-  }
-
-  // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
-  QString mySql = "select acronym, name, radius, parameter2 from tbl_ellipsoid order by name";
-  myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(), mySql.toUtf8().length(), &myPreparedStatement, &myTail );
-  // XXX Need to free memory from the error msg if one is set
-  if ( myResult == SQLITE_OK )
-  {
-    while ( sqlite3_step( myPreparedStatement ) == SQLITE_ROW )
-    {
-      QString para1, para2;
-      myItem.acronym = ( const char * )sqlite3_column_text( myPreparedStatement, 0 );
-      myItem.description = ( const char * )sqlite3_column_text( myPreparedStatement, 1 );
-
-      // Copied from QgsDistanecArea. Should perhaps be moved there somehow?
-      // No error checking, this values are for show only, never used in calculations.
-
-      // Fall-back values
-      myItem.semiMajor = 0.0;
-      myItem.semiMinor = 0.0;
-      // Crash if no column?
-      para1 = ( const char * )sqlite3_column_text( myPreparedStatement, 2 );
-      para2 = ( const char * )sqlite3_column_text( myPreparedStatement, 3 );
-      myItem.semiMajor = para1.mid( 2 ).toDouble();
-      if ( para2.left( 2 ) == "b=" )
-      {
-        myItem.semiMinor = para2.mid( 2 ).toDouble();
-      }
-      else if ( para2.left( 3 ) == "rf=" )
-      {
-        double invFlattening = para2.mid( 3 ).toDouble();
-        if ( invFlattening != 0.0 )
-        {
-          myItem.semiMinor = myItem.semiMajor - ( myItem.semiMajor / invFlattening );
-        }
-      }
-      mEllipsoidList.append( myItem );
-    }
-  }
-
-  // close the sqlite3 statement
-  sqlite3_finalize( myPreparedStatement );
-  sqlite3_close( myDatabase );
-
-  // Add all items to selector
-
-  foreach ( i, mEllipsoidList )
-  {
-    cmbEllipsoid->addItem( i.description );
-  }
-}
 
 QStringList QgsOptions::i18nList()
 {
@@ -1736,53 +1603,3 @@ void QgsOptions::saveContrastEnhancement( QComboBox *cbox, QString name )
   settings.setValue( "/Raster/defaultContrastEnhancementAlgorithm/" + name, value );
 }
 
-void QgsOptions::updateEllipsoidUI( int newIndex )
-{
-  // Called whenever settings change, adjusts the UI accordingly
-  // Pre-select current ellipsoid
-
-  // Check if CRS transformation is on, or else turn everything off
-  double myMajor =  mEllipsoidList[ newIndex ].semiMajor;
-  double myMinor =  mEllipsoidList[ newIndex ].semiMinor;
-
-  // If user has modified the radii (only possible if parametric!), before
-  // changing ellipsoid, save the modified coordinates
-  if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
-  {
-    QgsDebugMsg( "Saving major/minor" );
-    mEllipsoidList[ mEllipsoidIndex ].semiMajor = QLocale::system().toDouble( leSemiMajor->text() );
-    mEllipsoidList[ mEllipsoidIndex ].semiMinor = QLocale::system().toDouble( leSemiMinor->text() );
-  }
-
-  mEllipsoidIndex = newIndex;
-  leSemiMajor->setEnabled( false );
-  leSemiMinor->setEnabled( false );
-  leSemiMajor->setText( "" );
-  leSemiMinor->setText( "" );
-  if ( QgisApp::instance()->mapCanvas()->mapRenderer()->hasCrsTransformEnabled() )
-  {
-    cmbEllipsoid->setEnabled( true );
-    cmbEllipsoid->setToolTip( "" );
-    if ( mEllipsoidList[ mEllipsoidIndex ].acronym.startsWith( "PARAMETER:" ) )
-    {
-      leSemiMajor->setEnabled( true );
-      leSemiMinor->setEnabled( true );
-    }
-    else
-    {
-      leSemiMajor->setToolTip( QString( "Select %1 from pull-down menu to adjust radii" ).arg( tr( "Parameters:" ) ) );
-      leSemiMinor->setToolTip( QString( "Select %1 from pull-down menu to adjust radii" ).arg( tr( "Parameters:" ) ) );
-    }
-    cmbEllipsoid->setCurrentIndex( mEllipsoidIndex ); // Not always necessary
-    if ( mEllipsoidList[ mEllipsoidIndex ].acronym != GEO_NONE )
-    {
-      leSemiMajor->setText( QLocale::system().toString( myMajor, 'f', 3 ) );
-      leSemiMinor->setText( QLocale::system().toString( myMinor, 'f', 3 ) );
-    }
-  }
-  else
-  {
-    cmbEllipsoid->setEnabled( false );
-    cmbEllipsoid->setToolTip( tr( "Can only use ellipsoidal calculations when CRS transformation is enabled" ) );
-  }
-}
diff --git a/src/app/qgsoptions.h b/src/app/qgsoptions.h
index 15626b6cfb0b..d337f991ec9c 100644
--- a/src/app/qgsoptions.h
+++ b/src/app/qgsoptions.h
@@ -189,12 +189,6 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
      */
     void saveGdalDriverList();
 
-    /* Update ComboBox accorindg to the selected new index
-     * Also sets the new selected Ellipsoid.
-     * @note added in 2.0
-     */
-    void updateEllipsoidUI( int newIndex );
-
   private:
     QStringList i18nList();
     void initContrastEnhancement( QComboBox *cbox, QString name, QString defaultVal );
@@ -203,21 +197,6 @@ class QgsOptions : public QDialog, private Ui::QgsOptionsBase
     QgsCoordinateReferenceSystem mLayerDefaultCrs;
     bool mLoadedGdalDriverList;
 
-    // List for all ellispods, also None and Custom
-    struct EllipsoidDefs
-    {
-      QString acronym;
-      QString description;
-      double semiMajor;
-      double semiMinor;
-    };
-    QList mEllipsoidList;
-    int mEllipsoidIndex;
-
-    //! Populates list with ellipsoids from Sqlite3 db
-    void populateEllipsoidList();
-
-    static const char * GEO_NONE_DESC;
 };
 
 #endif // #ifndef QGSOPTIONS_H
diff --git a/src/app/qgspluginmanager.cpp b/src/app/qgspluginmanager.cpp
index a133bd200a35..b17b2c42acad 100644
--- a/src/app/qgspluginmanager.cpp
+++ b/src/app/qgspluginmanager.cpp
@@ -210,8 +210,11 @@ void QgsPluginManager::getPythonPluginDescriptions()
     myData.setCheckable( true );
     myData.setRenderAsWidget( false );
     myData.setChecked( false ); //start off assuming false
-    if ( iconName == "__error__" )
+
+    if ( iconName == "__error__" || iconName.isEmpty() )
+    {
       myData.setIcon( QPixmap( QgsApplication::defaultThemePath() + "/plugin.png" ) );
+    }
     else
     {
       bool relative = QFileInfo( iconName ).isRelative();
@@ -221,7 +224,14 @@ void QgsPluginManager::getPythonPluginDescriptions()
         mPythonUtils->evalString( QString( "qgis.utils.pluginDirectory('%1')" ).arg( packageName ), pluginDir );
         iconName = pluginDir + "/" + iconName;
       }
-      myData.setIcon( QPixmap( iconName ) );
+      if ( QFileInfo( iconName ).isFile() )
+      {
+        myData.setIcon( QPixmap( iconName ) );
+      }
+      else
+      {
+        myData.setIcon( QPixmap( QgsApplication::defaultThemePath() + "/plugin.png" ) );
+      }
     }
 
     // check to see if the plugin is loaded and set the checkbox accordingly
diff --git a/src/app/qgspluginregistry.cpp b/src/app/qgspluginregistry.cpp
index 59bd57844249..fb66ebb31327 100644
--- a/src/app/qgspluginregistry.cpp
+++ b/src/app/qgspluginregistry.cpp
@@ -23,6 +23,7 @@
 #include 
 
 #include "qgis.h"
+#include "qgsapplication.h"
 #include "qgisinterface.h"
 #include "qgspluginregistry.h"
 #include "qgspluginmetadata.h"
@@ -414,28 +415,40 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
     QStringList pluginList = mPythonUtils->pluginList();
     QgsDebugMsg( "Loading python plugins" );
 
-    // make the plugin installer and the fTools enabled by default:
-    if ( !mySettings.contains( "/PythonPlugins/plugin_installer" ) )
-    {
-      mySettings.setValue( "/PythonPlugins/plugin_installer", true );
-    }
-    if ( !mySettings.contains( "/PythonPlugins/fTools" ) )
-    {
-      mySettings.setValue( "/PythonPlugins/fTools", true );
-    }
-    if ( !mySettings.contains( "/PythonPlugins/GdalTools" ) )
-    {
-      mySettings.setValue( "/PythonPlugins/GdalTools", true );
-    }
-    if ( !mySettings.contains( "/PythonPlugins/db_manager" ) )
+    QStringList corePlugins = QStringList();
+    corePlugins << "plugin_installer";
+    corePlugins << "fTools";
+    corePlugins << "GdalTools";
+    corePlugins << "db_manager";
+
+    // make the required core plugins enabled by default:
+    for ( int i = 0; i < corePlugins.size(); i++ )
     {
-      mySettings.setValue( "/PythonPlugins/db_manager", true );
+      if ( !mySettings.contains( "/PythonPlugins/" + corePlugins[i] ) )
+      {
+        mySettings.setValue( "/PythonPlugins/" + corePlugins[i], true );
+      }
     }
 
     for ( int i = 0; i < pluginList.size(); i++ )
     {
       QString packageName = pluginList[i];
 
+      // TODO: apply better solution for #5879
+      // start - temporary fix for issue #5879
+      if ( QgsApplication::isRunningFromBuildDir() )
+      {
+        if ( corePlugins.contains( packageName ) )
+        {
+          QgsApplication::setPkgDataPath( QString( "" ) );
+        }
+        else
+        {
+          QgsApplication::setPkgDataPath( QgsApplication::buildSourcePath() );
+        }
+      }
+      // end - temporary fix for issue #5879, more below
+
       if ( checkPythonPlugin( packageName ) )
       {
         // check if the plugin was active on last session
@@ -446,6 +459,12 @@ void QgsPluginRegistry::restoreSessionPlugins( QString thePluginDirString )
         }
       }
     }
+    // start - temporary fix for issue #5879, more above
+    if ( QgsApplication::isRunningFromBuildDir() )
+    {
+      QgsApplication::setPkgDataPath( QgsApplication::buildSourcePath() );
+    }
+    // end - temporary fix for issue #5879
   }
 
   QgsDebugMsg( "Plugin loading completed" );
diff --git a/src/app/qgsprojectproperties.cpp b/src/app/qgsprojectproperties.cpp
index 109e78326439..198398a505e8 100644
--- a/src/app/qgsprojectproperties.cpp
+++ b/src/app/qgsprojectproperties.cpp
@@ -19,6 +19,8 @@
 #include "qgsprojectproperties.h"
 
 //qgis includes
+#include "qgsapplication.h"
+#include "qgsdistancearea.h"
 #include "qgisapp.h"
 #include "qgscomposer.h"
 #include "qgscontexthelp.h"
@@ -50,11 +52,16 @@
 #include   // Qt 4.4
 #include 
 
+const char * QgsProjectProperties::GEO_NONE_DESC = QT_TRANSLATE_NOOP( "QgsOptions", "None / Planimetric" );
+
 //stdc++ includes
 
 QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *parent, Qt::WFlags fl )
     : QDialog( parent, fl )
     , mMapCanvas( mapCanvas )
+    , mEllipsoidList()
+    , mEllipsoidIndex( 0 )
+
 {
   setupUi( this );
   connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
@@ -63,6 +70,8 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
   connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) );
   connect( projectionSelector, SIGNAL( sridSelected( QString ) ), this, SLOT( setMapUnitsToCurrentProjection() ) );
 
+  connect( cmbEllipsoid, SIGNAL( currentIndexChanged( int ) ), this, SLOT( updateEllipsoidUI( int ) ) );
+
   ///////////////////////////////////////////////////////////
   // Properties stored in map canvas's QgsMapRenderer
   // these ones are propagated to QgsProject by a signal
@@ -104,6 +113,34 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
 
   cbxAbsolutePath->setCurrentIndex( QgsProject::instance()->readBoolEntry( "Paths", "/Absolute", true ) ? 0 : 1 );
 
+  // populate combo box with ellipsoids
+
+  QgsDebugMsg( "Setting upp ellipsoid" );
+
+  populateEllipsoidList();
+
+  // Reading ellipsoid from setttings
+  QStringList mySplitEllipsoid = QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", GEO_NONE ).split( ':' );
+
+  int myIndex = 0;
+  for ( int i = 0; i < mEllipsoidList.length(); i++ )
+  {
+    if ( mEllipsoidList[ i ].acronym.startsWith( mySplitEllipsoid[ 0 ] ) )
+    {
+      myIndex = i;
+      break;
+    }
+  }
+  // Update paramaters if present.
+  if ( mySplitEllipsoid.length() >= 3 )
+  {
+    mEllipsoidList[ myIndex ].semiMajor =  mySplitEllipsoid[ 1 ].toDouble();
+    mEllipsoidList[ myIndex ].semiMinor =  mySplitEllipsoid[ 2 ].toDouble();
+  }
+
+  updateEllipsoidUI( myIndex );
+
+
   int dp = QgsProject::instance()->readNumEntry( "PositionPrecision", "/DecimalPlaces" );
   spinBoxDP->setValue( dp );
 
@@ -223,6 +260,9 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
   mWMSAbstract->setPlainText( QgsProject::instance()->readEntry( "WMSServiceAbstract", "/", "" ) );
   mWMSOnlineResourceLineEdit->setText( QgsProject::instance()->readEntry( "WMSOnlineResource", "/", "" ) );
   mWMSUrlLineEdit->setText( QgsProject::instance()->readEntry( "WMSUrl", "/", "" ) );
+  mWMSFees->setText( QgsProject::instance()->readEntry( "WMSFees", "/", "" ) );
+  mWMSAccessConstraints->setText( QgsProject::instance()->readEntry( "WMSAccessConstraints", "/", "" ) );
+  mWMSKeywordList->setText( QgsProject::instance()->readListEntry( "WMSKeywordList", "/" ).join( "," ) );
 
   bool ok;
   QStringList values;
@@ -304,14 +344,14 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
   QStringList wfstInsertLayerIdList = QgsProject::instance()->readListEntry( "WFSTLayers", "Insert" );
   QStringList wfstDeleteLayerIdList = QgsProject::instance()->readListEntry( "WFSTLayers", "Delete" );
 
-  QSignalMapper *smPublied = new QSignalMapper(this);
-  connect(smPublied, SIGNAL(mapped(int)), this, SLOT(on_cbxWFSPublied_stateChanged(int)));
-  QSignalMapper *smUpdate = new QSignalMapper(this);
-  connect(smUpdate, SIGNAL(mapped(int)), this, SLOT(on_cbxWFSUpdate_stateChanged(int)));
-  QSignalMapper *smInsert = new QSignalMapper(this);
-  connect(smInsert, SIGNAL(mapped(int)), this, SLOT(on_cbxWFSInsert_stateChanged(int)));
-  QSignalMapper *smDelete = new QSignalMapper(this);
-  connect(smDelete, SIGNAL(mapped(int)), this, SLOT(on_cbxWFSDelete_stateChanged(int)));
+  QSignalMapper *smPublied = new QSignalMapper( this );
+  connect( smPublied, SIGNAL( mapped( int ) ), this, SLOT( on_cbxWFSPublied_stateChanged( int ) ) );
+  QSignalMapper *smUpdate = new QSignalMapper( this );
+  connect( smUpdate, SIGNAL( mapped( int ) ), this, SLOT( on_cbxWFSUpdate_stateChanged( int ) ) );
+  QSignalMapper *smInsert = new QSignalMapper( this );
+  connect( smInsert, SIGNAL( mapped( int ) ), this, SLOT( on_cbxWFSInsert_stateChanged( int ) ) );
+  QSignalMapper *smDelete = new QSignalMapper( this );
+  connect( smDelete, SIGNAL( mapped( int ) ), this, SLOT( on_cbxWFSDelete_stateChanged( int ) ) );
 
   twWFSLayers->setColumnCount( 5 );
   twWFSLayers->horizontalHeader()->setVisible( true );
@@ -337,37 +377,37 @@ QgsProjectProperties::QgsProjectProperties( QgsMapCanvas* mapCanvas, QWidget *pa
       cbp->setChecked( wfsLayerIdList.contains( currentLayer->id() ) );
       twWFSLayers->setCellWidget( j, 1, cbp );
 
-      smPublied->setMapping(cbp, j);
-      connect(cbp, SIGNAL(stateChanged(int)), smPublied, SLOT(map()));
+      smPublied->setMapping( cbp, j );
+      connect( cbp, SIGNAL( stateChanged( int ) ), smPublied, SLOT( map() ) );
 
       QgsVectorLayer* vlayer = qobject_cast( currentLayer );
       QgsVectorDataProvider* provider = vlayer->dataProvider();
-      if ( (provider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues ) && (provider->capabilities() & QgsVectorDataProvider::ChangeGeometries ) )
+      if (( provider->capabilities() & QgsVectorDataProvider::ChangeAttributeValues ) && ( provider->capabilities() & QgsVectorDataProvider::ChangeGeometries ) )
       {
         QCheckBox* cbu = new QCheckBox();
         cbu->setChecked( wfstUpdateLayerIdList.contains( currentLayer->id() ) );
         twWFSLayers->setCellWidget( j, 2, cbu );
 
-        smUpdate->setMapping(cbu, j);
-        connect(cbu, SIGNAL(stateChanged(int)), smUpdate, SLOT(map()));
+        smUpdate->setMapping( cbu, j );
+        connect( cbu, SIGNAL( stateChanged( int ) ), smUpdate, SLOT( map() ) );
       }
-      if ( ( provider->capabilities() & QgsVectorDataProvider::AddFeatures ) )
+      if (( provider->capabilities() & QgsVectorDataProvider::AddFeatures ) )
       {
         QCheckBox* cbi = new QCheckBox();
         cbi->setChecked( wfstInsertLayerIdList.contains( currentLayer->id() ) );
         twWFSLayers->setCellWidget( j, 3, cbi );
 
-        smInsert->setMapping(cbi, j);
-        connect(cbi, SIGNAL(stateChanged(int)), smInsert, SLOT(map()));
+        smInsert->setMapping( cbi, j );
+        connect( cbi, SIGNAL( stateChanged( int ) ), smInsert, SLOT( map() ) );
       }
-      if ( ( provider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) )
+      if (( provider->capabilities() & QgsVectorDataProvider::DeleteFeatures ) )
       {
         QCheckBox* cbd = new QCheckBox();
         cbd->setChecked( wfstDeleteLayerIdList.contains( currentLayer->id() ) );
         twWFSLayers->setCellWidget( j, 4, cbd );
 
-        smDelete->setMapping(cbd, j);
-        connect(cbd, SIGNAL(stateChanged(int)), smDelete, SLOT(map()));
+        smDelete->setMapping( cbd, j );
+        connect( cbd, SIGNAL( stateChanged( int ) ), smDelete, SLOT( map() ) );
       }
 
       j++;
@@ -504,6 +544,26 @@ void QgsProjectProperties::apply()
 
   QgsProject::instance()->writeEntry( "Paths", "/Absolute", cbxAbsolutePath->currentIndex() == 0 );
 
+  if ( mEllipsoidList[ mEllipsoidIndex ].acronym.startsWith( "PARAMETER" ) )
+  {
+    double major = mEllipsoidList[ mEllipsoidIndex ].semiMajor;
+    double minor = mEllipsoidList[ mEllipsoidIndex ].semiMinor;
+    // If the user fields have changed, use them instead.
+    if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
+    {
+      QgsDebugMsg( "Using paramteric major/minor" );
+      major = QLocale::system().toDouble( leSemiMajor->text() );
+      minor = QLocale::system().toDouble( leSemiMinor->text() );
+    }
+    QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", QString( "PARAMETER:%1:%2" )
+                                        .arg( major, 0, 'g', 17 )
+                                        .arg( minor, 0, 'g', 17 ) );
+  }
+  else
+  {
+    QgsProject::instance()->writeEntry( "Measure", "/Ellipsoid", mEllipsoidList[ mEllipsoidIndex ].acronym );
+  }
+
   //set the color for selections
   QColor myColor = pbnSelectionColor->color();
   QgsProject::instance()->writeEntry( "Gui", "/SelectionColorRedPart", myColor.red() );
@@ -567,6 +627,18 @@ void QgsProjectProperties::apply()
   QgsProject::instance()->writeEntry( "WMSServiceAbstract", "/", mWMSAbstract->toPlainText() );
   QgsProject::instance()->writeEntry( "WMSOnlineResource", "/", mWMSOnlineResourceLineEdit->text() );
   QgsProject::instance()->writeEntry( "WMSUrl", "/", mWMSUrlLineEdit->text() );
+  QgsProject::instance()->writeEntry( "WMSFees", "/", mWMSFees->text() );
+  QgsProject::instance()->writeEntry( "WMSAccessConstraints", "/", mWMSAccessConstraints->text() );
+  //WMS keyword list
+  QStringList keywordStringList = mWMSKeywordList->text().split( "," );
+  if ( keywordStringList.size() > 0 )
+  {
+    QgsProject::instance()->writeEntry( "WMSKeywordList", "/", mWMSKeywordList->text().split( "," ) );
+  }
+  else
+  {
+    QgsProject::instance()->removeEntry( "WMSKeywordList", "/" );
+  }
 
   if ( grpWMSExt->isChecked() )
   {
@@ -758,62 +830,65 @@ void QgsProjectProperties::on_cbxProjectionEnabled_stateChanged( int state )
     mLayerSrsId = projectionSelector->selectedCrsId();
     projectionSelector->setSelectedCrsId( mProjectSrsId );
   }
+
+  // Enable/Disabel selector and update tool-tip
+  updateEllipsoidUI( mEllipsoidIndex );
 }
 
 void QgsProjectProperties::on_cbxWFSPublied_stateChanged( int aIdx )
 {
-    QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 1 ) );
-    if ( cb && !cb->isChecked() )
-    {
-      QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 2 ) );
-      if ( cbn )
-        cbn->setChecked(false);
-    }
+  QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 1 ) );
+  if ( cb && !cb->isChecked() )
+  {
+    QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 2 ) );
+    if ( cbn )
+      cbn->setChecked( false );
+  }
 }
 
 void QgsProjectProperties::on_cbxWFSUpdate_stateChanged( int aIdx )
 {
-    QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 2 ) );
-    if ( cb && cb->isChecked() )
-    {
-      QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 1 ) );
-      if ( cbn )
-        cbn->setChecked(true);
-    }
-    else if ( cb && !cb->isChecked() )
-    {
-      QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 3 ) );
-      if ( cbn )
-        cbn->setChecked(false);
-    }
+  QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 2 ) );
+  if ( cb && cb->isChecked() )
+  {
+    QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 1 ) );
+    if ( cbn )
+      cbn->setChecked( true );
+  }
+  else if ( cb && !cb->isChecked() )
+  {
+    QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 3 ) );
+    if ( cbn )
+      cbn->setChecked( false );
+  }
 }
 
 void QgsProjectProperties::on_cbxWFSInsert_stateChanged( int aIdx )
 {
-    QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 3 ) );
-    if ( cb && cb->isChecked() )
-    {
-      QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 2 ) );
-      if ( cbn )
-        cbn->setChecked(true);
-    }
-    else if ( cb && !cb->isChecked() )
-    {
-      QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 4 ) );
-      if ( cbn )
-        cbn->setChecked(false);
-    }
+  QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 3 ) );
+  if ( cb && cb->isChecked() )
+  {
+    QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 2 ) );
+    if ( cbn )
+      cbn->setChecked( true );
+  }
+  else if ( cb && !cb->isChecked() )
+  {
+    QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 4 ) );
+    if ( cbn )
+      cbn->setChecked( false );
+  }
 }
 
 void QgsProjectProperties::on_cbxWFSDelete_stateChanged( int aIdx )
 {
-    QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 4 ) );
-    if ( cb && cb->isChecked() )
-    {
-      QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 3 ) );
-      if ( cbn )
-        cbn->setChecked(true);
-    }
+  QCheckBox* cb = qobject_cast( twWFSLayers->cellWidget( aIdx, 4 ) );
+  if ( cb && cb->isChecked() )
+  {
+    QCheckBox* cbn = qobject_cast( twWFSLayers->cellWidget( aIdx, 3 ) );
+    if ( cbn )
+      cbn->setChecked( true );
+  }
 }
 
 void QgsProjectProperties::setMapUnitsToCurrentProjection()
@@ -1237,3 +1312,142 @@ void QgsProjectProperties::resetPythonMacros()
                                  "def saveProject():\n    pass\n\n" \
                                  "def closeProject():\n    pass\n" );
 }
+
+void QgsProjectProperties::populateEllipsoidList()
+{
+  //
+  // Populate the ellipsoid list
+  //
+  sqlite3      *myDatabase;
+  const char   *myTail;
+  sqlite3_stmt *myPreparedStatement;
+  int           myResult;
+  EllipsoidDefs myItem, i;
+
+  myItem.acronym = GEO_NONE;
+  myItem.description =  tr( GEO_NONE_DESC );
+  myItem.semiMajor = 0.0;
+  myItem.semiMinor = 0.0;
+  mEllipsoidList.append( myItem );
+
+  myItem.acronym = QString( "PARAMETER:6370997:6370997" );
+  myItem.description = tr( "Parameters :" );
+  myItem.semiMajor = 6370997.0;
+  myItem.semiMinor = 6370997.0;
+  mEllipsoidList.append( myItem );
+
+  //check the db is available
+  myResult = sqlite3_open_v2( QgsApplication::srsDbFilePath().toUtf8().data(), &myDatabase, SQLITE_OPEN_READONLY, NULL );
+  if ( myResult )
+  {
+    QgsDebugMsg( QString( "Can't open database: %1" ).arg( sqlite3_errmsg( myDatabase ) ) );
+    // XXX This will likely never happen since on open, sqlite creates the
+    //     database if it does not exist.
+    Q_ASSERT( myResult == 0 );
+  }
+
+  // Set up the query to retrieve the projection information needed to populate the ELLIPSOID list
+  QString mySql = "select acronym, name, radius, parameter2 from tbl_ellipsoid order by name";
+  myResult = sqlite3_prepare( myDatabase, mySql.toUtf8(), mySql.toUtf8().length(), &myPreparedStatement, &myTail );
+  // XXX Need to free memory from the error msg if one is set
+  if ( myResult == SQLITE_OK )
+  {
+    while ( sqlite3_step( myPreparedStatement ) == SQLITE_ROW )
+    {
+      QString para1, para2;
+      myItem.acronym = ( const char * )sqlite3_column_text( myPreparedStatement, 0 );
+      myItem.description = ( const char * )sqlite3_column_text( myPreparedStatement, 1 );
+
+      // Copied from QgsDistanecArea. Should perhaps be moved there somehow?
+      // No error checking, this values are for show only, never used in calculations.
+
+      // Fall-back values
+      myItem.semiMajor = 0.0;
+      myItem.semiMinor = 0.0;
+      // Crash if no column?
+      para1 = ( const char * )sqlite3_column_text( myPreparedStatement, 2 );
+      para2 = ( const char * )sqlite3_column_text( myPreparedStatement, 3 );
+      myItem.semiMajor = para1.mid( 2 ).toDouble();
+      if ( para2.left( 2 ) == "b=" )
+      {
+        myItem.semiMinor = para2.mid( 2 ).toDouble();
+      }
+      else if ( para2.left( 3 ) == "rf=" )
+      {
+        double invFlattening = para2.mid( 3 ).toDouble();
+        if ( invFlattening != 0.0 )
+        {
+          myItem.semiMinor = myItem.semiMajor - ( myItem.semiMajor / invFlattening );
+        }
+      }
+      mEllipsoidList.append( myItem );
+    }
+  }
+
+  // close the sqlite3 statement
+  sqlite3_finalize( myPreparedStatement );
+  sqlite3_close( myDatabase );
+
+  // Add all items to selector
+
+  foreach ( i, mEllipsoidList )
+  {
+    cmbEllipsoid->addItem( i.description );
+  }
+}
+
+void QgsProjectProperties::updateEllipsoidUI( int newIndex )
+{
+  // Just return if the list isn't populated yet
+  if ( mEllipsoidList.isEmpty() )
+  {
+    return;
+  }
+  // Called whenever settings change, adjusts the UI accordingly
+  // Pre-select current ellipsoid
+
+  // Check if CRS transformation is on, or else turn everything off
+  double myMajor =  mEllipsoidList[ newIndex ].semiMajor;
+  double myMinor =  mEllipsoidList[ newIndex ].semiMinor;
+
+  // If user has modified the radii (only possible if parametric!), before
+  // changing ellipsoid, save the modified coordinates
+  if ( leSemiMajor->isModified() || leSemiMinor->isModified() )
+  {
+    QgsDebugMsg( "Saving major/minor" );
+    mEllipsoidList[ mEllipsoidIndex ].semiMajor = QLocale::system().toDouble( leSemiMajor->text() );
+    mEllipsoidList[ mEllipsoidIndex ].semiMinor = QLocale::system().toDouble( leSemiMinor->text() );
+  }
+
+  mEllipsoidIndex = newIndex;
+  leSemiMajor->setEnabled( false );
+  leSemiMinor->setEnabled( false );
+  leSemiMajor->setText( "" );
+  leSemiMinor->setText( "" );
+  if ( cbxProjectionEnabled->isChecked() )
+  {
+    cmbEllipsoid->setEnabled( true );
+    cmbEllipsoid->setToolTip( "" );
+    if ( mEllipsoidList[ mEllipsoidIndex ].acronym.startsWith( "PARAMETER:" ) )
+    {
+      leSemiMajor->setEnabled( true );
+      leSemiMinor->setEnabled( true );
+    }
+    else
+    {
+      leSemiMajor->setToolTip( QString( "Select %1 from pull-down menu to adjust radii" ).arg( tr( "Parameters:" ) ) );
+      leSemiMinor->setToolTip( QString( "Select %1 from pull-down menu to adjust radii" ).arg( tr( "Parameters:" ) ) );
+    }
+    cmbEllipsoid->setCurrentIndex( mEllipsoidIndex ); // Not always necessary
+    if ( mEllipsoidList[ mEllipsoidIndex ].acronym != GEO_NONE )
+    {
+      leSemiMajor->setText( QLocale::system().toString( myMajor, 'f', 3 ) );
+      leSemiMinor->setText( QLocale::system().toString( myMinor, 'f', 3 ) );
+    }
+  }
+  else
+  {
+    cmbEllipsoid->setEnabled( false );
+    cmbEllipsoid->setToolTip( tr( "Can only use ellipsoidal calculations when CRS transformation is enabled" ) );
+  }
+}
diff --git a/src/app/qgsprojectproperties.h b/src/app/qgsprojectproperties.h
index cf23288165b1..31b85b4e9ece 100644
--- a/src/app/qgsprojectproperties.h
+++ b/src/app/qgsprojectproperties.h
@@ -139,7 +139,7 @@ class QgsProjectProperties : public QDialog, private Ui::QgsProjectPropertiesBas
     void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
 
     void on_cbxProjectionEnabled_stateChanged( int state );
-    
+
     /*!
      * Slot to link WFS checkboxes
      */
@@ -153,6 +153,12 @@ class QgsProjectProperties : public QDialog, private Ui::QgsProjectPropertiesBas
       */
     void setMapUnitsToCurrentProjection();
 
+    /* Update ComboBox accorindg to the selected new index
+     * Also sets the new selected Ellipsoid.
+     * @note added in 2.0
+     */
+    void updateEllipsoidUI( int newIndex );
+
   signals:
     //! Signal used to inform listeners that the mouse display precision may have changed
     void displayPrecisionChanged();
@@ -188,4 +194,21 @@ class QgsProjectProperties : public QDialog, private Ui::QgsProjectPropertiesBas
 
     long mProjectSrsId;
     long mLayerSrsId;
+
+    // List for all ellispods, also None and Custom
+    struct EllipsoidDefs
+    {
+      QString acronym;
+      QString description;
+      double semiMajor;
+      double semiMinor;
+    };
+    QList mEllipsoidList;
+    int mEllipsoidIndex;
+
+    //! Populates list with ellipsoids from Sqlite3 db
+    void populateEllipsoidList();
+
+    static const char * GEO_NONE_DESC;
+
 };
diff --git a/src/app/qgsrasterlayerproperties.cpp b/src/app/qgsrasterlayerproperties.cpp
index d6f190dd5225..876a93c2a876 100644
--- a/src/app/qgsrasterlayerproperties.cpp
+++ b/src/app/qgsrasterlayerproperties.cpp
@@ -72,6 +72,10 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
   mRGBMinimumMaximumEstimated = true;
 
   setupUi( this );
+
+  mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.png" ) );
+  mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.png" ) );
+
   connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
   connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) );
   connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );
@@ -195,6 +199,7 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
   tableTransparency->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch );
 
   //resampling
+  mResamplingGroupBox->setSaveCheckedState( true );
   const QgsRasterRenderer* renderer = mRasterLayer->renderer();
   mZoomedInResamplingComboBox->insertItem( 0, tr( "Nearest neighbour" ) );
   mZoomedInResamplingComboBox->insertItem( 1, tr( "Bilinear" ) );
@@ -206,12 +211,6 @@ QgsRasterLayerProperties::QgsRasterLayerProperties( QgsMapLayer* lyr, QgsMapCanv
   //set combo boxes to current resampling types
   if ( resampleFilter )
   {
-    //invert color map
-    if ( renderer->invertColor() )
-    {
-      mInvertColorMapCheckBox->setCheckState( Qt::Checked );
-    }
-
     const QgsRasterResampler* zoomedInResampler = resampleFilter->zoomedInResampler();
     if ( zoomedInResampler )
     {
@@ -744,9 +743,6 @@ void QgsRasterLayerProperties::apply()
 
     //set global transparency
     rasterRenderer->setOpacity(( 255 - sliderTransparency->value() ) / 255.0 );
-
-    //invert color map
-    rasterRenderer->setInvertColor( mInvertColorMapCheckBox->isChecked() );
   }
 
   QgsDebugMsg( "processing general tab" );
@@ -1723,3 +1719,14 @@ void QgsRasterLayerProperties::updatePipeItems()
 #endif
   }
 }
+
+void QgsRasterLayerProperties::on_mMinimumScaleSetCurrentPushButton_clicked()
+{
+  cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+}
+
+void QgsRasterLayerProperties::on_mMaximumScaleSetCurrentPushButton_clicked()
+{
+  cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+}
+
diff --git a/src/app/qgsrasterlayerproperties.h b/src/app/qgsrasterlayerproperties.h
index f9f5a351385e..0fb485990d13 100644
--- a/src/app/qgsrasterlayerproperties.h
+++ b/src/app/qgsrasterlayerproperties.h
@@ -94,6 +94,9 @@ class QgsRasterLayerProperties : public QDialog, private Ui::QgsRasterLayerPrope
     void on_pbnSaveStyleAs_clicked();
     /** Help button */
     void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
+    void on_mMinimumScaleSetCurrentPushButton_clicked();
+    void on_mMaximumScaleSetCurrentPushButton_clicked();
+
     /**Enable or disable Build pyramids button depending on selection in pyramids list*/
     void toggleBuildPyramidsButton();
 
diff --git a/src/app/qgssnappingdialog.cpp b/src/app/qgssnappingdialog.cpp
index 8cdce394b586..9fc85f1813bf 100644
--- a/src/app/qgssnappingdialog.cpp
+++ b/src/app/qgssnappingdialog.cpp
@@ -287,20 +287,20 @@ void QgsSnappingDialog::addLayer( QgsMapLayer * theMapLayer )
   int idx = layerIdList.indexOf( currentVectorLayer->id() );
   if ( idx < 0 )
   {
-      if ( myDockFlag )
+    if ( myDockFlag )
+    {
+      connect( cbxEnable, SIGNAL( stateChanged( int ) ), this, SLOT( apply() ) );
+      connect( cbxSnapTo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( apply() ) );
+      connect( leTolerance, SIGNAL( textEdited( const QString ) ), this, SLOT( apply() ) );
+      connect( cbxUnits, SIGNAL( currentIndexChanged( int ) ), this, SLOT( apply() ) );
+
+      if ( cbxAvoidIntersection )
       {
-        connect( cbxEnable, SIGNAL( stateChanged( int ) ), this, SLOT( apply() ) );
-        connect( cbxSnapTo, SIGNAL( currentIndexChanged( int ) ), this, SLOT( apply() ) );
-        connect( leTolerance, SIGNAL( textEdited( const QString ) ), this, SLOT( apply() ) );
-        connect( cbxUnits, SIGNAL( currentIndexChanged( int ) ), this, SLOT( apply() ) );
-
-        if ( cbxAvoidIntersection )
-        {
-          connect( cbxAvoidIntersection, SIGNAL( stateChanged( int ) ), this, SLOT( apply() ) );
-        }
-                setTopologicalEditingState();
-        setIntersectionSnappingState();
+        connect( cbxAvoidIntersection, SIGNAL( stateChanged( int ) ), this, SLOT( apply() ) );
       }
+      setTopologicalEditingState();
+      setIntersectionSnappingState();
+    }
     // no settings for this layer yet
     return;
   }
diff --git a/src/app/qgssvgannotationdialog.cpp b/src/app/qgssvgannotationdialog.cpp
new file mode 100644
index 000000000000..7597765b8c09
--- /dev/null
+++ b/src/app/qgssvgannotationdialog.cpp
@@ -0,0 +1,92 @@
+/***************************************************************************
+                              qgssvgannotationdialog.cpp
+                              --------------------------
+  begin                : November, 2012
+  copyright            : (C) 2012 by Marco Hugentobler
+  email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgssvgannotationdialog.h"
+#include "qgsannotationwidget.h"
+#include "qgssvgannotationitem.h"
+#include 
+#include 
+#include 
+
+QgsSvgAnnotationDialog::QgsSvgAnnotationDialog( QgsSvgAnnotationItem* item, QWidget * parent, Qt::WindowFlags f ):
+    QDialog( parent, f ), mItem( item ), mEmbeddedWidget( 0 )
+{
+  setupUi( this );
+  setWindowTitle( tr( "SVG annotation" ) );
+  mEmbeddedWidget = new QgsAnnotationWidget( mItem );
+  mEmbeddedWidget->show();
+  mStackedWidget->addWidget( mEmbeddedWidget );
+  mStackedWidget->setCurrentWidget( mEmbeddedWidget );
+
+  if ( mItem )
+  {
+    mFileLineEdit->setText( mItem->filePath() );
+  }
+
+  QObject::connect( mButtonBox, SIGNAL( accepted() ), this, SLOT( applySettingsToItem() ) );
+  QPushButton* deleteButton = new QPushButton( tr( "Delete" ) );
+  QObject::connect( deleteButton, SIGNAL( clicked() ), this, SLOT( deleteItem() ) );
+  mButtonBox->addButton( deleteButton, QDialogButtonBox::RejectRole );
+}
+
+QgsSvgAnnotationDialog::QgsSvgAnnotationDialog(): QDialog(), mItem( 0 ), mEmbeddedWidget( 0 )
+{
+
+}
+
+QgsSvgAnnotationDialog::~QgsSvgAnnotationDialog()
+{
+
+}
+
+void QgsSvgAnnotationDialog::on_mBrowseToolButton_clicked()
+{
+  QString directory;
+  QFileInfo fi( mFileLineEdit->text() );
+  if ( fi.exists() )
+  {
+    directory = fi.absolutePath();
+  }
+  QString filename = QFileDialog::getOpenFileName( 0, tr( "Select SVG file" ), directory, tr( "SVG files" ) + " (*.svg)" );
+  mFileLineEdit->setText( filename );
+}
+
+void QgsSvgAnnotationDialog::applySettingsToItem()
+{
+  if ( mEmbeddedWidget )
+  {
+    mEmbeddedWidget->apply();
+  }
+
+  if ( mItem )
+  {
+    mItem->setFilePath( mFileLineEdit->text() );
+    mItem->update();
+  }
+
+}
+
+void QgsSvgAnnotationDialog::deleteItem()
+{
+  QGraphicsScene* scene = mItem->scene();
+  if ( scene )
+  {
+    scene->removeItem( mItem );
+  }
+  delete mItem;
+  mItem = 0;
+}
diff --git a/src/app/qgssvgannotationdialog.h b/src/app/qgssvgannotationdialog.h
new file mode 100644
index 000000000000..05c0c2a43fa2
--- /dev/null
+++ b/src/app/qgssvgannotationdialog.h
@@ -0,0 +1,45 @@
+/***************************************************************************
+                              qgssvgannotationdialog.h
+                              ------------------------
+  begin                : November, 2012
+  copyright            : (C) 2012 by Marco Hugentobler
+  email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSSVGANNOTATIONDIALOG_H
+#define QGSSVGANNOTATIONDIALOG_H
+
+#include "ui_qgsformannotationdialogbase.h"
+
+class QgsSvgAnnotationItem;
+class QgsAnnotationWidget;
+
+class QgsSvgAnnotationDialog: public QDialog, private Ui::QgsFormAnnotationDialogBase
+{
+    Q_OBJECT
+  public:
+    QgsSvgAnnotationDialog( QgsSvgAnnotationItem* item, QWidget * parent = 0, Qt::WindowFlags f = 0 );
+    ~QgsSvgAnnotationDialog();
+
+  private slots:
+    void on_mBrowseToolButton_clicked();
+    void applySettingsToItem();
+    void deleteItem();
+
+  private:
+    QgsSvgAnnotationDialog(); //forbidden
+
+    QgsSvgAnnotationItem* mItem;
+    QgsAnnotationWidget* mEmbeddedWidget;
+};
+
+#endif // QGSSVGANNOTATIONDIALOG_H
diff --git a/src/app/qgssvgannotationitemdialog.h b/src/app/qgssvgannotationitemdialog.h
new file mode 100644
index 000000000000..a38fa123b689
--- /dev/null
+++ b/src/app/qgssvgannotationitemdialog.h
@@ -0,0 +1,18 @@
+/***************************************************************************
+    qgssvgannotationitemdialog.h
+    ---------------------
+    begin                : October 2012
+    copyright            : (C) 2012 by Marco Hugentobler
+    email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSSVGANNOTATIONITEMDIALOG_H
+#define QGSSVGANNOTATIONITEMDIALOG_H
+
+#endif // QGSSVGANNOTATIONITEMDIALOG_H
diff --git a/src/app/qgstextannotationdialog.cpp b/src/app/qgstextannotationdialog.cpp
index c4e57f869693..c2641d628659 100644
--- a/src/app/qgstextannotationdialog.cpp
+++ b/src/app/qgstextannotationdialog.cpp
@@ -32,7 +32,6 @@ QgsTextAnnotationDialog::QgsTextAnnotationDialog( QgsTextAnnotationItem* item, Q
   {
     mTextDocument = mItem->document();
     mTextEdit->setDocument( mTextDocument );
-    mBackgroundColorButton->setColor( mItem->frameBackgroundColor() );
   }
   setCurrentFontPropertiesToGui();
 
@@ -148,24 +147,3 @@ void QgsTextAnnotationDialog::deleteItem()
   mItem = 0;
 }
 
-void QgsTextAnnotationDialog::on_mBackgroundColorButton_clicked()
-{
-  if ( !mItem )
-  {
-    return;
-  }
-
-  QColor bgColor;
-#if QT_VERSION >= 0x040500
-  bgColor = QColorDialog::getColor( mItem->frameBackgroundColor(), 0, tr( "Select background color" ), QColorDialog::ShowAlphaChannel );
-#else
-  bgColor = QColorDialog::getColor( mItem->frameBackgroundColor() );
-#endif
-
-  if ( bgColor.isValid() )
-  {
-    mItem->setFrameBackgroundColor( bgColor );
-    mBackgroundColorButton->setColor( bgColor );
-  }
-}
-
diff --git a/src/app/qgstextannotationdialog.h b/src/app/qgstextannotationdialog.h
index 5bfd2a04d2b6..44015d0dbe91 100644
--- a/src/app/qgstextannotationdialog.h
+++ b/src/app/qgstextannotationdialog.h
@@ -44,7 +44,6 @@ class QgsTextAnnotationDialog: public QDialog, private Ui::QgsTextAnnotationDial
     void on_mFontColorButton_clicked();
     void setCurrentFontPropertiesToGui();
     void deleteItem();
-    void on_mBackgroundColorButton_clicked();
 };
 
 #endif // QGSTEXTANNOTATIONDIALOG_H
diff --git a/src/app/qgsvectorlayerproperties.cpp b/src/app/qgsvectorlayerproperties.cpp
index fb6c7561762d..0897b00ed8c8 100644
--- a/src/app/qgsvectorlayerproperties.cpp
+++ b/src/app/qgsvectorlayerproperties.cpp
@@ -30,10 +30,12 @@
 #include "qgsdiagramproperties.h"
 #include "qgsdiagramrendererv2.h"
 #include "qgsfieldcalculator.h"
+#include "qgsfieldsproperties.h"
 #include "qgsgraduatedsymboldialog.h"
 #include "qgslabeldialog.h"
 #include "qgslabelinggui.h"
 #include "qgslabel.h"
+#include "qgslegenditem.h"
 #include "qgsgenericprojectionselector.h"
 #include "qgslogger.h"
 #include "qgsmaplayerregistry.h"
@@ -77,32 +79,18 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
     , mRendererDialog( 0 )
 {
   setupUi( this );
-  setupEditTypes();
+
+  mMaximumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomIn.png" ) );
+  mMinimumScaleIconLabel->setPixmap( QgsApplication::getThemePixmap( "/mActionZoomOut.png" ) );
 
   connect( buttonBox, SIGNAL( accepted() ), this, SLOT( accept() ) );
   connect( buttonBox, SIGNAL( rejected() ), this, SLOT( reject() ) );
   connect( buttonBox->button( QDialogButtonBox::Apply ), SIGNAL( clicked() ), this, SLOT( apply() ) );
   connect( this, SIGNAL( accepted() ), this, SLOT( apply() ) );
-  connect( mAddAttributeButton, SIGNAL( clicked() ), this, SLOT( addAttribute() ) );
-  connect( mDeleteAttributeButton, SIGNAL( clicked() ), this, SLOT( deleteAttribute() ) );
-
-  connect( mToggleEditingButton, SIGNAL( clicked() ), this, SLOT( toggleEditing() ) );
-  connect( this, SIGNAL( toggleEditing( QgsMapLayer* ) ),
-           QgisApp::instance(), SLOT( toggleEditing( QgsMapLayer* ) ) );
-
-  connect( layer, SIGNAL( editingStarted() ), this, SLOT( editingToggled() ) );
-  connect( layer, SIGNAL( editingStopped() ), this, SLOT( editingToggled() ) );
-  connect( layer, SIGNAL( attributeAdded( int ) ), this, SLOT( attributeAdded( int ) ) );
-  connect( layer, SIGNAL( attributeDeleted( int ) ), this, SLOT( attributeDeleted( int ) ) );
 
   connect( insertFieldButton, SIGNAL( clicked() ), this, SLOT( insertField() ) );
   connect( insertExpressionButton, SIGNAL( clicked() ), this, SLOT( insertExpression() ) );
 
-  mAddAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionNewAttribute.png" ) );
-  mDeleteAttributeButton->setIcon( QgsApplication::getThemeIcon( "/mActionDeleteAttribute.png" ) );
-  mToggleEditingButton->setIcon( QgsApplication::getThemeIcon( "/mActionToggleEditing.png" ) );
-  mCalculateFieldButton->setIcon( QgsApplication::getThemeIcon( "/mActionCalculateField.png" ) );
-
   connect( btnUseNewSymbology, SIGNAL( clicked() ), this, SLOT( useNewSymbology() ) );
 
   QVBoxLayout *layout;
@@ -145,12 +133,19 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
   mSaveAsMenu->addAction( tr( "SLD File" ) );
   QObject::connect( mSaveAsMenu, SIGNAL( triggered( QAction * ) ), this, SLOT( saveStyleAsMenuTriggered( QAction * ) ) );
 
+  mFieldsPropertiesDialog = new QgsFieldsProperties( layer, mFieldsFrame );
+  mFieldsFrame->setLayout( new QVBoxLayout( mFieldsFrame ) );
+  mFieldsFrame->layout()->addWidget( mFieldsPropertiesDialog );
+
+  connect( mFieldsPropertiesDialog, SIGNAL( toggleEditing() ), this, SLOT( toggleEditing() ) );
+  connect( this, SIGNAL( toggleEditing( QgsMapLayer* ) ), QgisApp::instance(), SLOT( toggleEditing( QgsMapLayer* ) ) );
+
   reset();
 
   if ( layer->dataProvider() )//enable spatial index button group if supported by provider
   {
     int capabilities = layer->dataProvider()->capabilities();
-    if ( !( capabilities&QgsVectorDataProvider::CreateSpatialIndex ) )
+    if ( !( capabilities & QgsVectorDataProvider::CreateSpatialIndex ) )
     {
       pbnIndex->setEnabled( false );
     }
@@ -174,14 +169,9 @@ QgsVectorLayerProperties::QgsVectorLayerProperties(
     }
   }
 
-  updateButtons();
-
   leSpatialRefSys->setText( layer->crs().authid() + " - " + layer->crs().description() );
   leSpatialRefSys->setCursorPosition( 0 );
 
-  leEditForm->setText( layer->editForm() );
-  leEditFormInit->setText( layer->editFormInit() );
-
   connect( sliderTransparency, SIGNAL( valueChanged( int ) ), this, SLOT( sliderTransparency_valueChanged( int ) ) );
 
   //insert existing join info
@@ -237,134 +227,6 @@ QgsVectorLayerProperties::~QgsVectorLayerProperties()
   settings.setValue( "/Windows/VectorLayerProperties/row", tabWidget->currentIndex() );
 }
 
-void QgsVectorLayerProperties::loadRows()
-{
-  QObject::disconnect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
-  const QgsFieldMap &fields = layer->pendingFields();
-
-  tblAttributes->clear();
-
-  tblAttributes->setColumnCount( attrColCount );
-  tblAttributes->setRowCount( fields.size() );
-  tblAttributes->setHorizontalHeaderItem( attrIdCol, new QTableWidgetItem( tr( "Id" ) ) );
-  tblAttributes->setHorizontalHeaderItem( attrNameCol, new QTableWidgetItem( tr( "Name" ) ) );
-  tblAttributes->setHorizontalHeaderItem( attrTypeCol, new QTableWidgetItem( tr( "Type" ) ) );
-  tblAttributes->setHorizontalHeaderItem( attrLengthCol, new QTableWidgetItem( tr( "Length" ) ) );
-  tblAttributes->setHorizontalHeaderItem( attrPrecCol, new QTableWidgetItem( tr( "Precision" ) ) );
-  tblAttributes->setHorizontalHeaderItem( attrCommentCol, new QTableWidgetItem( tr( "Comment" ) ) );
-  tblAttributes->setHorizontalHeaderItem( attrEditTypeCol, new QTableWidgetItem( tr( "Edit widget" ) ) );
-  tblAttributes->setHorizontalHeaderItem( attrWMSCol, new QTableWidgetItem( "WMS" ) );
-  tblAttributes->setHorizontalHeaderItem( attrWFSCol, new QTableWidgetItem( "WFS" ) );
-  tblAttributes->setHorizontalHeaderItem( attrAliasCol, new QTableWidgetItem( tr( "Alias" ) ) );
-
-  tblAttributes->horizontalHeader()->setResizeMode( 1, QHeaderView::Stretch );
-  tblAttributes->horizontalHeader()->setResizeMode( 7, QHeaderView::Stretch );
-  tblAttributes->setSelectionBehavior( QAbstractItemView::SelectRows );
-  tblAttributes->setSelectionMode( QAbstractItemView::ExtendedSelection );
-  tblAttributes->verticalHeader()->hide();
-
-  int row = 0;
-  for ( QgsFieldMap::const_iterator it = fields.begin(); it != fields.end(); it++, row++ )
-    setRow( row, it.key(), it.value() );
-
-  tblAttributes->resizeColumnsToContents();
-  QObject::connect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
-}
-
-void QgsVectorLayerProperties::setRow( int row, int idx, const QgsField &field )
-{
-  tblAttributes->setItem( row, attrIdCol, new QTableWidgetItem( QString::number( idx ) ) );
-  tblAttributes->setItem( row, attrNameCol, new QTableWidgetItem( field.name() ) );
-  tblAttributes->setItem( row, attrTypeCol, new QTableWidgetItem( field.typeName() ) );
-  tblAttributes->setItem( row, attrLengthCol, new QTableWidgetItem( QString::number( field.length() ) ) );
-  tblAttributes->setItem( row, attrPrecCol, new QTableWidgetItem( QString::number( field.precision() ) ) );
-  tblAttributes->setItem( row, attrCommentCol, new QTableWidgetItem( field.comment() ) );
-
-  for ( int i = 0; i < attrEditTypeCol; i++ )
-    tblAttributes->item( row, i )->setFlags( tblAttributes->item( row, i )->flags() & ~Qt::ItemIsEditable );
-
-  QPushButton *pb = new QPushButton( editTypeButtonText( layer->editType( idx ) ) );
-  tblAttributes->setCellWidget( row, attrEditTypeCol, pb );
-  connect( pb, SIGNAL( pressed() ), this, SLOT( attributeTypeDialog( ) ) );
-  mButtonMap.insert( idx, pb );
-
-  //set the alias for the attribute
-  tblAttributes->setItem( row, attrAliasCol, new QTableWidgetItem( layer->attributeAlias( idx ) ) );
-
-  //published WMS/WFS attributes
-  QTableWidgetItem* wmsAttrItem = new QTableWidgetItem();
-  wmsAttrItem->setCheckState( layer->excludeAttributesWMS().contains( field.name() ) ? Qt::Unchecked : Qt::Checked );
-  wmsAttrItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable );
-  tblAttributes->setItem( row, attrWMSCol, wmsAttrItem );
-  QTableWidgetItem* wfsAttrItem = new QTableWidgetItem();
-  wfsAttrItem->setCheckState( layer->excludeAttributesWFS().contains( field.name() ) ? Qt::Unchecked : Qt::Checked );
-  wfsAttrItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsUserCheckable );
-  tblAttributes->setItem( row, attrWFSCol, wfsAttrItem );
-}
-
-void QgsVectorLayerProperties::attributeTypeDialog( )
-{
-  QPushButton *pb = qobject_cast( sender() );
-  if ( !pb )
-    return;
-
-  int index = mButtonMap.key( pb, -1 );
-  if ( index == -1 )
-    return;
-
-  QgsAttributeTypeDialog attributeTypeDialog( layer );
-
-  attributeTypeDialog.setValueMap( mValueMaps.value( index, layer->valueMap( index ) ) );
-  attributeTypeDialog.setRange( mRanges.value( index, layer->range( index ) ) );
-  attributeTypeDialog.setValueRelation( mValueRelationData.value( index, layer->valueRelation( index ) ) );
-
-  QPair checkStates = mCheckedStates.value( index, layer->checkedState( index ) );
-  attributeTypeDialog.setCheckedState( checkStates.first, checkStates.second );
-
-  attributeTypeDialog.setIndex( index, mEditTypeMap.value( index, layer->editType( index ) ) );
-
-  if ( !attributeTypeDialog.exec() )
-    return;
-
-  QgsVectorLayer::EditType editType = attributeTypeDialog.editType();
-
-  mEditTypeMap.insert( index, editType );
-
-  QString buttonText;
-  switch ( editType )
-  {
-    case QgsVectorLayer::ValueMap:
-      mValueMaps.insert( index, attributeTypeDialog.valueMap() );
-      break;
-    case QgsVectorLayer::EditRange:
-    case QgsVectorLayer::SliderRange:
-    case QgsVectorLayer::DialRange:
-      mRanges.insert( index, attributeTypeDialog.rangeData() );
-      break;
-    case QgsVectorLayer::CheckBox:
-      mCheckedStates.insert( index, attributeTypeDialog.checkedState() );
-      break;
-    case QgsVectorLayer::ValueRelation:
-      mValueRelationData.insert( index, attributeTypeDialog.valueRelationData() );
-      break;
-    case QgsVectorLayer::LineEdit:
-    case QgsVectorLayer::TextEdit:
-    case QgsVectorLayer::UniqueValues:
-    case QgsVectorLayer::UniqueValuesEditable:
-    case QgsVectorLayer::Classification:
-    case QgsVectorLayer::FileName:
-    case QgsVectorLayer::Enumeration:
-    case QgsVectorLayer::Immutable:
-    case QgsVectorLayer::Hidden:
-    case QgsVectorLayer::Calendar:
-    case QgsVectorLayer::UuidGenerator:
-      break;
-  }
-
-  pb->setText( editTypeButtonText( editType ) );
-}
-
-
 void QgsVectorLayerProperties::toggleEditing()
 {
   emit toggleEditing( layer );
@@ -377,110 +239,6 @@ void QgsVectorLayerProperties::toggleEditing()
   }
 }
 
-void QgsVectorLayerProperties::attributeAdded( int idx )
-{
-  const QgsFieldMap &fields = layer->pendingFields();
-  int row = tblAttributes->rowCount();
-  tblAttributes->insertRow( row );
-  setRow( row, idx, fields[idx] );
-  tblAttributes->setCurrentCell( row, idx );
-}
-
-
-void QgsVectorLayerProperties::attributeDeleted( int idx )
-{
-  for ( int i = 0; i < tblAttributes->rowCount(); i++ )
-  {
-    if ( tblAttributes->item( i, 0 )->text().toInt() == idx )
-    {
-      tblAttributes->removeRow( i );
-      break;
-    }
-  }
-}
-
-void QgsVectorLayerProperties::addAttribute()
-{
-  QgsAddAttrDialog dialog( layer, this );
-  if ( dialog.exec() == QDialog::Accepted )
-  {
-    layer->beginEditCommand( "Attribute added" );
-    if ( !addAttribute( dialog.field() ) )
-    {
-      layer->destroyEditCommand();
-      QMessageBox::information( this, tr( "Name conflict" ), tr( "The attribute could not be inserted. The name already exists in the table." ) );
-    }
-    else
-    {
-      layer->endEditCommand();
-    }
-  }
-}
-
-bool QgsVectorLayerProperties::addAttribute( const QgsField &field )
-{
-  QgsDebugMsg( "inserting attribute " + field.name() + " of type " + field.typeName() );
-  layer->beginEditCommand( tr( "Added attribute" ) );
-  if ( layer->addAttribute( field ) )
-  {
-    layer->endEditCommand();
-    return true;
-  }
-  else
-  {
-    layer->destroyEditCommand();
-    return false;
-  }
-}
-
-void QgsVectorLayerProperties::deleteAttribute()
-{
-  QList items = tblAttributes->selectedItems();
-  QList idxs;
-
-  for ( QList::const_iterator it = items.begin(); it != items.end(); it++ )
-  {
-    if (( *it )->column() == 0 )
-      idxs << ( *it )->text().toInt();
-  }
-  for ( QList::const_iterator it = idxs.begin(); it != idxs.end(); it++ )
-  {
-    layer->beginEditCommand( tr( "Deleted attribute" ) );
-    layer->deleteAttribute( *it );
-    layer->endEditCommand();
-  }
-}
-
-void QgsVectorLayerProperties::editingToggled()
-{
-  if ( !layer->isEditable() )
-    loadRows();
-
-  updateButtons();
-}
-
-void QgsVectorLayerProperties::updateButtons()
-{
-  if ( layer->isEditable() )
-  {
-    int cap = layer->dataProvider()->capabilities();
-    mAddAttributeButton->setEnabled( cap & QgsVectorDataProvider::AddAttributes );
-    mDeleteAttributeButton->setEnabled( cap & QgsVectorDataProvider::DeleteAttributes );
-    mCalculateFieldButton->setEnabled( cap & ( QgsVectorDataProvider::ChangeAttributeValues | QgsVectorDataProvider::AddAttributes ) );
-    mToggleEditingButton->setChecked( true );
-  }
-  else
-  {
-    int cap = layer->dataProvider()->capabilities();
-    bool canChangeAttributes = cap & QgsVectorDataProvider::ChangeAttributeValues;
-    mAddAttributeButton->setEnabled( false );
-    mDeleteAttributeButton->setEnabled( false );
-    mToggleEditingButton->setChecked( false );
-    mToggleEditingButton->setEnabled( canChangeAttributes && !layer->isReadOnly() );
-    mCalculateFieldButton->setEnabled( false );
-  }
-}
-
 void QgsVectorLayerProperties::sliderTransparency_valueChanged( int theValue )
 {
   //set the transparency percentage label to a suitable value
@@ -578,8 +336,6 @@ void QgsVectorLayerProperties::setDisplayField( QString name )
 //! @note in raster props, this method is called sync()
 void QgsVectorLayerProperties::reset( void )
 {
-  QObject::disconnect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
-
   // populate the general information
   txtDisplayName->setText( layer->name() );
   pbnQueryBuilder->setWhatsThis( tr( "This button opens the query "
@@ -653,56 +409,17 @@ void QgsVectorLayerProperties::reset( void )
   labelCheckBox->setChecked( layer->hasLabelsEnabled() );
   labelOptionsFrame->setEnabled( layer->hasLabelsEnabled() );
 
+  mFieldsPropertiesDialog->init();
+
   //set the transparency slider
   sliderTransparency->setValue( 255 - layer->getTransparency() );
   //update the transparency percentage label
   sliderTransparency_valueChanged( 255 - layer->getTransparency() );
 
-  loadRows();
-  QObject::connect( tblAttributes, SIGNAL( cellChanged( int, int ) ), this, SLOT( on_tblAttributes_cellChanged( int, int ) ) );
   QObject::connect( labelCheckBox, SIGNAL( clicked( bool ) ), this, SLOT( enableLabelOptions( bool ) ) );
 } // reset()
 
 
-//
-// methods reimplemented from qt designer base class
-//
-
-QMap< QgsVectorLayer::EditType, QString > QgsVectorLayerProperties::editTypeMap;
-
-void QgsVectorLayerProperties::setupEditTypes()
-{
-  if ( !editTypeMap.isEmpty() )
-    return;
-
-  editTypeMap.insert( QgsVectorLayer::LineEdit, tr( "Line edit" ) );
-  editTypeMap.insert( QgsVectorLayer::UniqueValues, tr( "Unique values" ) );
-  editTypeMap.insert( QgsVectorLayer::UniqueValuesEditable, tr( "Unique values editable" ) );
-  editTypeMap.insert( QgsVectorLayer::Classification, tr( "Classification" ) );
-  editTypeMap.insert( QgsVectorLayer::ValueMap, tr( "Value map" ) );
-  editTypeMap.insert( QgsVectorLayer::EditRange, tr( "Edit range" ) );
-  editTypeMap.insert( QgsVectorLayer::SliderRange, tr( "Slider range" ) );
-  editTypeMap.insert( QgsVectorLayer::DialRange, tr( "Dial range" ) );
-  editTypeMap.insert( QgsVectorLayer::FileName, tr( "File name" ) );
-  editTypeMap.insert( QgsVectorLayer::Enumeration, tr( "Enumeration" ) );
-  editTypeMap.insert( QgsVectorLayer::Immutable, tr( "Immutable" ) );
-  editTypeMap.insert( QgsVectorLayer::Hidden, tr( "Hidden" ) );
-  editTypeMap.insert( QgsVectorLayer::CheckBox, tr( "Checkbox" ) );
-  editTypeMap.insert( QgsVectorLayer::TextEdit, tr( "Text edit" ) );
-  editTypeMap.insert( QgsVectorLayer::Calendar, tr( "Calendar" ) );
-  editTypeMap.insert( QgsVectorLayer::ValueRelation, tr( "Value relation" ) );
-  editTypeMap.insert( QgsVectorLayer::UuidGenerator, tr( "UUID generator" ) );
-}
-
-QString QgsVectorLayerProperties::editTypeButtonText( QgsVectorLayer::EditType type )
-{
-  return editTypeMap[ type ];
-}
-
-QgsVectorLayer::EditType QgsVectorLayerProperties::editTypeFromButtonText( QString text )
-{
-  return editTypeMap.key( text );
-}
 
 void QgsVectorLayerProperties::apply()
 {
@@ -746,9 +463,6 @@ void QgsVectorLayerProperties::apply()
     layer->setDisplayField( displayFieldComboBox->currentText() );
   }
 
-  layer->setEditForm( leEditForm->text() );
-  layer->setEditFormInit( leEditFormInit->text() );
-
   actionDialog->apply();
 
   if ( labelDialog )
@@ -758,77 +472,8 @@ void QgsVectorLayerProperties::apply()
 
   QSet excludeAttributesWMS, excludeAttributesWFS;
 
-  for ( int i = 0; i < tblAttributes->rowCount(); i++ )
-  {
-    int idx = tblAttributes->item( i, attrIdCol )->text().toInt();
-
-    QPushButton *pb = qobject_cast( tblAttributes->cellWidget( i, attrEditTypeCol ) );
-    if ( !pb )
-      continue;
-
-    QgsVectorLayer::EditType editType = editTypeFromButtonText( pb->text() );
-    layer->setEditType( idx, editType );
-
-    switch ( editType )
-    {
-      case QgsVectorLayer::ValueMap:
-        if ( mValueMaps.contains( idx ) )
-        {
-          QMap &map = layer->valueMap( idx );
-          map.clear();
-          map = mValueMaps[idx];
-        }
-        break;
-
-      case QgsVectorLayer::EditRange:
-      case QgsVectorLayer::SliderRange:
-      case QgsVectorLayer::DialRange:
-        if ( mRanges.contains( idx ) )
-        {
-          layer->range( idx ) = mRanges[idx];
-        }
-        break;
-
-      case QgsVectorLayer::CheckBox:
-        if ( mCheckedStates.contains( idx ) )
-        {
-          layer->setCheckedState( idx, mCheckedStates[idx].first, mCheckedStates[idx].second );
-        }
-        break;
-
-      case QgsVectorLayer::ValueRelation:
-        if ( mValueRelationData.contains( idx ) )
-        {
-          layer->valueRelation( idx ) = mValueRelationData[idx];
-        }
-        break;
-
-      case QgsVectorLayer::LineEdit:
-      case QgsVectorLayer::UniqueValues:
-      case QgsVectorLayer::UniqueValuesEditable:
-      case QgsVectorLayer::Classification:
-      case QgsVectorLayer::FileName:
-      case QgsVectorLayer::Enumeration:
-      case QgsVectorLayer::Immutable:
-      case QgsVectorLayer::Hidden:
-      case QgsVectorLayer::TextEdit:
-      case QgsVectorLayer::Calendar:
-      case QgsVectorLayer::UuidGenerator:
-        break;
-    }
-
-    if ( tblAttributes->item( i, attrWMSCol )->checkState() == Qt::Unchecked )
-    {
-      excludeAttributesWMS.insert( tblAttributes->item( i, attrNameCol )->text() );
-    }
-    if ( tblAttributes->item( i, attrWFSCol )->checkState() == Qt::Unchecked )
-    {
-      excludeAttributesWFS.insert( tblAttributes->item( i, attrNameCol )->text() );
-    }
-  }
-
-  layer->setExcludeAttributesWMS( excludeAttributesWMS );
-  layer->setExcludeAttributesWFS( excludeAttributesWFS );
+  // Apply fields settings
+  mFieldsPropertiesDialog->apply();
 
   if ( layer->isUsingRendererV2() )
   {
@@ -881,7 +526,7 @@ void QgsVectorLayerProperties::apply()
   layer->setAbstract( mLayerAbstractTextEdit->toPlainText() );
 
   // update symbology
-  emit refreshLegend( layer->id(), false );
+  emit refreshLegend( layer->id(), QgsLegendItem::DontChange );
 
   //no need to delete the old one, maplayer will do it if needed
   layer->setCacheImage( 0 );
@@ -889,7 +534,6 @@ void QgsVectorLayerProperties::apply()
   layer->triggerRepaint();
   // notify the project we've made a change
   QgsProject::instance()->dirty( true );
-
 }
 
 void QgsVectorLayerProperties::on_pbnQueryBuilder_clicked()
@@ -1117,50 +761,6 @@ void QgsVectorLayerProperties::saveStyleAs( StyleType styleType )
   myQSettings.setValue( "style/lastStyleDir", myPath );
 }
 
-void QgsVectorLayerProperties::on_tblAttributes_cellChanged( int row, int column )
-{
-  if ( column == attrAliasCol && layer ) //only consider attribute aliases in this function
-  {
-    int idx = tblAttributes->item( row, attrIdCol )->text().toInt();
-
-    const QgsFieldMap &fields = layer->pendingFields();
-
-    if ( !fields.contains( idx ) )
-    {
-      return; // index must be wrong
-    }
-
-    QTableWidgetItem *aliasItem = tblAttributes->item( row, column );
-    if ( aliasItem )
-    {
-      layer->addAttributeAlias( idx, aliasItem->text() );
-    }
-  }
-}
-
-void QgsVectorLayerProperties::on_mCalculateFieldButton_clicked()
-{
-  if ( !layer )
-  {
-    return;
-  }
-
-  QgsFieldCalculator calc( layer );
-  calc.exec();
-}
-
-void QgsVectorLayerProperties::on_pbnSelectEditForm_clicked()
-{
-  QSettings myQSettings;
-  QString lastUsedDir = myQSettings.value( "style/lastUIDir", "." ).toString();
-  QString uifilename = QFileDialog::getOpenFileName( this, tr( "Select edit form" ), lastUsedDir, tr( "UI file" )  + " (*.ui)" );
-
-  if ( uifilename.isNull() )
-    return;
-
-  leEditForm->setText( uifilename );
-}
-
 QList QgsVectorLayerProperties::overlayPlugins() const
 {
   QList pluginList;
@@ -1226,7 +826,6 @@ void QgsVectorLayerProperties::on_mButtonAddJoin_clicked()
       }
 
       layer->addJoin( info );
-      loadRows(); //update attribute tab
       addJoinToTreeWidget( info );
       pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
                                    !layer->isEditable() && layer->vectorJoins().size() < 1 );
@@ -1265,7 +864,6 @@ void QgsVectorLayerProperties::on_mButtonRemoveJoin_clicked()
   }
 
   layer->removeJoin( currentJoinItem->data( 0, Qt::UserRole ).toString() );
-  loadRows();
   mJoinTreeWidget->takeTopLevelItem( mJoinTreeWidget->indexOfTopLevelItem( currentJoinItem ) );
   pbnQueryBuilder->setEnabled( layer && layer->dataProvider() && layer->dataProvider()->supportsSubsetString() &&
                                !layer->isEditable() && layer->vectorJoins().size() < 1 );
@@ -1378,4 +976,12 @@ void QgsVectorLayerProperties::enableLabelOptions( bool theFlag )
   labelOptionsFrame->setEnabled( theFlag );
 }
 
+void QgsVectorLayerProperties::on_mMinimumScaleSetCurrentPushButton_clicked()
+{
+  cbMinimumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+}
 
+void QgsVectorLayerProperties::on_mMaximumScaleSetCurrentPushButton_clicked()
+{
+  cbMaximumScale->setScale( 1.0 / QgisApp::instance()->mapCanvas()->mapRenderer()->scale() );
+}
diff --git a/src/app/qgsvectorlayerproperties.h b/src/app/qgsvectorlayerproperties.h
index 34b184a35d6d..c9ef16c8351b 100644
--- a/src/app/qgsvectorlayerproperties.h
+++ b/src/app/qgsvectorlayerproperties.h
@@ -26,6 +26,7 @@
 #include "qgsdelattrdialog.h"
 #include "qgsattributetypedialog.h"
 #include "qgsfield.h"
+#include "qgslegenditem.h"
 #include "qgsmapcanvas.h"
 #include "qgscontexthelp.h"
 #include "qgsexpressionbuilderdialog.h"
@@ -39,6 +40,7 @@ class QgsVectorLayer;
 class QgsVectorOverlayPlugin;
 class QgsLabelingGui;
 class QgsDiagramProperties;
+class QgsFieldsProperties;
 
 class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPropertiesBase
 {
@@ -79,8 +81,6 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
 
     void insertExpression();
 
-    void attributeTypeDialog();
-
     void alterLayerDialog( const QString& string );
 
     /** Reset to original (vector layer) values */
@@ -98,12 +98,6 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
     /** Called when apply button is pressed or dialog is accepted */
     void apply();
 
-    /** toggle editing of layer */
-    void toggleEditing();
-
-    /** editing of layer was toggled */
-    void editingToggled();
-
     //
     //methods reimplemented from qt designer base class
     //
@@ -115,19 +109,11 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
     void on_pbnSaveDefaultStyle_clicked();
     void on_pbnLoadStyle_clicked();
     void on_pbnSaveStyleAs_clicked();
-    void on_tblAttributes_cellChanged( int row, int column );
-    void on_mCalculateFieldButton_clicked();
-    void on_pbnSelectEditForm_clicked();
     void on_tabWidget_currentChanged( int idx );
     void on_buttonBox_helpRequested() { QgsContextHelp::run( metaObject()->className() ); }
     void on_pbnUpdateExtents_clicked();
 
     void enableLabelOptions( bool theFlag );
-    void addAttribute();
-    void deleteAttribute();
-
-    void attributeAdded( int idx );
-    void attributeDeleted( int idx );
 
     void useNewSymbology();
     void setUsingNewSymbology( bool useNewSymbology );
@@ -135,14 +121,20 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
     void on_mButtonAddJoin_clicked();
     void on_mButtonRemoveJoin_clicked();
 
+    void on_mMinimumScaleSetCurrentPushButton_clicked();
+    void on_mMaximumScaleSetCurrentPushButton_clicked();
+
   signals:
 
     /** emitted when changes to layer were saved to update legend */
     void refreshLegend( QString layerID, bool expandItem );
+    void refreshLegend( QString layerID, QgsLegendItem::Expansion expandItem );
 
     void toggleEditing( QgsMapLayer * );
 
   private slots:
+    /** toggle editing of layer */
+    void toggleEditing();
 
     /** save the style based on selected format from the menu */
     void saveStyleAsMenuTriggered( QAction * );
@@ -153,21 +145,6 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
 
     void updateSymbologyPage();
 
-    enum attrColumns
-    {
-      attrIdCol = 0,
-      attrNameCol,
-      attrTypeCol,
-      attrLengthCol,
-      attrPrecCol,
-      attrCommentCol,
-      attrEditTypeCol,
-      attrAliasCol,
-      attrWMSCol,
-      attrWFSCol,
-      attrColCount,
-    };
-
     QgsVectorLayer *layer;
 
     bool mMetadataFilled;
@@ -186,18 +163,11 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
     QgsAttributeActionDialog* actionDialog;
     /**Diagram dialog. If apply is pressed, options are applied to vector's diagrams*/
     QgsDiagramProperties* diagramPropertiesDialog;
+    /**Fields dialog. If apply is pressed, options are applied to vector's diagrams*/
+    QgsFieldsProperties* mFieldsPropertiesDialog;
 
-    QList mOverlayDialogs;
-    QMap mButtonMap;
-    QMap mEditTypeMap;
-    QMap > mValueMaps;
-    QMap mRanges;
-    QMap mValueRelationData;
-    QMap > mCheckedStates;
 
-    void updateButtons();
-    void loadRows();
-    void setRow( int row, int idx, const QgsField &field );
+    QList mOverlayDialogs;
 
     void initDiagramTab();
 
@@ -209,11 +179,6 @@ class QgsVectorLayerProperties : public QDialog, private Ui::QgsVectorLayerPrope
 
     /**Adds a new join to mJoinTreeWidget*/
     void addJoinToTreeWidget( const QgsVectorJoinInfo& join );
-
-    static QMap< QgsVectorLayer::EditType, QString > editTypeMap;
-    static void setupEditTypes();
-    static QString editTypeButtonText( QgsVectorLayer::EditType type );
-    static QgsVectorLayer::EditType editTypeFromButtonText( QString text );
 };
 
 inline QString QgsVectorLayerProperties::displayName()
diff --git a/src/core/CMakeLists.txt b/src/core/CMakeLists.txt
index 2d16dd253e82..87e1aa02493a 100644
--- a/src/core/CMakeLists.txt
+++ b/src/core/CMakeLists.txt
@@ -5,9 +5,6 @@
 
 SET(QGIS_CORE_SRCS
 
-  gps/qextserialport/qextserialport.cpp
-  gps/qextserialport/qextserialenumerator.cpp
-
   gps/qgsgpsconnection.cpp
   gps/qgsgpsconnectionregistry.cpp
   gps/qgsnmeaconnection.cpp
@@ -63,6 +60,7 @@ SET(QGIS_CORE_SRCS
   qgsdbfilterproxymodel.cpp
   qgsdiagramrendererv2.cpp
   qgsdistancearea.cpp
+  qgserror.cpp
   qgsexpression.cpp
   qgsfeature.cpp
   qgsfield.cpp
@@ -211,23 +209,29 @@ SET(QGIS_CORE_SRCS
   qgsscaleutils.cpp
 )
 
-IF(WIN32)
-  SET(QGIS_CORE_SRCS
-    ${QGIS_CORE_SRCS}
-    gps/qextserialport/win_qextserialport.cpp
-  )
-  ADD_DEFINITIONS(-D_TTY_WIN_)
-ELSE(WIN32)
-  SET(QGIS_CORE_SRCS
-    ${QGIS_CORE_SRCS}
-    gps/qextserialport/posix_qextserialport.cpp
+IF (WITH_INTERNAL_QEXTSERIALPORT)
+  SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
+    gps/qextserialport/qextserialport.cpp
+    gps/qextserialport/qextserialenumerator.cpp
   )
-  ADD_DEFINITIONS(-D_TTY_POSIX_)
-ENDIF(WIN32)
+
+  IF(WIN32)
+    SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
+      gps/qextserialport/win_qextserialport.cpp
+    )
+    ADD_DEFINITIONS(-D_TTY_WIN_)
+  ELSE(WIN32)
+    SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
+      gps/qextserialport/posix_qextserialport.cpp
+    )
+    ADD_DEFINITIONS(-D_TTY_POSIX_)
+  ENDIF(WIN32)
+ELSE (WITH_INTERNAL_QEXTSERIALPORT)
+  INCLUDE_DIRECTORIES(${QEXTSERIALPORT_INCLUDE_DIR})
+ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
 
 IF (QT_MOBILITY_LOCATION_FOUND)
-  SET(QGIS_CORE_SRCS
-    ${QGIS_CORE_SRCS}
+  SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
     gps/qgsqtlocationconnection.cpp
   )
 ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -249,8 +253,7 @@ IF (WITH_INTERNAL_SPATIALITE)
   ADD_DEFINITIONS(-D_LARGE_FILE=1 -D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE=1)
   ADD_DEFINITIONS(-DSQLITE_ENABLE_RTREE=1)
 
-  SET(QGIS_CORE_SRCS
-    ${QGIS_CORE_SRCS}
+  SET(QGIS_CORE_SRCS ${QGIS_CORE_SRCS}
     spatialite/sqlite3.c
     spatialite/spatialite.c
     )
@@ -315,16 +318,20 @@ SET(QGIS_CORE_MOC_HDRS
   gps/qgsgpsdetector.h
   gps/qgsnmeaconnection.h
   gps/qgsgpsdconnection.h
-  gps/qextserialport/qextserialport.h
-  gps/qextserialport/qextserialenumerator.h
 
   symbology-ng/qgscptcityarchive.h
+  symbology-ng/qgssvgcache.h
 )
 
+IF (WITH_INTERNAL_QEXTSERIALPORT)
+  SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS}
+    gps/qextserialport/qextserialport.h
+    gps/qextserialport/qextserialenumerator.h
+  )
+ENDIF (WITH_INTERNAL_QEXTSERIALPORT)
 
 IF (QT_MOBILITY_LOCATION_FOUND)
-  SET(QGIS_CORE_MOC_HDRS
-    ${QGIS_CORE_MOC_HDRS}
+  SET(QGIS_CORE_MOC_HDRS ${QGIS_CORE_MOC_HDRS}
     gps/qgsqtlocationconnection.h
   )
 ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -350,6 +357,7 @@ SET(QGIS_CORE_HDRS
   qgsdataitem.h
   qgsdistancearea.h
   qgscsexception.h
+  qgserror.h
   qgsexception.h
   qgsexpression.h
   qgsfeature.h
@@ -472,8 +480,7 @@ SET(QGIS_CORE_HDRS
 )
 
 IF (QT_MOBILITY_LOCATION_FOUND)
-  SET(QGIS_CORE_HDRS
-    ${QGIS_CORE_HDRS}
+  SET(QGIS_CORE_HDRS ${QGIS_CORE_HDRS}
     gps/qgsqtlocationconnection.h
   )
 ENDIF (QT_MOBILITY_LOCATION_FOUND)
@@ -556,6 +563,10 @@ IF(APPLE)
   TARGET_LINK_LIBRARIES(qgis_core "-framework CoreFoundation -framework IOKit")
 ENDIF(APPLE)
 
+IF (NOT WITH_INTERNAL_QEXTSERIALPORT)
+  TARGET_LINK_LIBRARIES(qgis_core ${QEXTSERIALPORT_LIBRARY})
+ENDIF (NOT WITH_INTERNAL_QEXTSERIALPORT)
+
 IF (QT_MOBILITY_LOCATION_FOUND)
     TARGET_LINK_LIBRARIES(qgis_core ${QT_MOBILITY_LOCATION_LIBRARY})
 ENDIF (QT_MOBILITY_LOCATION_FOUND)
diff --git a/src/core/composer/qgsatlascomposition.cpp b/src/core/composer/qgsatlascomposition.cpp
index 76871f06ac69..9c8192e814a0 100644
--- a/src/core/composer/qgsatlascomposition.cpp
+++ b/src/core/composer/qgsatlascomposition.cpp
@@ -26,11 +26,11 @@
 #include "qgsmaplayerregistry.h"
 
 QgsAtlasComposition::QgsAtlasComposition( QgsComposition* composition ) :
-  mComposition( composition ),
-  mEnabled( false ),
-  mComposerMap( 0 ),
-  mHideCoverage( false ), mFixedScale( false ), mMargin( 0.10 ), mFilenamePattern( "'output_'||$feature" ),
-  mCoverageLayer( 0 ), mSingleFile( false )
+    mComposition( composition ),
+    mEnabled( false ),
+    mComposerMap( 0 ),
+    mHideCoverage( false ), mFixedScale( false ), mMargin( 0.10 ), mFilenamePattern( "'output_'||$feature" ),
+    mCoverageLayer( 0 ), mSingleFile( false )
 {
 
   // declare special columns with a default value
@@ -282,9 +282,9 @@ void QgsAtlasComposition::writeXML( QDomElement& elem, QDomDocument& doc ) const
   atlasElem.setAttribute( "hideCoverage", mHideCoverage ? "true" : "false" );
   atlasElem.setAttribute( "fixedScale", mFixedScale ? "true" : "false" );
   atlasElem.setAttribute( "singleFile", mSingleFile ? "true" : "false" );
-  atlasElem.setAttribute( "margin", QString::number(mMargin) );
+  atlasElem.setAttribute( "margin", QString::number( mMargin ) );
   atlasElem.setAttribute( "filenamePattern", mFilenamePattern );
-  
+
   elem.appendChild( atlasElem );
 }
 
@@ -302,9 +302,9 @@ void QgsAtlasComposition::readXML( const QDomElement& atlasElem, const QDomDocum
   QMap layers = QgsMapLayerRegistry::instance()->mapLayers();
   for ( QMap::const_iterator it = layers.begin(); it != layers.end(); ++it )
   {
-    if ( it.key() == atlasElem.attribute("coverageLayer") )
+    if ( it.key() == atlasElem.attribute( "coverageLayer" ) )
     {
-      mCoverageLayer = dynamic_cast(it.value());
+      mCoverageLayer = dynamic_cast( it.value() );
       break;
     }
   }
@@ -313,7 +313,7 @@ void QgsAtlasComposition::readXML( const QDomElement& atlasElem, const QDomDocum
   QList maps = mComposition->composerMapItems();
   for ( QList::const_iterator it = maps.begin(); it != maps.end(); ++it )
   {
-    if ( (*it)->id() == atlasElem.attribute( "composerMap" ).toInt() )
+    if (( *it )->id() == atlasElem.attribute( "composerMap" ).toInt() )
     {
       mComposerMap = const_cast( *it );
       break;
diff --git a/src/core/composer/qgsatlascomposition.h b/src/core/composer/qgsatlascomposition.h
index 861b3b42d228..bd05828853c5 100644
--- a/src/core/composer/qgsatlascomposition.h
+++ b/src/core/composer/qgsatlascomposition.h
@@ -37,35 +37,35 @@ class QgsExpression;
 class CORE_EXPORT QgsAtlasComposition : public QObject
 {
     Q_OBJECT
-public:
+  public:
     QgsAtlasComposition( QgsComposition* composition );
     ~QgsAtlasComposition();
-    
+
     /** Is the atlas generation enabled ? */
     bool enabled() const { return mEnabled; }
     void setEnabled( bool e ) { mEnabled = e; }
 
     QgsComposerMap* composerMap() const { return mComposerMap; }
     void setComposerMap( QgsComposerMap* map ) { mComposerMap = map; }
-    
+
     bool hideCoverage() const { return mHideCoverage; }
     void setHideCoverage( bool hide ) { mHideCoverage = hide; }
-    
+
     bool fixedScale() const { return mFixedScale; }
     void setFixedScale( bool fixed ) { mFixedScale = fixed; }
-    
+
     float margin() const { return mMargin; }
     void setMargin( float margin ) { mMargin = margin; }
-    
+
     QString filenamePattern() const { return mFilenamePattern; }
     void setFilenamePattern( const QString& pattern ) { mFilenamePattern = pattern; }
-    
+
     QgsVectorLayer* coverageLayer() const { return mCoverageLayer; }
     void setCoverageLayer( QgsVectorLayer* lmap );
-    
+
     bool singleFile() const { return mSingleFile; }
     void setSingleFile( bool single ) { mSingleFile = single; }
-    
+
     /** Begins the rendering. */
     void beginRender();
     /** Ends the rendering. Restores original extent */
@@ -85,11 +85,11 @@ class CORE_EXPORT QgsAtlasComposition : public QObject
 
     QgsComposition* composition() { return mComposition; }
 
- signals:
+  signals:
     /** emitted when one of the parameters changes */
     void parameterChanged();
 
- private:
+  private:
     QgsComposition* mComposition;
 
     bool mEnabled;
diff --git a/src/core/composer/qgscomposeritemcommand.h b/src/core/composer/qgscomposeritemcommand.h
index 2c60709e1bb8..51ed005a877c 100644
--- a/src/core/composer/qgscomposeritemcommand.h
+++ b/src/core/composer/qgscomposeritemcommand.h
@@ -80,6 +80,9 @@ class CORE_EXPORT QgsComposerMergeCommand: public QgsComposerItemCommand
       ComposerMapAnnotationDistance,
       //composer legend
       ComposerLegendText,
+      LegendColumnCount,
+      LegendSplitLayer,
+      LegendEqualColumnWidth,
       LegendSymbolWidth,
       LegendSymbolHeight,
       LegendGroupSpace,
@@ -87,6 +90,7 @@ class CORE_EXPORT QgsComposerMergeCommand: public QgsComposerItemCommand
       LegendSymbolSpace,
       LegendIconSymbolSpace,
       LegendBoxSpace,
+      LegendColumnSpace,
       //composer picture
       ComposerPictureRotation,
       // composer scalebar
diff --git a/src/core/composer/qgscomposerlabel.cpp b/src/core/composer/qgscomposerlabel.cpp
index 917cc20147c4..fbae32557cb7 100644
--- a/src/core/composer/qgscomposerlabel.cpp
+++ b/src/core/composer/qgscomposerlabel.cpp
@@ -22,9 +22,9 @@
 #include 
 
 QgsComposerLabel::QgsComposerLabel( QgsComposition *composition ):
-  QgsComposerItem( composition ), mMargin( 1.0 ), mFontColor( QColor( 0, 0, 0 ) ),
-  mHAlignment( Qt::AlignLeft ), mVAlignment( Qt::AlignTop ),
-  mExpressionFeature( 0 ), mExpressionLayer( 0 )
+    QgsComposerItem( composition ), mMargin( 1.0 ), mFontColor( QColor( 0, 0, 0 ) ),
+    mHAlignment( Qt::AlignLeft ), mVAlignment( Qt::AlignTop ),
+    mExpressionFeature( 0 ), mExpressionLayer( 0 )
 {
   //default font size is 10 point
   mFont.setPointSizeF( 10 );
@@ -90,7 +90,7 @@ QString QgsComposerLabel::displayText() const
   QString displayText = mText;
   replaceDateText( displayText );
   QMap subs = mSubstitutions;
-  subs[ "$page" ] = QVariant((int)mComposition->itemPageNumber( this ) + 1);
+  subs[ "$page" ] = QVariant(( int )mComposition->itemPageNumber( this ) + 1 );
   return QgsExpression::replaceExpressionText( displayText, mExpressionFeature, mExpressionLayer, &subs );
 }
 
@@ -105,9 +105,9 @@ void QgsComposerLabel::replaceDateText( QString& text ) const
     int openingBracketPos = text.indexOf( "(", currentDatePos );
     int closingBracketPos = text.indexOf( ")", openingBracketPos + 1 );
     if ( openingBracketPos != -1 &&
-	 closingBracketPos != -1 &&
-	 ( closingBracketPos - openingBracketPos ) > 1 && 
-	 openingBracketPos == currentDatePos + constant.size() )
+         closingBracketPos != -1 &&
+         ( closingBracketPos - openingBracketPos ) > 1 &&
+         openingBracketPos == currentDatePos + constant.size() )
     {
       formatText = text.mid( openingBracketPos + 1, closingBracketPos - openingBracketPos - 1 );
       text.replace( currentDatePos, closingBracketPos - currentDatePos + 1, QDate::currentDate().toString( formatText ) );
diff --git a/src/core/composer/qgscomposerlegend.cpp b/src/core/composer/qgscomposerlegend.cpp
index fad7f7ec1d0b..a4309ef8ebaf 100644
--- a/src/core/composer/qgscomposerlegend.cpp
+++ b/src/core/composer/qgscomposerlegend.cpp
@@ -14,10 +14,12 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include 
 
 #include "qgscomposerlegend.h"
 #include "qgscomposerlegenditem.h"
 #include "qgscomposermap.h"
+#include "qgslogger.h"
 #include "qgsmaplayer.h"
 #include "qgsmaplayerregistry.h"
 #include "qgsmaprenderer.h"
@@ -32,12 +34,15 @@ QgsComposerLegend::QgsComposerLegend( QgsComposition* composition )
     : QgsComposerItem( composition )
     , mTitle( tr( "Legend" ) )
     , mBoxSpace( 2 )
+    , mColumnSpace( 2 )
     , mGroupSpace( 2 )
     , mLayerSpace( 2 )
     , mSymbolSpace( 2 )
     , mIconLabelSpace( 2 )
+    , mColumnCount( 1 )
     , mComposerMap( 0 )
-
+    , mSplitLayer( false )
+    , mEqualColumnWidth( false )
 {
   //QStringList idList = layerIdList();
   //mLegendModel.setLayerSet( idList );
@@ -75,18 +80,9 @@ void QgsComposerLegend::paint( QPainter* painter, const QStyleOptionGraphicsItem
 
 QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
 {
-  QSizeF size;
-  double maxXCoord = 0;
-
-
-
-  //go through model...
+  QSizeF size( 0, 0 );
   QStandardItem* rootItem = mLegendModel.invisibleRootItem();
-  if ( !rootItem )
-  {
-    return size;
-  }
-
+  if ( !rootItem ) return size;
 
   if ( painter )
   {
@@ -95,65 +91,95 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
     painter->setPen( QPen( QColor( 0, 0, 0 ) ) );
   }
 
-  int numLayerItems = rootItem->rowCount();
-  QStandardItem* currentLayerItem = 0;
+  QList atomList = createAtomList( rootItem, mSplitLayer );
 
-  //draw title
-  double currentItemMaxX = 0; //maximum x-coordinate for current item
-  double currentYCoordinate = 0;
-  if ( painter )
+  setColumns( atomList );
+
+  double maxColumnWidth = 0;
+  if ( mEqualColumnWidth )
   {
-    if ( !mTitle.isEmpty() )
+    foreach ( Atom atom, atomList )
     {
-      currentYCoordinate = mBoxSpace;
-
-      painter->setPen( QColor( 0, 0, 0 ) );
-      QStringList lines = splitStringForWrapping( mTitle );
-      for ( QStringList::Iterator titlePart = lines.begin(); titlePart != lines.end(); ++titlePart )
-      {
-        currentYCoordinate += fontAscentMillimeters( mTitleFont );
-        drawText( painter, mBoxSpace, currentYCoordinate, *titlePart, mTitleFont );
-        currentItemMaxX = 2 * mBoxSpace + textWidthMillimeters( mTitleFont, *titlePart );
-        maxXCoord = qMax( maxXCoord, currentItemMaxX );
-        if ( titlePart != lines.end() )
-          currentYCoordinate += mlineSpacing;
-      }
+      maxColumnWidth = qMax( atom.size.width(), maxColumnWidth );
     }
   }
 
-  for ( int i = 0; i < numLayerItems; ++i )
+  QSizeF titleSize = drawTitle();
+  // Using mGroupSpace as space between legend title and first atom in column
+  double columnTop = mBoxSpace + titleSize.height() + mGroupSpace;
+
+  QPointF point( mBoxSpace, columnTop );
+  bool firstInColumn = true;
+  double columnMaxHeight = 0;
+  double columnWidth = 0;
+  int column = 0;
+  foreach ( Atom atom, atomList )
   {
-    currentLayerItem = rootItem->child( i );
-    QgsComposerLegendItem* currentLegendItem = dynamic_cast( currentLayerItem );
-    if ( currentLegendItem )
+    if ( atom.column > column )
     {
-      QgsComposerLegendItem::ItemType type = currentLegendItem->itemType();
-      if ( type == QgsComposerLegendItem::GroupItem )
+      // Switch to next column
+      if ( mEqualColumnWidth )
       {
-        drawGroupItem( painter, dynamic_cast( currentLegendItem ), currentYCoordinate, currentItemMaxX );
-        maxXCoord = qMax( maxXCoord, currentItemMaxX );
+        point.rx() += mColumnSpace + maxColumnWidth;
       }
-      else if ( type == QgsComposerLegendItem::LayerItem )
+      else
       {
-        drawLayerItem( painter, dynamic_cast( currentLegendItem ), currentYCoordinate, currentItemMaxX );
-        maxXCoord = qMax( maxXCoord, currentItemMaxX );
+        point.rx() += mColumnSpace + columnWidth;
       }
+      point.ry() = columnTop;
+      columnWidth = 0;
+      column++;
+      firstInColumn = true;
     }
+    // Add space if necessary, unfortunately it depends on first nucleon
+    if ( !firstInColumn )
+    {
+      point.ry() += spaceAboveAtom( atom );
+    }
+
+    drawAtom( atom, painter, point );
+    columnWidth = qMax( atom.size.width(), columnWidth );
+
+    point.ry() += atom.size.height();
+    columnMaxHeight = qMax( point.y() - columnTop, columnMaxHeight );
+
+    firstInColumn = false;
   }
+  point.rx() += columnWidth + mBoxSpace;
 
-  currentYCoordinate += mBoxSpace;
+  size.rheight() = columnTop + columnMaxHeight + mBoxSpace;
+  size.rwidth() = point.x();
 
-  size.setHeight( currentYCoordinate );
-  size.setWidth( maxXCoord );
+  // Now we know total width and can draw the title centered
+  if ( !mTitle.isEmpty() )
+  {
+    // For multicolumn center if we stay in totalWidth, otherwise allign to left
+    // and expand total width. With single column keep alligned to left be cause
+    // it looks better alligned with items bellow instead of centered
+    Qt::AlignmentFlag halignement;
+    if ( mColumnCount > 1 && titleSize.width() + 2 * mBoxSpace < size.width() )
+    {
+      halignement = Qt::AlignHCenter;
+      point.rx() = mBoxSpace + size.rwidth() / 2;
+    }
+    else
+    {
+      halignement = Qt::AlignLeft;
+      point.rx() = mBoxSpace;
+      size.rwidth() = qMax( titleSize.width() + 2 * mBoxSpace, size.width() );
+    }
+    point.ry() = mBoxSpace;
+    drawTitle( painter, point, halignement );
+  }
 
   //adjust box if width or height is to small
-  if ( painter && currentYCoordinate > rect().height() )
+  if ( painter && size.height() > rect().height() )
   {
-    setSceneRect( QRectF( transform().dx(), transform().dy(), rect().width(), currentYCoordinate ) );
+    setSceneRect( QRectF( transform().dx(), transform().dy(), rect().width(), size.height() ) );
   }
-  if ( painter && maxXCoord > rect().width() )
+  if ( painter && size.width() > rect().width() )
   {
-    setSceneRect( QRectF( transform().dx(), transform().dy(), maxXCoord, rect().height() ) );
+    setSceneRect( QRectF( transform().dx(), transform().dy(), size.width(), rect().height() ) );
   }
 
   if ( painter )
@@ -171,216 +197,225 @@ QSizeF QgsComposerLegend::paintAndDetermineSize( QPainter* painter )
   return size;
 }
 
-void QgsComposerLegend::drawGroupItem( QPainter* p, QgsComposerGroupItem* groupItem, double& currentYCoord, double& maxXCoord )
+QSizeF QgsComposerLegend::drawTitle( QPainter* painter, QPointF point, Qt::AlignmentFlag halignement )
 {
-  if ( !p || !groupItem )
-  {
-    return;
-  }
+  QSizeF size( 0, 0 );
+  if ( mTitle.isEmpty() ) return size;
 
-  currentYCoord += mGroupSpace;
-  double currentMaxXCoord = 0;
+  QStringList lines = splitStringForWrapping( mTitle );
 
-  p->setPen( QColor( 0, 0, 0 ) );
+  double y = point.y();
 
-  QStringList lines = splitStringForWrapping( groupItem->text() );
-  for ( QStringList::Iterator groupPart = lines.begin(); groupPart != lines.end(); ++groupPart )
+  if ( painter ) painter->setPen( QColor( 0, 0, 0 ) );
+
+  for ( QStringList::Iterator titlePart = lines.begin(); titlePart != lines.end(); ++titlePart )
   {
-    currentYCoord += fontAscentMillimeters( mGroupFont );
-    drawText( p, mBoxSpace, currentYCoord, *groupPart, mGroupFont );
-    currentMaxXCoord = 2 * mBoxSpace + textWidthMillimeters( mGroupFont, *groupPart );
-    maxXCoord = qMax( currentMaxXCoord, maxXCoord );
-    if ( groupPart != lines.end() )
-      currentYCoord += mlineSpacing;
-  }
+    // it does not draw the last world if rectangle width is exactly text width
+    double width = textWidthMillimeters( mTitleFont, *titlePart ) + 1;
+    double height = fontAscentMillimeters( mTitleFont );
 
-  //children can be other group items or layer items
-  int numChildItems = groupItem->rowCount();
-  QStandardItem* currentChildItem = 0;
+    double left = halignement == Qt::AlignLeft ?  point.x() : point.x() - width / 2;
 
-  for ( int i = 0; i < numChildItems; ++i )
-  {
-    currentChildItem = groupItem->child( i );
-    QgsComposerLegendItem* currentLegendItem = dynamic_cast( currentChildItem );
-    QgsComposerLegendItem::ItemType type = currentLegendItem->itemType();
-    if ( type == QgsComposerLegendItem::GroupItem )
-    {
-      drawGroupItem( p, dynamic_cast( currentLegendItem ), currentYCoord, currentMaxXCoord );
-      maxXCoord = qMax( currentMaxXCoord, maxXCoord );
-    }
-    else if ( type == QgsComposerLegendItem::LayerItem )
+    QRectF rect( left, y, width, height );
+
+    if ( painter ) drawText( painter, rect, *titlePart, mTitleFont, halignement, Qt::AlignVCenter );
+
+    size.rwidth() = qMax( width, size.width() );
+
+    y += height;
+    if ( titlePart != lines.end() )
     {
-      drawLayerItem( p, dynamic_cast( currentLegendItem ), currentYCoord, currentMaxXCoord );
-      maxXCoord = qMax( currentMaxXCoord, maxXCoord );
+      y += mlineSpacing;
     }
   }
+  size.rheight() = y - point.y();
+
+  return size;
 }
 
-void QgsComposerLegend::drawLayerItem( QPainter* p, QgsComposerLayerItem* layerItem, double& currentYCoord, double& maxXCoord )
+
+QSizeF QgsComposerLegend::drawGroupItemTitle( QgsComposerGroupItem* groupItem, QPainter* painter, QPointF point )
 {
-  if ( !layerItem )
-  {
-    return;
-  }
+  QSizeF size( 0, 0 );
+  if ( !groupItem ) return size;
 
-  int opacity = 255;
-  QgsMapLayer* currentLayer = QgsMapLayerRegistry::instance()->mapLayer( layerItem->layerID() );
-  if ( currentLayer )
+  double y = point.y();
+
+  if ( painter ) painter->setPen( QColor( 0, 0, 0 ) );
+
+  QStringList lines = splitStringForWrapping( groupItem->text() );
+  for ( QStringList::Iterator groupPart = lines.begin(); groupPart != lines.end(); ++groupPart )
   {
-    opacity = currentLayer->getTransparency();
+    y += fontAscentMillimeters( mGroupFont );
+    if ( painter ) drawText( painter, point.x(), y, *groupPart, mGroupFont );
+    double width = textWidthMillimeters( mGroupFont, *groupPart );
+    size.rwidth() = qMax( width, size.width() );
+    if ( groupPart != lines.end() )
+    {
+      y += mlineSpacing;
+    }
   }
+  size.rheight() = y - point.y();
+  return size;
+}
+
+QSizeF QgsComposerLegend::drawLayerItemTitle( QgsComposerLayerItem* layerItem, QPainter* painter, QPointF point )
+{
+  QSizeF size( 0, 0 );
+  if ( !layerItem ) return size;
 
   //Let the user omit the layer title item by having an empty layer title string
-  if ( !layerItem->text().isEmpty() )
-  {
-    currentYCoord += mLayerSpace;
+  if ( layerItem->text().isEmpty() ) return size;
 
-    //draw layer Item
-    if ( p )
-    {
-      p->setPen( QColor( 0, 0, 0 ) );
+  double y = point.y();
 
-      QStringList lines = splitStringForWrapping( layerItem->text() );
-      for ( QStringList::Iterator layerItemPart = lines.begin(); layerItemPart != lines.end(); ++layerItemPart )
-      {
-        currentYCoord += fontAscentMillimeters( mLayerFont );
-        drawText( p, mBoxSpace, currentYCoord, *layerItemPart , mLayerFont );
-        maxXCoord = qMax( maxXCoord, 2 * mBoxSpace + textWidthMillimeters( mLayerFont, *layerItemPart ) );
-        if ( layerItemPart != lines.end() )
-          currentYCoord += mlineSpacing ;
-      }
-    }
-  }
-  else //layer title omited
+  if ( painter ) painter->setPen( QColor( 0, 0, 0 ) );
+
+  QStringList lines = splitStringForWrapping( layerItem->text() );
+  for ( QStringList::Iterator layerItemPart = lines.begin(); layerItemPart != lines.end(); ++layerItemPart )
   {
-    //symbol space will be added before the item later
-    currentYCoord += ( mLayerSpace - mSymbolSpace );
+    y += fontAscentMillimeters( mLayerFont );
+    if ( painter ) drawText( painter, point.x(), y, *layerItemPart , mLayerFont );
+    double width = textWidthMillimeters( mLayerFont, *layerItemPart );
+    size.rwidth() = qMax( width, size.width() );
+    if ( layerItemPart != lines.end() )
+    {
+      y += mlineSpacing;
+    }
   }
+  size.rheight() = y - point.y();
 
-  //and child items
-  drawLayerChildItems( p, layerItem, currentYCoord, maxXCoord, opacity );
+  return size;
 }
 
 void QgsComposerLegend::adjustBoxSize()
 {
   QSizeF size = paintAndDetermineSize( 0 );
+  QgsDebugMsg( QString( "width = %1 height = %2" ).arg( size.width() ).arg( size.height() ) );
   if ( size.isValid() )
   {
     setSceneRect( QRectF( transform().dx(), transform().dy(), size.width(), size.height() ) );
   }
 }
 
-void QgsComposerLegend::drawLayerChildItems( QPainter* p, QStandardItem* layerItem, double& currentYCoord, double& maxXCoord, int layerOpacity )
+QgsComposerLegend::Nucleon QgsComposerLegend::drawSymbolItem( QgsComposerLegendItem* symbolItem, QPainter* painter, QPointF point, double labelXOffset )
 {
-  if ( !layerItem )
-  {
-    return;
-  }
-
-  //Draw all symbols first and the texts after (to find out the x coordinate to have the text aligned)
-  QList childYCoords;
-  QList realItemHeights;
+  QSizeF symbolSize( 0, 0 );
+  QSizeF labelSize( 0, 0 );
+  if ( !symbolItem ) return Nucleon();
 
   double textHeight = fontHeightCharacterMM( mItemFont, QChar( '0' ) );
+  // itemHeight here is not realy item height, it is only for symbol
+  // vertical alignment purpose, i.e. ok take single line height
+  // if there are more lines, thos run under the symbol
   double itemHeight = qMax( mSymbolHeight, textHeight );
 
-  double textAlignCoord = 0; //alignment for legend text
+  //real symbol height. Can be different from standard height in case of point symbols
+  double realSymbolHeight;
 
-  QStandardItem* currentItem;
-
-  int numChildren = layerItem->rowCount();
-
-  for ( int i = 0; i < numChildren; ++i )
+  int opacity = 255;
+  QgsComposerLayerItem* layerItem = dynamic_cast( symbolItem->parent() );
+  if ( layerItem )
   {
-    //real symbol height. Can be different from standard height in case of point symbols
-    double realSymbolHeight;
-    double realItemHeight = itemHeight; //will be adjusted if realSymbolHeight turns out to be larger
-
-    currentYCoord += mSymbolSpace;
-    double currentXCoord = mBoxSpace;
-
-    currentItem = layerItem->child( i, 0 );
-
-    if ( !currentItem )
+    QgsMapLayer* currentLayer = QgsMapLayerRegistry::instance()->mapLayer( layerItem->layerID() );
+    if ( currentLayer )
     {
-      continue;
+      opacity = currentLayer->getTransparency();
     }
+  }
 
-    int lineCount = splitStringForWrapping( currentItem->text() ).count();
+  QStringList lines = splitStringForWrapping( symbolItem->text() );
 
-    QgsSymbol* symbol = 0;
-    QgsComposerSymbolItem* symbolItem = dynamic_cast( currentItem );
-    if ( symbolItem )
-    {
-      symbol = symbolItem->symbol();
-    }
+  QgsSymbol* symbol = 0;
+  QgsComposerSymbolItem* symItem = dynamic_cast( symbolItem );
+  if ( symItem )
+  {
+    symbol = symItem->symbol();
+  }
 
-    QgsSymbolV2* symbolNg = 0;
-    QgsComposerSymbolV2Item* symbolV2Item = dynamic_cast( currentItem );
-    if ( symbolV2Item )
-    {
-      symbolNg = symbolV2Item->symbolV2();
-    }
-    QgsComposerRasterSymbolItem* rasterItem = dynamic_cast( currentItem );
+  QgsSymbolV2* symbolNg = 0;
+  QgsComposerSymbolV2Item* symbolV2Item = dynamic_cast( symbolItem );
+  if ( symbolV2Item )
+  {
+    symbolNg = symbolV2Item->symbolV2();
+  }
+  QgsComposerRasterSymbolItem* rasterItem = dynamic_cast( symbolItem );
 
-    if ( symbol )  //item with symbol?
-    {
-      //draw symbol
-      drawSymbol( p, symbol, currentYCoord + ( itemHeight - mSymbolHeight ) / 2, currentXCoord, realSymbolHeight, layerOpacity );
-      realItemHeight = qMax( realSymbolHeight, itemHeight );
-      currentXCoord += mIconLabelSpace;
-    }
-    else if ( symbolNg ) //item with symbol NG?
+  double x = point.x();
+  if ( symbol )  //item with symbol?
+  {
+    //draw symbol
+    drawSymbol( painter, symbol, point.y() + ( itemHeight - mSymbolHeight ) / 2, x, realSymbolHeight, opacity );
+    symbolSize.rwidth() =  qMax( x - point.x(), mSymbolWidth );
+    symbolSize.rheight() = qMax( realSymbolHeight, mSymbolHeight );
+  }
+  else if ( symbolNg ) //item with symbol NG?
+  {
+    // must be called also with painter=0 to get real size
+    drawSymbolV2( painter, symbolNg, point.y() + ( itemHeight - mSymbolHeight ) / 2, x, realSymbolHeight, opacity );
+    symbolSize.rwidth() = qMax( x - point.x(), mSymbolWidth );
+    symbolSize.rheight() = qMax( realSymbolHeight, mSymbolHeight );
+  }
+  else if ( rasterItem )
+  {
+    if ( painter )
     {
-      drawSymbolV2( p, symbolNg, currentYCoord + ( itemHeight - mSymbolHeight ) / 2, currentXCoord, realSymbolHeight, layerOpacity );
-      realItemHeight = qMax( realSymbolHeight, itemHeight );
-      currentXCoord += mIconLabelSpace;
+      painter->setBrush( rasterItem->color() );
+      painter->drawRect( QRectF( point.x(), point.y() + ( itemHeight - mSymbolHeight ) / 2, mSymbolWidth, mSymbolHeight ) );
     }
-    else if ( rasterItem )
-    {
-      if ( p )
-      {
-        p->setBrush( rasterItem->color() );
-        p->drawRect( QRectF( currentXCoord, currentYCoord + ( itemHeight - mSymbolHeight ) / 2, mSymbolWidth, mSymbolHeight ) );
-      }
-      currentXCoord += mSymbolWidth;
-      currentXCoord += mIconLabelSpace;
-    }
-    else //item with icon?
+    symbolSize.rwidth() = mSymbolWidth;
+    symbolSize.rheight() = mSymbolHeight;
+  }
+  else //item with icon?
+  {
+    QIcon symbolIcon = symbolItem->icon();
+    if ( !symbolIcon.isNull() )
     {
-      QIcon symbolIcon = currentItem->icon();
-      if ( !symbolIcon.isNull() && p )
-      {
-        symbolIcon.paint( p, currentXCoord, currentYCoord + ( itemHeight - mSymbolHeight ) / 2, mSymbolWidth, mSymbolHeight );
-        currentXCoord += mSymbolWidth;
-        currentXCoord += mIconLabelSpace;
-      }
+      if ( painter ) symbolIcon.paint( painter, point.x(), point.y() + ( itemHeight - mSymbolHeight ) / 2, mSymbolWidth, mSymbolHeight );
+      symbolSize.rwidth() = mSymbolWidth;
+      symbolSize.rheight() = mSymbolHeight;
     }
+  }
 
-    childYCoords.push_back( currentYCoord );
-    realItemHeights.push_back( realItemHeight );
-    currentYCoord += lineCount > 0 ? ( realItemHeight + mlineSpacing ) * lineCount : realItemHeight;
-    textAlignCoord = qMax( currentXCoord, textAlignCoord );
+  if ( painter ) painter->setPen( QColor( 0, 0, 0 ) );
+
+  double labelX = point.x() + labelXOffset; // + mIconLabelSpace;
+
+  // Vertical alignment of label with symbol:
+  // a) label height < symbol heigh: label centerd with symbol
+  // b) label height > symbol height: label starts at top and runs under symbol
+
+  labelSize.rheight() = lines.count() * textHeight + ( lines.count() - 1 ) * mlineSpacing;
+
+  double labelY;
+  if ( labelSize.height() < symbolSize.height() )
+  {
+    labelY = point.y() +  symbolSize.height() / 2 + textHeight / 2;
+  }
+  else
+  {
+    labelY = point.y() + textHeight;
   }
 
-  maxXCoord = qMax( maxXCoord, textAlignCoord );
-  for ( int i = 0; i < numChildren; ++i )
+  for ( QStringList::Iterator itemPart = lines.begin(); itemPart != lines.end(); ++itemPart )
   {
-    if ( p )
+    if ( painter ) drawText( painter, labelX, labelY, *itemPart , mItemFont );
+    labelSize.rwidth() = qMax( textWidthMillimeters( mItemFont,  *itemPart ), labelSize.width() );
+    if ( itemPart != lines.end() )
     {
-      p->setPen( QColor( 0, 0, 0 ) );
-
-      QStringList lines = splitStringForWrapping( layerItem->child( i, 0 )->text() );
-      double textY = childYCoords.at( i ) + textHeight + ( realItemHeights.at( i ) - textHeight ) / 2;
-      for ( QStringList::Iterator itemPart = lines.begin(); itemPart != lines.end(); ++itemPart )
-      {
-        drawText( p, textAlignCoord, textY , *itemPart , mItemFont );
-        maxXCoord = qMax( maxXCoord, textAlignCoord + mBoxSpace + textWidthMillimeters( mItemFont,  *itemPart ) );
-        if ( itemPart != lines.end() )
-          textY += mlineSpacing + textHeight + ( realItemHeights.at( i ) - textHeight ) / 2;
-      }
+      labelY += mlineSpacing + textHeight;
     }
   }
+
+  Nucleon nucleon;
+  nucleon.item = symbolItem;
+  nucleon.symbolSize = symbolSize;
+  nucleon.labelSize = labelSize;
+  //QgsDebugMsg( QString( "symbol height = %1 label height = %2").arg( symbolSize.height()).arg( labelSize.height() ));
+  double width = symbolSize.width() + labelXOffset + labelSize.width();
+  double height = qMax( symbolSize.height(), labelSize.height() );
+  nucleon.size = QSizeF( width, height );
+  return nucleon;
 }
 
 void QgsComposerLegend::drawSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int layerOpacity ) const
@@ -414,7 +449,7 @@ void QgsComposerLegend::drawSymbol( QPainter* p, QgsSymbol* s, double currentYCo
 void QgsComposerLegend::drawSymbolV2( QPainter* p, QgsSymbolV2* s, double currentYCoord, double& currentXPosition, double& symbolHeight, int layerOpacity ) const
 {
   Q_UNUSED( layerOpacity );
-  if ( !p || !s )
+  if ( !s )
   {
     return;
   }
@@ -468,23 +503,26 @@ void QgsComposerLegend::drawSymbolV2( QPainter* p, QgsSymbolV2* s, double curren
     }
   }
 
-  p->save();
-  p->translate( currentXPosition + widthOffset, currentYCoord + heightOffset );
-  p->scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor );
-
-  if ( markerSymbol && sizeInMapUnits )
+  if ( p )
   {
-    s->setOutputUnit( QgsSymbolV2::MM );
-  }
-  s->drawPreviewIcon( p, QSize( width * rasterScaleFactor, height * rasterScaleFactor ) );
+    p->save();
+    p->translate( currentXPosition + widthOffset, currentYCoord + heightOffset );
+    p->scale( 1.0 / rasterScaleFactor, 1.0 / rasterScaleFactor );
 
-  if ( markerSymbol && sizeInMapUnits )
-  {
-    s->setOutputUnit( QgsSymbolV2::MapUnit );
-    markerSymbol->setSize( size );
-  }
+    if ( markerSymbol && sizeInMapUnits )
+    {
+      s->setOutputUnit( QgsSymbolV2::MM );
+    }
 
-  p->restore();
+    s->drawPreviewIcon( p, QSize( width * rasterScaleFactor, height * rasterScaleFactor ) );
+
+    if ( markerSymbol && sizeInMapUnits )
+    {
+      s->setOutputUnit( QgsSymbolV2::MapUnit );
+      markerSymbol->setSize( size );
+    }
+    p->restore();
+  }
   currentXPosition += width;
   currentXPosition += 2 * widthOffset;
   symbolHeight = height + 2 * heightOffset;
@@ -602,6 +640,7 @@ QStringList QgsComposerLegend::layerIdList() const
 
 void QgsComposerLegend::synchronizeWithModel()
 {
+  QgsDebugMsg( "Entered" );
   adjustBoxSize();
   update();
 }
@@ -672,11 +711,15 @@ bool QgsComposerLegend::writeXML( QDomElement& elem, QDomDocument & doc ) const
 
   //write general properties
   composerLegendElem.setAttribute( "title", mTitle );
+  composerLegendElem.setAttribute( "columnCount", QString::number( mColumnCount ) );
+  composerLegendElem.setAttribute( "splitLayer", QString::number( mSplitLayer ) );
+  composerLegendElem.setAttribute( "equalColumnWidth", QString::number( mEqualColumnWidth ) );
   composerLegendElem.setAttribute( "titleFont", mTitleFont.toString() );
   composerLegendElem.setAttribute( "groupFont", mGroupFont.toString() );
   composerLegendElem.setAttribute( "layerFont", mLayerFont.toString() );
   composerLegendElem.setAttribute( "itemFont", mItemFont.toString() );
   composerLegendElem.setAttribute( "boxSpace", QString::number( mBoxSpace ) );
+  composerLegendElem.setAttribute( "columnSpace", QString::number( mColumnSpace ) );
   composerLegendElem.setAttribute( "groupSpace", QString::number( mGroupSpace ) );
   composerLegendElem.setAttribute( "layerSpace", QString::number( mLayerSpace ) );
   composerLegendElem.setAttribute( "symbolSpace", QString::number( mSymbolSpace ) );
@@ -706,6 +749,10 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
 
   //read general properties
   mTitle = itemElem.attribute( "title" );
+  mColumnCount = itemElem.attribute( "columnCount", "1" ).toInt();
+  if ( mColumnCount < 1 ) mColumnCount = 1;
+  mSplitLayer = itemElem.attribute( "splitLayer", "0" ).toInt() == 1;
+  mEqualColumnWidth = itemElem.attribute( "equalColumnWidth", "0" ).toInt() == 1;
   //title font
   QString titleFontString = itemElem.attribute( "titleFont" );
   if ( !titleFontString.isEmpty() )
@@ -734,6 +781,7 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
 
   //spaces
   mBoxSpace = itemElem.attribute( "boxSpace", "2.0" ).toDouble();
+  mColumnSpace = itemElem.attribute( "columnSpace", "2.0" ).toDouble();
   mGroupSpace = itemElem.attribute( "groupSpace", "3.0" ).toDouble();
   mLayerSpace = itemElem.attribute( "layerSpace", "3.0" ).toDouble();
   mSymbolSpace = itemElem.attribute( "symbolSpace", "2.0" ).toDouble();
@@ -772,12 +820,18 @@ bool QgsComposerLegend::readXML( const QDomElement& itemElem, const QDomDocument
 void QgsComposerLegend::setComposerMap( const QgsComposerMap* map )
 {
   mComposerMap = map;
-  QObject::connect( map, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
+  if ( map )
+  {
+    QObject::connect( map, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
+  }
 }
 
 void QgsComposerLegend::invalidateCurrentMap()
 {
-  disconnect( mComposerMap, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
+  if ( mComposerMap )
+  {
+    disconnect( mComposerMap, SIGNAL( destroyed( QObject* ) ), this, SLOT( invalidateCurrentMap() ) );
+  }
   mComposerMap = 0;
 }
 
@@ -791,3 +845,261 @@ QStringList QgsComposerLegend::splitStringForWrapping( QString stringToSplt )
     list = stringToSplt.split( mWrapChar );
   return list;
 }
+
+QList QgsComposerLegend::createAtomList( QStandardItem* rootItem, bool splitLayer )
+{
+  QList atoms;
+
+  if ( !rootItem ) return atoms;
+
+  Atom atom;
+
+  for ( int i = 0; i < rootItem->rowCount(); i++ )
+  {
+    QStandardItem* currentLayerItem = rootItem->child( i );
+    QgsComposerLegendItem* currentLegendItem = dynamic_cast( currentLayerItem );
+    if ( !currentLegendItem ) continue;
+
+    QgsComposerLegendItem::ItemType type = currentLegendItem->itemType();
+    if ( type == QgsComposerLegendItem::GroupItem )
+    {
+      // Group subitems
+      QList groupAtoms = createAtomList( currentLayerItem, splitLayer );
+
+      Nucleon nucleon;
+      nucleon.item = currentLegendItem;
+      nucleon.size = drawGroupItemTitle( dynamic_cast( currentLegendItem ) );
+
+      if ( groupAtoms.size() > 0 )
+      {
+        // Add internal space between this group title and the next nucleon
+        groupAtoms[0].size.rheight() += spaceAboveAtom( groupAtoms[0] );
+        // Prepend this group title to the first atom
+        groupAtoms[0].nucleons.prepend( nucleon );
+        groupAtoms[0].size.rheight() += nucleon.size.height();
+        groupAtoms[0].size.rwidth() = qMax( nucleon.size.width(), groupAtoms[0].size.width() );
+      }
+      else
+      {
+        // no subitems, append new atom
+        Atom atom;
+        atom.nucleons.append( nucleon );
+        atom.size.rwidth() += nucleon.size.width();
+        atom.size.rheight() += nucleon.size.height();
+        atom.size.rwidth() = qMax( nucleon.size.width(), atom.size.width() );
+        groupAtoms.append( atom );
+      }
+      atoms.append( groupAtoms );
+    }
+    else if ( type == QgsComposerLegendItem::LayerItem )
+    {
+      Nucleon nucleon;
+      nucleon.item = currentLegendItem;
+      nucleon.size = drawLayerItemTitle( dynamic_cast( currentLegendItem ) );
+
+      QList layerAtoms;
+      Atom atom;
+      atom.nucleons.append( nucleon );
+      atom.size.rwidth() = nucleon.size.width();
+      atom.size.rheight() = nucleon.size.height();
+
+      for ( int j = 0; j < currentLegendItem->rowCount(); j++ )
+      {
+        QgsComposerLegendItem * symbolItem = dynamic_cast( currentLegendItem->child( j, 0 ) );
+        if ( !symbolItem ) continue;
+
+        Nucleon symbolNucleon = drawSymbolItem( symbolItem );
+
+        if ( !mSplitLayer || j == 0 )
+        {
+          // append to layer atom
+          // the width is not correct at this moment, we must align all symbol labels
+          atom.size.rwidth() = qMax( symbolNucleon.size.width(), atom.size.width() );
+          atom.size.rheight() += mSymbolSpace;
+          atom.size.rheight() += symbolNucleon.size.height();
+          atom.nucleons.append( symbolNucleon );
+        }
+        else
+        {
+          Atom symbolAtom;
+          symbolAtom.nucleons.append( symbolNucleon );
+          symbolAtom.size.rwidth() = symbolNucleon.size.width();
+          symbolAtom.size.rheight() = symbolNucleon.size.height();
+          layerAtoms.append( symbolAtom );
+        }
+      }
+      layerAtoms.prepend( atom );
+      atoms.append( layerAtoms );
+    }
+  }
+
+  return atoms;
+}
+
+void QgsComposerLegend::drawAtom( Atom atom, QPainter* painter, QPointF point )
+{
+  bool first = true;
+  foreach ( Nucleon nucleon, atom.nucleons )
+  {
+    QgsComposerLegendItem* item = nucleon.item;
+    //QgsDebugMsg( "text: " + item->text() );
+    if ( !item ) continue;
+    QgsComposerLegendItem::ItemType type = item->itemType();
+    if ( type == QgsComposerLegendItem::GroupItem )
+    {
+      QgsComposerGroupItem* groupItem = dynamic_cast( item );
+      if ( !groupItem ) continue;
+      if ( !first ) point.ry() += mGroupSpace;
+      drawGroupItemTitle( groupItem, painter, point );
+    }
+    else if ( type == QgsComposerLegendItem::LayerItem )
+    {
+      QgsComposerLayerItem* layerItem = dynamic_cast( item );
+      if ( !layerItem ) continue;
+      if ( !first ) point.ry() += mLayerSpace;
+      drawLayerItemTitle( layerItem, painter, point );
+    }
+    else if ( type == QgsComposerLegendItem::SymbologyItem ||
+              type == QgsComposerLegendItem::SymbologyV2Item ||
+              type == QgsComposerLegendItem::RasterSymbolItem )
+    {
+      if ( !first ) point.ry() += mSymbolSpace;
+      double labelXOffset = nucleon.labelXOffset;
+      drawSymbolItem( item, painter, point, labelXOffset );
+    }
+    point.ry() += nucleon.size.height();
+    first = false;
+  }
+}
+
+double QgsComposerLegend::spaceAboveAtom( Atom atom )
+{
+  if ( atom.nucleons.size() == 0 ) return 0;
+
+  Nucleon nucleon = atom.nucleons.first();
+
+  QgsComposerLegendItem* item = nucleon.item;
+  if ( !item ) return 0;
+
+  QgsComposerLegendItem::ItemType type = item->itemType();
+  switch ( type )
+  {
+    case QgsComposerLegendItem::GroupItem:
+      return mGroupSpace;
+      break;
+    case QgsComposerLegendItem::LayerItem:
+      return mLayerSpace;
+      break;
+    case QgsComposerLegendItem::SymbologyV2Item:
+    case QgsComposerLegendItem::RasterSymbolItem:
+      return mSymbolSpace;
+      break;
+    default:
+      break;
+  }
+  return 0;
+}
+
+void QgsComposerLegend::setColumns( QList& atomList )
+{
+  if ( mColumnCount == 0 ) return;
+
+  // Divide atoms to columns
+  double totalHeight = 0;
+  bool first = true;
+  double maxAtomHeight = 0;
+  foreach ( Atom atom, atomList )
+  {
+    if ( !first )
+    {
+      totalHeight += spaceAboveAtom( atom );
+    }
+    totalHeight += atom.size.height();
+    maxAtomHeight = qMax( atom.size.height(), maxAtomHeight );
+    first  = false;
+  }
+
+  // We know height of each atom and we have to split them into columns
+  // minimizing max column height. It is sort of bin packing problem, NP-hard.
+  // We are using simple heuristic, brute fore appeared to be to slow,
+  // the number of combinations is N = n!/(k!*(n-k)!) where n = atomsCount-1
+  // and k = columnsCount-1
+
+  double avgColumnHeight = totalHeight / mColumnCount;
+  int currentColumn = 0;
+  int currentColumnAtomCount = 0; // number of atoms in current column
+  double currentColumnHeight = 0;
+  double maxColumnHeight = 0;
+  double closedColumnsHeight = 0;
+  first = true; // first in column
+  for ( int i = 0; i < atomList.size(); i++ )
+  {
+    Atom atom = atomList[i];
+    double currentHeight = currentColumnHeight;
+    if ( !first )
+    {
+      currentHeight += spaceAboveAtom( atom );
+    }
+    currentHeight += atom.size.height();
+
+    // Recalc average height for remaining columns including current
+    avgColumnHeight = ( totalHeight - closedColumnsHeight ) / ( mColumnCount - currentColumn );
+    if (( currentHeight - avgColumnHeight ) > atom.size.height() / 2 // center of current atom is over average height
+        && currentColumnAtomCount > 0 // do not leave empty column
+        && currentHeight > maxAtomHeight  // no sense to make smaller columns than max atom height
+        && currentHeight > maxColumnHeight  // no sense to make smaller columns than max column already created
+        && currentColumn < mColumnCount - 1 ) // must not exceed max number of columns
+    {
+      // New column
+      currentColumn++;
+      currentColumnAtomCount = 0;
+      closedColumnsHeight += currentColumnHeight;
+      currentColumnHeight = atom.size.height();
+    }
+    else
+    {
+      currentColumnHeight = currentHeight;
+    }
+    atomList[i].column = currentColumn;
+    currentColumnAtomCount++;
+    maxColumnHeight = qMax( currentColumnHeight, maxColumnHeight );
+
+    first  = false;
+  }
+
+  // Alling labels of symbols for each layr/column to the same labelXOffset
+  QMap maxSymbolWidth;
+  for ( int i = 0; i < atomList.size(); i++ )
+  {
+    for ( int j = 0; j < atomList[i].nucleons.size(); j++ )
+    {
+      QgsComposerLegendItem* item = atomList[i].nucleons[j].item;
+      if ( !item ) continue;
+      QgsComposerLegendItem::ItemType type = item->itemType();
+      if ( type == QgsComposerLegendItem::SymbologyItem ||
+           type == QgsComposerLegendItem::SymbologyV2Item ||
+           type == QgsComposerLegendItem::RasterSymbolItem )
+      {
+        QString key = QString( "%1-%2" ).arg(( qulonglong )item->parent() ).arg( atomList[i].column );
+        maxSymbolWidth[key] = qMax( atomList[i].nucleons[j].symbolSize.width(), maxSymbolWidth[key] );
+      }
+    }
+  }
+  for ( int i = 0; i < atomList.size(); i++ )
+  {
+    for ( int j = 0; j < atomList[i].nucleons.size(); j++ )
+    {
+      QgsComposerLegendItem* item = atomList[i].nucleons[j].item;
+      if ( !item ) continue;
+      QgsComposerLegendItem::ItemType type = item->itemType();
+      if ( type == QgsComposerLegendItem::SymbologyItem ||
+           type == QgsComposerLegendItem::SymbologyV2Item ||
+           type == QgsComposerLegendItem::RasterSymbolItem )
+      {
+        QString key = QString( "%1-%2" ).arg(( qulonglong )item->parent() ).arg( atomList[i].column );
+        atomList[i].nucleons[j].labelXOffset =  maxSymbolWidth[key] + mIconLabelSpace;
+        atomList[i].nucleons[j].size.rwidth() =  maxSymbolWidth[key] + mIconLabelSpace + atomList[i].nucleons[j].labelSize.width();
+      }
+    }
+  }
+}
diff --git a/src/core/composer/qgscomposerlegend.h b/src/core/composer/qgscomposerlegend.h
index dcc8e9cf609f..6e7774081b5c 100644
--- a/src/core/composer/qgscomposerlegend.h
+++ b/src/core/composer/qgscomposerlegend.h
@@ -19,6 +19,7 @@
 #define QGSCOMPOSERLEGEND_H
 
 #include "qgscomposeritem.h"
+#include "qgscomposerlegenditem.h"
 #include "qgslegendmodel.h"
 
 class QgsSymbol;
@@ -35,6 +36,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     Q_OBJECT
 
   public:
+
     QgsComposerLegend( QgsComposition* composition );
     ~QgsComposerLegend();
 
@@ -47,6 +49,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     /**Paints the legend and calculates its size. If painter is 0, only size is calculated*/
     QSizeF paintAndDetermineSize( QPainter* painter );
 
+
     /**Sets item box to the whole content*/
     void adjustBoxSize();
 
@@ -72,6 +75,9 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     double boxSpace() const {return mBoxSpace;}
     void setBoxSpace( double s ) {mBoxSpace = s;}
 
+    double columnSpace() const {return mColumnSpace;}
+    void setColumnSpace( double s ) { mColumnSpace = s;}
+
     double groupSpace() const {return mGroupSpace;}
     void setGroupSpace( double s ) {mGroupSpace = s;}
 
@@ -93,8 +99,17 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     void setWrapChar( const QString& t ) {mWrapChar = t;}
     QString wrapChar() const {return mWrapChar;}
 
+    int columnCount() const { return mColumnCount; }
+    void setColumnCount( int c ) { mColumnCount = c;}
+
+    int splitLayer() const { return mSplitLayer; }
+    void setSplitLayer( bool s ) { mSplitLayer = s;}
+
+    int equalColumnWidth() const { return mEqualColumnWidth; }
+    void setEqualColumnWidth( bool s ) { mEqualColumnWidth = s;}
+
     void setComposerMap( const QgsComposerMap* map );
-    const QgsComposerMap* composerMap() const { return mComposerMap; }
+    const QgsComposerMap* composerMap() const { return mComposerMap;}
 
     /**Updates the model and all legend entries*/
     void updateLegend();
@@ -129,6 +144,8 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
 
     /**Space between item box and contents*/
     double mBoxSpace;
+    /**Space between columns*/
+    double mColumnSpace;
     /**Vertical space between group entries*/
     double mGroupSpace;
     /**Vertical space between layer entries*/
@@ -145,28 +162,77 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     /** Spacing between lines when wrapped */
     double mlineSpacing;
 
+    /** Number of legend columns */
+    int mColumnCount;
+
     QgsLegendModel mLegendModel;
 
     /**Reference to map (because symbols are sometimes in map units)*/
     const QgsComposerMap* mComposerMap;
 
+    /** Allow splitting layers into multiple columns */
+    bool mSplitLayer;
+
+    /** Use the same width (maximum) for all columns */
+    bool mEqualColumnWidth;
 
   private:
+    /** Nucleon is either group title, layer title or layer child item.
+     *  Nucleon is similar to QgsComposerLegendItem but it does not have
+     *  the same hierarchy. E.g. layer title nucleon is just title, it does not
+     *  include all layer subitems, the same with groups.
+     */
+    class Nucleon
+    {
+      public:
+        QgsComposerLegendItem* item;
+        // Symbol size size without any space around for symbol item
+        QSizeF symbolSize;
+        // Label size without any space around for symbol item
+        QSizeF labelSize;
+        QSizeF size;
+        // Offset of symbol label, this offset is the same for all symbol labels
+        // of the same layer in the same column
+        double labelXOffset;
+    };
+
+    /** Atom is indivisible set (indivisible into more columns). It may consists
+     *  of one or more Nucleon, depending on layer splitting mode:
+     *  1) no layer split: [group_title ...] layer_title layer_item [layer_item ...]
+     *  2) layer split:    [group_title ...] layer_title layer_item
+     *              or:    layer_item
+     *  It means that group titles must not be split from layer title and layer title
+     *  must not be split from first item, because it would look bad and it would not
+     *  be readable to leave group or layer title at the bottom of column.
+     */
+    class Atom
+    {
+      public:
+        Atom(): size( QSizeF( 0, 0 ) ), column( 0 ) {}
+        QList nucleons;
+        // Atom size including nucleons interspaces but without any space around atom.
+        QSizeF size;
+        int column;
+    };
+
+    /** Create list of atoms according to current layer splitting mode */
+    QList createAtomList( QStandardItem* rootItem, bool splitLayer );
+
+    /** Divide atoms to columns and set columns on atoms */
+    void setColumns( QList& atomList );
+
     QgsComposerLegend(); //forbidden
 
-    /**Draws a group item and all subitems*/
-    void drawGroupItem( QPainter* p, QgsComposerGroupItem* groupItem, double& currentYCoord, double& maxXCoord );
+    QSizeF drawTitle( QPainter* painter = 0, QPointF point = QPointF(), Qt::AlignmentFlag halignement = Qt::AlignLeft );
+
+    /**Draws a group item and all subitems
+     * Returns list of sizes of layers and groups including this group.
+     */
+    QSizeF drawGroupItemTitle( QgsComposerGroupItem* groupItem, QPainter* painter = 0, QPointF point = QPointF() );
     /**Draws a layer item and all subitems*/
-    void drawLayerItem( QPainter* p, QgsComposerLayerItem* layerItem, double& currentYCoord, double& maxXCoord );
+    QSizeF drawLayerItemTitle( QgsComposerLayerItem* layerItem, QPainter* painter = 0, QPointF point = QPointF() );
 
-    /**Draws child items of a layer item
-       @param p painter
-       @param layerItem parent model item (layer)
-       @param currentYCoord in/out: current y position of legend item
-       @param maxXCoord in/out: maximum x-coordinate of the whole legend
-       @param layerOpacity opacity of the corresponding map layer
-    */
-    void drawLayerChildItems( QPainter* p, QStandardItem* layerItem, double& currentYCoord, double& maxXCoord, int layerOpacity = 255 );
+    Nucleon drawSymbolItem( QgsComposerLegendItem* symbolItem, QPainter* painter = 0, QPointF point = QPointF(), double labelXOffset = 0. );
 
     /**Draws a symbol at the current y position and returns the new x position. Returns real symbol height, because for points,
      it is possible that it differs from mSymbolHeight*/
@@ -176,10 +242,13 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
     void drawLineSymbol( QPainter*, QgsSymbol* s, double currentYCoord, double& currentXPosition, int opacity = 255 ) const;
     void drawPolygonSymbol( QPainter* p, QgsSymbol* s, double currentYCoord, double& currentXPosition, int opacity = 255 ) const;
 
+    void drawAtom( Atom atom, QPainter* painter = 0, QPointF point = QPointF() );
+
+    double spaceAboveAtom( Atom atom );
+
     /**Helper function that lists ids of layers contained in map canvas*/
     QStringList layerIdList() const;
 
-  private:
     /** Splits a string using the wrap char taking into account handling empty
       wrap char which means no wrapping */
     QStringList splitStringForWrapping( QString stringToSplt );
diff --git a/src/core/composer/qgscomposerlegenditem.cpp b/src/core/composer/qgscomposerlegenditem.cpp
index b4bd143b7190..10c12bc36bed 100644
--- a/src/core/composer/qgscomposerlegenditem.cpp
+++ b/src/core/composer/qgscomposerlegenditem.cpp
@@ -288,10 +288,12 @@ void QgsComposerRasterSymbolItem::readXML( const QDomElement& itemElem, bool xSe
 ////////////////////QgsComposerLayerItem
 
 QgsComposerLayerItem::QgsComposerLayerItem(): QgsComposerLegendItem()
+    , mShowFeatureCount( false )
 {
 }
 
 QgsComposerLayerItem::QgsComposerLayerItem( const QString& text ): QgsComposerLegendItem( text )
+    , mShowFeatureCount( false )
 {
 }
 
@@ -312,6 +314,7 @@ void QgsComposerLayerItem::writeXML( QDomElement& elem, QDomDocument& doc ) cons
   QDomElement layerItemElem = doc.createElement( "LayerItem" );
   layerItemElem.setAttribute( "layerId", mLayerID );
   layerItemElem.setAttribute( "text", text() );
+  layerItemElem.setAttribute( "showFeatureCount", showFeatureCount() );
   writeXMLChildren( layerItemElem, doc );
   elem.appendChild( layerItemElem );
 }
@@ -324,6 +327,7 @@ void QgsComposerLayerItem::readXML( const QDomElement& itemElem, bool xServerAva
   }
   setText( itemElem.attribute( "text", "" ) );
   setLayerID( itemElem.attribute( "layerId", "" ) );
+  setShowFeatureCount( itemElem.attribute( "showFeatureCount", "" ) == "1" ? true : false );
 
   //now call readXML for all the child items
   QDomNodeList childList = itemElem.childNodes();
diff --git a/src/core/composer/qgscomposerlegenditem.h b/src/core/composer/qgscomposerlegenditem.h
index 7a087d74b3cd..c071fdd5df0a 100644
--- a/src/core/composer/qgscomposerlegenditem.h
+++ b/src/core/composer/qgscomposerlegenditem.h
@@ -148,8 +148,13 @@ class CORE_EXPORT QgsComposerLayerItem: public QgsComposerLegendItem
     void setLayerID( const QString& id ) { mLayerID = id; }
     QString layerID() const { return mLayerID; }
 
+    void setShowFeatureCount( bool show ) { mShowFeatureCount = show; }
+    bool showFeatureCount() const { return mShowFeatureCount; }
+
   private:
     QString mLayerID;
+    // Show vector feature counts
+    bool mShowFeatureCount;
 };
 
 class CORE_EXPORT QgsComposerGroupItem: public QgsComposerLegendItem
diff --git a/src/core/composer/qgscomposermap.cpp b/src/core/composer/qgscomposermap.cpp
index 8d112d621b8f..d380575920a3 100644
--- a/src/core/composer/qgscomposermap.cpp
+++ b/src/core/composer/qgscomposermap.cpp
@@ -39,16 +39,18 @@
 
 QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int width, int height )
     : QgsComposerItem( x, y, width, height, composition ), mKeepLayerSet( false ),
-      mOverviewFrameMapId( -1 ), mGridEnabled( false ), mGridStyle( Solid ),
+    mOverviewFrameMapId( -1 ), mGridEnabled( false ), mGridStyle( Solid ),
     mGridIntervalX( 0.0 ), mGridIntervalY( 0.0 ), mGridOffsetX( 0.0 ), mGridOffsetY( 0.0 ), mGridAnnotationPrecision( 3 ), mShowGridAnnotation( false ),
     mLeftGridAnnotationPosition( OutsideMapFrame ), mRightGridAnnotationPosition( OutsideMapFrame ), mTopGridAnnotationPosition( OutsideMapFrame ),
     mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ),
     mTopGridAnnotationDirection( Horizontal ), mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 ),
-      mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true )
+    mCrossLength( 3 ), mMapCanvas( 0 ), mDrawCanvasItems( true )
 {
   mComposition = composition;
   mOverviewFrameMapSymbol = 0;
+  mGridLineSymbol = 0;
   createDefaultOverviewFrameSymbol();
+  createDefaultGridLineSymbol();
 
   mId = 0;
   assignFreeId();
@@ -74,7 +76,6 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition, int x, int y, int w
   }
   setSceneRect( QRectF( x, y, width, height ) );
   setToolTip( tr( "Map %1" ).arg( mId ) );
-  mGridPen.setCapStyle( Qt::FlatCap );
 
   initGridAnnotationFormatFromProject();
 }
@@ -85,9 +86,10 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition )
     mLeftGridAnnotationPosition( OutsideMapFrame ), mRightGridAnnotationPosition( OutsideMapFrame ), mTopGridAnnotationPosition( OutsideMapFrame ),
     mBottomGridAnnotationPosition( OutsideMapFrame ), mAnnotationFrameDistance( 1.0 ), mLeftGridAnnotationDirection( Horizontal ), mRightGridAnnotationDirection( Horizontal ),
     mTopGridAnnotationDirection( Horizontal ), mBottomGridAnnotationDirection( Horizontal ), mGridFrameStyle( NoGridFrame ), mGridFrameWidth( 2.0 ), mCrossLength( 3 ),
-      mMapCanvas( 0 ), mDrawCanvasItems( true )
+    mMapCanvas( 0 ), mDrawCanvasItems( true )
 {
   mOverviewFrameMapSymbol = 0;
+  mGridLineSymbol = 0;
   createDefaultOverviewFrameSymbol();
 
   //Offset
@@ -103,7 +105,6 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition )
   mCurrentRectangle = rect();
 
   setToolTip( tr( "Map %1" ).arg( mId ) );
-  mGridPen.setCapStyle( Qt::FlatCap );
 
   initGridAnnotationFormatFromProject();
 }
@@ -111,6 +112,7 @@ QgsComposerMap::QgsComposerMap( QgsComposition *composition )
 QgsComposerMap::~QgsComposerMap()
 {
   delete mOverviewFrameMapSymbol;
+  delete mGridLineSymbol;
 }
 
 void QgsComposerMap::draw( QPainter *painter, const QgsRectangle& extent, const QSize& size, int dpi )
@@ -702,13 +704,11 @@ bool QgsComposerMap::writeXML( QDomElement& elem, QDomDocument & doc ) const
   gridElem.setAttribute( "intervalY", QString::number( mGridIntervalY ) );
   gridElem.setAttribute( "offsetX", QString::number( mGridOffsetX ) );
   gridElem.setAttribute( "offsetY", QString::number( mGridOffsetY ) );
-  gridElem.setAttribute( "penWidth",  QString::number( mGridPen.widthF() ) );
-  gridElem.setAttribute( "penColorRed", mGridPen.color().red() );
-  gridElem.setAttribute( "penColorGreen", mGridPen.color().green() );
-  gridElem.setAttribute( "penColorBlue", mGridPen.color().blue() );
   gridElem.setAttribute( "crossLength",  QString::number( mCrossLength ) );
   gridElem.setAttribute( "gridFrameStyle", mGridFrameStyle );
   gridElem.setAttribute( "gridFrameWidth", QString::number( mGridFrameWidth ) );
+  QDomElement gridLineStyleElem = QgsSymbolLayerV2Utils::saveSymbol( QString(), mGridLineSymbol, doc );
+  gridElem.appendChild( gridLineStyleElem );
 
   //grid annotation
   QDomElement annotationElem = doc.createElement( "Annotation" );
@@ -838,14 +838,26 @@ bool QgsComposerMap::readXML( const QDomElement& itemElem, const QDomDocument& d
     mGridIntervalY = gridElem.attribute( "intervalY", "0" ).toDouble();
     mGridOffsetX = gridElem.attribute( "offsetX", "0" ).toDouble();
     mGridOffsetY = gridElem.attribute( "offsetY", "0" ).toDouble();
-    mGridPen.setWidthF( gridElem.attribute( "penWidth", "0" ).toDouble() );
-    mGridPen.setColor( QColor( gridElem.attribute( "penColorRed", "0" ).toInt(),
-                               gridElem.attribute( "penColorGreen", "0" ).toInt(),
-                               gridElem.attribute( "penColorBlue", "0" ).toInt() ) );
     mCrossLength = gridElem.attribute( "crossLength", "3" ).toDouble();
     mGridFrameStyle = ( QgsComposerMap::GridFrameStyle )gridElem.attribute( "gridFrameStyle", "0" ).toInt();
     mGridFrameWidth = gridElem.attribute( "gridFrameWidth", "2.0" ).toDouble();
 
+    QDomElement gridSymbolElem = gridElem.firstChildElement( "symbol" );
+    delete mGridLineSymbol;
+    if ( gridSymbolElem.isNull( ) )
+    {
+      //old project file, read penWidth /penColorRed, penColorGreen, penColorBlue
+      mGridLineSymbol = QgsLineSymbolV2::createSimple( QgsStringMap() );
+      mGridLineSymbol->setWidth( gridElem.attribute( "penWidth", "0" ).toDouble() );
+      mGridLineSymbol->setColor( QColor( gridElem.attribute( "penColorRed", "0" ).toInt(),
+                                         gridElem.attribute( "penColorGreen", "0" ).toInt(),
+                                         gridElem.attribute( "penColorBlue", "0" ).toInt() ) );
+    }
+    else
+    {
+      mGridLineSymbol = dynamic_cast( QgsSymbolLayerV2Utils::loadSymbol( gridSymbolElem ) );
+    }
+
     QDomNodeList annotationNodeList = gridElem.elementsByTagName( "Annotation" );
     if ( annotationNodeList.size() > 0 )
     {
@@ -916,8 +928,6 @@ void QgsComposerMap::syncLayerSet()
 
 void QgsComposerMap::drawGrid( QPainter* p )
 {
-  p->setPen( mGridPen );
-
   QList< QPair< double, QLineF > > verticalLines;
   yGridLines( verticalLines );
   QList< QPair< double, QLineF > >::const_iterator vIt = verticalLines.constBegin();
@@ -933,12 +943,12 @@ void QgsComposerMap::drawGrid( QPainter* p )
   {
     for ( ; vIt != verticalLines.constEnd(); ++vIt )
     {
-      p->drawLine( vIt->second );
+      drawGridLine( vIt->second, p );
     }
 
     for ( ; hIt != horizontalLines.constEnd(); ++hIt )
     {
-      p->drawLine( hIt->second );
+      drawGridLine( hIt->second, p );
     }
   }
   else //cross
@@ -948,7 +958,7 @@ void QgsComposerMap::drawGrid( QPainter* p )
     {
       //start mark
       crossEnd1 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( vIt->second.p1(), vIt->second.p2(), mCrossLength );
-      p->drawLine( vIt->second.p1(), crossEnd1 );
+      drawGridLine( QLineF( vIt->second.p1(), crossEnd1 ), p );
 
       //test for intersection with every horizontal line
       hIt = horizontalLines.constBegin();
@@ -958,12 +968,12 @@ void QgsComposerMap::drawGrid( QPainter* p )
         {
           crossEnd1 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, vIt->second.p1(), mCrossLength );
           crossEnd2 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, vIt->second.p2(), mCrossLength );
-          p->drawLine( crossEnd1, crossEnd2 );
+          drawGridLine( QLineF( crossEnd1, crossEnd2 ), p );
         }
       }
       //end mark
       QPointF crossEnd2 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( vIt->second.p2(), vIt->second.p1(), mCrossLength );
-      p->drawLine( vIt->second.p2(), crossEnd2 );
+      drawGridLine( QLineF( vIt->second.p2(), crossEnd2 ), p );
     }
 
     hIt = horizontalLines.constBegin();
@@ -971,7 +981,7 @@ void QgsComposerMap::drawGrid( QPainter* p )
     {
       //start mark
       crossEnd1 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( hIt->second.p1(), hIt->second.p2(), mCrossLength );
-      p->drawLine( hIt->second.p1(), crossEnd1 );
+      drawGridLine( QLineF( hIt->second.p1(), crossEnd1 ), p );
 
       vIt = verticalLines.constBegin();
       for ( ; vIt != verticalLines.constEnd(); ++vIt )
@@ -980,15 +990,13 @@ void QgsComposerMap::drawGrid( QPainter* p )
         {
           crossEnd1 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, hIt->second.p1(), mCrossLength );
           crossEnd2 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( intersectionPoint, hIt->second.p2(), mCrossLength );
-          p->drawLine( crossEnd1, crossEnd2 );
+          drawGridLine( QLineF( crossEnd1, crossEnd2 ), p );
         }
       }
       //end mark
       crossEnd1 = QgsSymbolLayerV2Utils::pointOnLineWithDistance( hIt->second.p2(), hIt->second.p1(), mCrossLength );
-      p->drawLine( hIt->second.p2(), crossEnd1 );
+      drawGridLine( QLineF( hIt->second.p2(), crossEnd1 ), p );
     }
-
-
   }
 
   p->setClipRect( thisPaintRect , Qt::NoClip );
@@ -1020,6 +1028,33 @@ void QgsComposerMap::drawGridFrame( QPainter* p, const QList< QPair< double, QLi
   drawGridFrameBorder( p, bottomGridFrame, QgsComposerMap::Bottom );
 }
 
+void QgsComposerMap::drawGridLine( const QLineF& line, QPainter* p )
+{
+  if ( !mGridLineSymbol || !p )
+  {
+    return;
+  }
+
+  //setup render context
+  QgsRenderContext context;
+  context.setPainter( p );
+  if ( mPreviewMode == Rectangle )
+  {
+    return;
+  }
+  else
+  {
+    context.setScaleFactor( 1.0 );
+    context.setRasterScaleFactor( mComposition->printResolution() / 25.4 );
+  }
+
+  QPolygonF poly;
+  poly << line.p1() << line.p2();
+  mGridLineSymbol->startRender( context );
+  mGridLineSymbol->renderPolyline( poly, 0, context );
+  mGridLineSymbol->stopRender( context );
+}
+
 void QgsComposerMap::drawGridFrameBorder( QPainter* p, const QMap< double, double >& borderPos, Border border )
 {
   double currentCoord = - mGridFrameWidth;
@@ -1433,12 +1468,36 @@ int QgsComposerMap::yGridLines( QList< QPair< double, QLineF > >& lines ) const
 
 void QgsComposerMap::setGridPenWidth( double w )
 {
-  mGridPen.setWidthF( w );
+  if ( mGridLineSymbol )
+  {
+    mGridLineSymbol->setWidth( w );
+  }
 }
 
 void QgsComposerMap::setGridPenColor( const QColor& c )
 {
-  mGridPen.setColor( c );
+  if ( mGridLineSymbol )
+  {
+    mGridLineSymbol->setColor( c );
+  }
+}
+
+void QgsComposerMap::setGridPen( const QPen& p )
+{
+  setGridPenWidth( p.widthF() );
+  setGridPenColor( p.color() );
+}
+
+QPen QgsComposerMap::gridPen() const
+{
+  QPen p;
+  if ( mGridLineSymbol )
+  {
+    p.setWidthF( mGridLineSymbol->width() );
+    p.setColor( mGridLineSymbol->color() );
+    p.setCapStyle( Qt::FlatCap );
+  }
+  return p;
 }
 
 QRectF QgsComposerMap::boundingRect() const
@@ -1627,6 +1686,12 @@ void QgsComposerMap::setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol )
   mOverviewFrameMapSymbol = symbol;
 }
 
+void QgsComposerMap::setGridLineSymbol( QgsLineSymbolV2* symbol )
+{
+  delete mGridLineSymbol;
+  mGridLineSymbol = symbol;
+}
+
 void QgsComposerMap::transformShift( double& xShift, double& yShift ) const
 {
   double mmToMapUnits = 1.0 / mapUnitsToMM();
@@ -1989,6 +2054,16 @@ void QgsComposerMap::createDefaultOverviewFrameSymbol()
   mOverviewFrameMapSymbol->setAlpha( 0.3 );
 }
 
+void QgsComposerMap::createDefaultGridLineSymbol()
+{
+  delete mGridLineSymbol;
+  QgsStringMap properties;
+  properties.insert( "color", "0,0,0,255" );
+  properties.insert( "width", "0.3" );
+  properties.insert( "capstyle", "flat" );
+  mGridLineSymbol = QgsLineSymbolV2::createSimple( properties );
+}
+
 void QgsComposerMap::initGridAnnotationFormatFromProject()
 {
   QString format = QgsProject::instance()->readEntry( "PositionPrecision", "/DegreeFormat", "D" );
diff --git a/src/core/composer/qgscomposermap.h b/src/core/composer/qgscomposermap.h
index bb430e0957d6..595636bd6a03 100644
--- a/src/core/composer/qgscomposermap.h
+++ b/src/core/composer/qgscomposermap.h
@@ -30,6 +30,7 @@ class QDomDocument;
 class QGraphicsView;
 class QPainter;
 class QgsFillSymbolV2;
+class QgsLineSymbolV2;
 class QgsVectorLayer;
 
 /** \ingroup MapComposer
@@ -228,8 +229,8 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
 
     /**Sets the pen to draw composer grid
     @note this function was added in version 1.4*/
-    void setGridPen( const QPen& p ) { mGridPen = p; }
-    QPen gridPen() const { return mGridPen; }
+    void setGridPen( const QPen& p );
+    QPen gridPen() const;
 
     /**Sets with of grid pen
     @note this function was added in version 1.4*/
@@ -313,6 +314,9 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol );
     QgsFillSymbolV2* overviewFrameMapSymbol() { return mOverviewFrameMapSymbol; }
 
+    void setGridLineSymbol( QgsLineSymbolV2* symbol );
+    QgsLineSymbolV2* gridLineSymbol() { return mGridLineSymbol; }
+
     /**Sets mId to a number not yet used in the composition. mId is kept if it is not in use.
         Usually, this function is called before adding the composer map to the composition*/
     void assignFreeId();
@@ -377,6 +381,7 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     int mOverviewFrameMapId;
     /**Drawing style for overview farme*/
     QgsFillSymbolV2* mOverviewFrameMapSymbol;
+    QgsLineSymbolV2* mGridLineSymbol;
 
     /**Establishes signal/slot connection for update in case of layer change*/
     void connectUpdateSlot();
@@ -396,8 +401,6 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     double mGridOffsetX;
     /**Grid line offset in y-direction*/
     double mGridOffsetY;
-    /**Grid line pen*/
-    QPen mGridPen;
     /**Font for grid line annotation*/
     QFont mGridAnnotationFont;
     /**Digits after the dot*/
@@ -487,8 +490,10 @@ class CORE_EXPORT QgsComposerMap : public QgsComposerItem
     void sortGridLinesOnBorders( const QList< QPair< double, QLineF > >& hLines, const QList< QPair< double, QLineF > >& vLines,  QMap< double, double >& leftFrameEntries,
                                  QMap< double, double >& rightFrameEntries, QMap< double, double >& topFrameEntries, QMap< double, double >& bottomFrameEntries ) const;
     void drawGridFrameBorder( QPainter* p, const QMap< double, double >& borderPos, Border border );
+    void drawGridLine( const QLineF& line, QPainter* p );
     void drawOverviewMapExtent( QPainter* p );
     void createDefaultOverviewFrameSymbol();
+    void createDefaultGridLineSymbol();
     void initGridAnnotationFormatFromProject();
 };
 
diff --git a/src/core/composer/qgscomposerscalebar.cpp b/src/core/composer/qgscomposerscalebar.cpp
index 8ce1ef8eced1..37eb7275f687 100644
--- a/src/core/composer/qgscomposerscalebar.cpp
+++ b/src/core/composer/qgscomposerscalebar.cpp
@@ -24,6 +24,7 @@
 #include "qgssingleboxscalebarstyle.h"
 #include "qgsticksscalebarstyle.h"
 #include "qgsrectangle.h"
+#include "qgsproject.h"
 #include 
 #include 
 #include 
@@ -189,8 +190,8 @@ double QgsComposerScaleBar::mapWidth() const
     QgsDistanceArea da;
     da.setEllipsoidalMode( mComposerMap->mapRenderer()->hasCrsTransformEnabled() );
     da.setSourceCrs( mComposerMap->mapRenderer()->destinationCrs().srsid() );
-    QSettings s;
-    da.setEllipsoid( s.value( "/qgis/measure/ellipsoid", "WGS84" ).toString() );
+    da.setEllipsoid( QgsProject::instance()->readEntry( "Measure", "/Ellipsoid", "WGS84" ) );
+
     double measure = da.measureLine( QgsPoint( composerMapRect.xMinimum(), composerMapRect.yMinimum() ), QgsPoint( composerMapRect.xMaximum(), composerMapRect.yMinimum() ) );
     if ( mUnits == Feet )
     {
diff --git a/src/core/composer/qgslegendmodel.cpp b/src/core/composer/qgslegendmodel.cpp
index cc449bb521d6..2a14f9546619 100644
--- a/src/core/composer/qgslegendmodel.cpp
+++ b/src/core/composer/qgslegendmodel.cpp
@@ -131,12 +131,15 @@ QStandardItem* QgsLegendModel::addGroup( QString text, int position )
   {
     invisibleRootItem()->insertRow( position, groupItem );
   }
+  emit layersChanged();
   return groupItem;
 }
 
 int QgsLegendModel::addVectorLayerItemsV2( QStandardItem* layerItem, QgsVectorLayer* vlayer )
 {
-  if ( !layerItem || !vlayer )
+  QgsComposerLayerItem* lItem = dynamic_cast( layerItem );
+
+  if ( !layerItem || !lItem || !vlayer )
   {
     return 1;
   }
@@ -147,11 +150,24 @@ int QgsLegendModel::addVectorLayerItemsV2( QStandardItem* layerItem, QgsVectorLa
     return 2;
   }
 
+  if ( lItem->showFeatureCount() )
+  {
+    if ( !vlayer->countSymbolFeatures() )
+    {
+      QgsDebugMsg( "Cannot get feature counts" );
+    }
+  }
+
   QgsLegendSymbolList lst = renderer->legendSymbolItems();
   QgsLegendSymbolList::const_iterator symbolIt = lst.constBegin();
   for ( ; symbolIt != lst.constEnd(); ++symbolIt )
   {
-    QgsComposerSymbolV2Item* currentSymbolItem = new QgsComposerSymbolV2Item( symbolIt->first );
+    QString label = symbolIt->first;
+    if ( lItem->showFeatureCount() )
+    {
+      label += QString( " [%1]" ).arg( vlayer->featureCount( symbolIt->second ) );
+    }
+    QgsComposerSymbolV2Item* currentSymbolItem = new QgsComposerSymbolV2Item( label );
     currentSymbolItem->setFlags( Qt::ItemIsEnabled | Qt::ItemIsSelectable );
     if ( symbolIt->second )
     {
@@ -282,6 +298,7 @@ void QgsLegendModel::updateItem( QStandardItem* item )
 
 void QgsLegendModel::updateLayer( QStandardItem* layerItem )
 {
+  QgsDebugMsg( "Entered." );
   QgsComposerLayerItem* lItem = dynamic_cast( layerItem );
   if ( lItem )
   {
@@ -295,10 +312,16 @@ void QgsLegendModel::updateLayer( QStandardItem* layerItem )
         lItem->removeRow( i );
       }
 
+      QgsVectorLayer* vLayer = qobject_cast( mapLayer );
+
       //set layer name as item text
-      layerItem->setText( mapLayer->name() );
+      QString label = mapLayer->name();
+      if ( vLayer && lItem->showFeatureCount() )
+      {
+        label += QString( " [%1]" ).arg( vLayer->featureCount() );
+      }
+      layerItem->setText( label );
 
-      QgsVectorLayer* vLayer = qobject_cast( mapLayer );
       if ( vLayer )
       {
         if ( vLayer->isUsingRendererV2() )
diff --git a/src/core/gps/parser.h b/src/core/gps/parser.h
index ea7ab8f7f18c..4e06727a3b72 100644
--- a/src/core/gps/parser.h
+++ b/src/core/gps/parser.h
@@ -1,4 +1,4 @@
-/* 
+/*
 * Copyright Tim (xtimor@gmail.com)
 *
 * NMEA library is free software; you can redistribute it and/or modify
diff --git a/src/core/pal/feature.cpp b/src/core/pal/feature.cpp
index db71cf6f92c2..904df06a09f8 100644
--- a/src/core/pal/feature.cpp
+++ b/src/core/pal/feature.cpp
@@ -63,7 +63,7 @@ namespace pal
 {
   Feature::Feature( Layer* l, const char* geom_id, PalGeometry* userG, double lx, double ly )
       : layer( l ), userGeom( userG ), label_x( lx ), label_y( ly ), distlabel( 0 ), labelInfo( NULL ), fixedPos( false ),
-      quadOffset( false ), offsetPos( false ), fixedRotation( false )
+      quadOffset( false ), offsetPos( false ), fixedRotation( false ), alwaysShow( false )
   {
     uid = new char[strlen( geom_id ) +1];
     strcpy( uid, geom_id );
@@ -837,7 +837,10 @@ namespace pal
       // normalise between -180 and 180
       while ( angle_delta > M_PI ) angle_delta -= 2 * M_PI;
       while ( angle_delta < -M_PI ) angle_delta += 2 * M_PI;
-      if ( f->labelInfo->max_char_angle_delta > 0 && fabs( angle_delta ) > f->labelInfo->max_char_angle_delta*( M_PI / 180 ) )
+      if (( f->labelInfo->max_char_angle_inside > 0 && angle_delta > 0
+            && angle_delta > f->labelInfo->max_char_angle_inside*( M_PI / 180 ) )
+          || ( f->labelInfo->max_char_angle_outside < 0 && angle_delta < 0
+               && angle_delta < f->labelInfo->max_char_angle_outside*( M_PI / 180 ) ) )
       {
         delete slp;
         return NULL;
diff --git a/src/core/pal/feature.h b/src/core/pal/feature.h
index dee984f3cb93..7f3cc4560afa 100644
--- a/src/core/pal/feature.h
+++ b/src/core/pal/feature.h
@@ -58,16 +58,19 @@ namespace pal
         double width;
       } CharacterInfo;
 
-      LabelInfo( int num, double height )
+      LabelInfo( int num, double height, double maxinangle = 20.0, double maxoutangle = -20.0 )
       {
-        max_char_angle_delta = 20;
+        max_char_angle_inside = maxinangle;
+        // outside angle should be negative
+        max_char_angle_outside = maxoutangle > 0 ? -maxoutangle : maxoutangle;
         label_height = height;
         char_num = num;
         char_info = new CharacterInfo[num];
       }
       ~LabelInfo() { delete [] char_info; }
 
-      double max_char_angle_delta;
+      double max_char_angle_inside;
+      double max_char_angle_outside;
       double label_height;
       int char_num;
       CharacterInfo* char_info;
@@ -93,6 +96,7 @@ namespace pal
       bool fixedPosition() const { return fixedPos; }
       //Set label rotation to fixed value
       void setFixedAngle( double a ) { fixedRotation = true; fixedAngle = a; }
+      void setAlwaysShow( bool bl ) { alwaysShow = bl; }
 
     protected:
       Layer *layer;
@@ -117,6 +121,8 @@ namespace pal
       bool fixedRotation;
       double fixedAngle; //fixed angle value (in rad)
 
+      bool alwaysShow; //true is label is to always be shown (but causes overlapping)
+
       // array of parts - possibly not necessary
       //int nPart;
       //FeaturePart** parts;
@@ -279,6 +285,7 @@ namespace pal
       bool getFixedRotation() { return f->fixedRotation; }
       double getLabelAngle() { return f->fixedAngle; }
       bool getFixedPosition() { return f->fixedPos; }
+      bool getAlwaysShow() { return f->alwaysShow; }
 
       int getNumSelfObstacles() const { return nbHoles; }
       PointSet* getSelfObstacle( int i ) { return holes[i]; }
diff --git a/src/core/pal/layer.cpp b/src/core/pal/layer.cpp
index cc0c9ab2b457..52229078c04e 100644
--- a/src/core/pal/layer.cpp
+++ b/src/core/pal/layer.cpp
@@ -228,7 +228,7 @@ namespace pal
 
   bool Layer::registerFeature( const char *geom_id, PalGeometry *userGeom, double label_x, double label_y, const char* labelText,
                                double labelPosX, double labelPosY, bool fixedPos, double angle, bool fixedAngle,
-                               int xQuadOffset, int yQuadOffset, double xOffset, double yOffset )
+                               int xQuadOffset, int yQuadOffset, double xOffset, double yOffset, bool alwaysShow )
   {
     if ( !geom_id || label_x < 0 || label_y < 0 )
       return false;
@@ -269,6 +269,8 @@ namespace pal
       f->setFixedAngle( angle );
     }
 
+    f->setAlwaysShow( alwaysShow );
+
     bool first_feat = true;
 
     double geom_size = -1, biggest_size = -1;
diff --git a/src/core/pal/layer.h b/src/core/pal/layer.h
index c6e60e43ade5..c4518deae968 100644
--- a/src/core/pal/layer.h
+++ b/src/core/pal/layer.h
@@ -301,14 +301,23 @@ namespace pal
        * @param labelPosX x position of the label (in case of fixed label position)
        * @param labelPosY y position of the label (in case of fixed label position)
        * @param fixedPos true if a single fixed position for this label is needed
+       * @param angle fixed angle (in radians) to rotate the label
+       * @param fixedAngle whether to use provided fixed angle
+       * @param xQuadOffset move label to quadrant: left, don't move, right (-1, 0, 1)
+       * @param yQuadOffset move label to quadrant: down, don't move, up (-1, 0, 1)
+       * @param xOffset map unit (+/-) to x-offset the label
+       * @param yOffset map unit (+/-) to y-offset the label
+       * @param alwaysShow whether to skip priority and always show the label (causes overlapping)
        *
        * @throws PalException::FeatureExists
        *
        * @return true on success (i.e. valid geometry)
        */
       bool registerFeature( const char *geom_id, PalGeometry *userGeom, double label_x = -1, double label_y = -1,
-                            const char* labelText = NULL, double labelPosX = 0.0, double labelPosY = 0.0, bool fixedPos = false, double angle = 0.0, bool fixedAngle = false,
-                            int xQuadOffset = 0, int yQuadOffset = 0, double xOffset = 0.0, double yOffset = 0.0 );
+                            const char* labelText = NULL, double labelPosX = 0.0, double labelPosY = 0.0,
+                            bool fixedPos = false, double angle = 0.0, bool fixedAngle = false,
+                            int xQuadOffset = 0, int yQuadOffset = 0, double xOffset = 0.0, double yOffset = 0.0,
+                            bool alwaysShow = false );
 
       /** return pointer to feature or NULL if doesn't exist */
       Feature* getFeature( const char* geom_id );
diff --git a/src/core/pal/problem.cpp b/src/core/pal/problem.cpp
index 8706d37194c9..aa719e3a7337 100644
--- a/src/core/pal/problem.cpp
+++ b/src/core/pal/problem.cpp
@@ -2961,7 +2961,9 @@ namespace pal
       {
         solList->push_back( labelpositions[sol->s[i]] ); // active labels
       }
-      else if ( returnInactive || labelpositions[featStartId[i]]->getFeaturePart()->getLayer()->getDisplayAll() )
+      else if ( returnInactive
+                || labelpositions[featStartId[i]]->getFeaturePart()->getLayer()->getDisplayAll()
+                || labelpositions[featStartId[i]]->getFeaturePart()->getAlwaysShow() )
       {
         solList->push_back( labelpositions[featStartId[i]] ); // unplaced label
       }
diff --git a/src/core/pal/rtree.hpp b/src/core/pal/rtree.hpp
index b001636e73ee..92bd8f8b1998 100644
--- a/src/core/pal/rtree.hpp
+++ b/src/core/pal/rtree.hpp
@@ -4,6 +4,7 @@
  * from http://www.superliminal.com/
  *
  * LICENSE : Entirely free for all uses. Enjoy!
+ * This File is in the public domain
  *
  * AUTORS
  *    - 1983 Original algorithm and test code by Antonin Guttman and Michael Stonebraker, UC Berkely
diff --git a/src/core/qgis.cpp b/src/core/qgis.cpp
index 7a07cd81494c..5f40481b42d5 100644
--- a/src/core/qgis.cpp
+++ b/src/core/qgis.cpp
@@ -20,6 +20,9 @@
 #include "qgsversion.h"
 #endif
 #include 
+#include 
+#include 
+#include 
 #include "qgsconfig.h"
 #include "qgslogger.h"
 
@@ -140,3 +143,36 @@ void QgsFree( void *ptr )
 {
   free( ptr );
 }
+
+bool qgsVariantLessThan( const QVariant& lhs, const QVariant& rhs )
+{
+  switch ( lhs.type() )
+  {
+    case QVariant::Int:
+      return lhs.toInt() < rhs.toInt();
+    case QVariant::UInt:
+      return lhs.toUInt() < rhs.toUInt();
+    case QVariant::LongLong:
+      return lhs.toLongLong() < rhs.toLongLong();
+    case QVariant::ULongLong:
+      return lhs.toULongLong() < rhs.toULongLong();
+    case QVariant::Double:
+      return lhs.toDouble() < rhs.toDouble();
+    case QVariant::Char:
+      return lhs.toChar() < rhs.toChar();
+    case QVariant::Date:
+      return lhs.toDate() < rhs.toDate();
+    case QVariant::Time:
+      return lhs.toTime() < rhs.toTime();
+    case QVariant::DateTime:
+      return lhs.toDateTime() < rhs.toDateTime();
+    default:
+      return QString::localeAwareCompare( lhs.toString(), rhs.toString() ) < 0;
+  }
+}
+
+bool qgsVariantGreaterThan( const QVariant& lhs, const QVariant& rhs )
+{
+  return ! qgsVariantLessThan( lhs, rhs );
+}
+
diff --git a/src/core/qgis.h b/src/core/qgis.h
index e78b0013dfe9..cfea676d2690 100644
--- a/src/core/qgis.h
+++ b/src/core/qgis.h
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -66,6 +67,27 @@ class CORE_EXPORT QGis
       WKBMultiPolygon25D,
     };
 
+    static WkbType flatType( WkbType type )
+    {
+      switch ( type )
+      {
+        case WKBMultiPoint:
+          return WKBPoint;
+        case WKBMultiLineString:
+          return WKBLineString;
+        case WKBMultiPolygon:
+          return WKBPolygon;
+        case WKBMultiPoint25D:
+          return WKBPoint25D;
+        case WKBMultiLineString25D:
+          return WKBLineString25D;
+        case WKBMultiPolygon25D:
+          return WKBPolygon25D;
+        default:
+          return type;
+      }
+    }
+
     enum GeometryType
     {
       Point,
@@ -173,6 +195,10 @@ inline bool doubleNearSig( double a, double b, int significantDigits = 10 )
          qRound( ar * pow( 10.0, significantDigits ) ) == qRound( br * pow( 10.0, significantDigits ) ) ;
 }
 
+bool qgsVariantLessThan( const QVariant& lhs, const QVariant& rhs );
+
+bool qgsVariantGreaterThan( const QVariant& lhs, const QVariant& rhs );
+
 /** Allocates size bytes and returns a pointer to the allocated  memory.
     Works like C malloc() but prints debug message by QgsLogger if allocation fails.
     @param size size in bytes
diff --git a/src/core/qgsapplication.cpp b/src/core/qgsapplication.cpp
index e1d595f7ae4b..1ececfd98242 100644
--- a/src/core/qgsapplication.cpp
+++ b/src/core/qgsapplication.cpp
@@ -91,7 +91,8 @@ void QgsApplication::init( QString customConfigPath )
 
   // check if QGIS is run from build directory (not the install directory)
   QFile f;
-  foreach ( QString path, QStringList() << "" << "/.." << "/bin" )
+  // "/../../.." is for Mac bundled app in build directory
+  foreach ( QString path, QStringList() << "" << "/.." << "/bin" << "/../../.." )
   {
     f.setFileName( prefixPath + path + "/path.txt" );
     if ( f.exists() )
@@ -120,6 +121,7 @@ void QgsApplication::init( QString customConfigPath )
 #else
     setPluginPath( ABISYM( mBuildOutputPath ) + "/" + QString( QGIS_PLUGIN_SUBDIR ) );
 #endif
+    setPkgDataPath( ABISYM( mBuildSourcePath ) ); // directly source path - used for: doc, resources, svg
     ABISYM( mLibraryPath ) = ABISYM( mBuildOutputPath ) + "/" + QGIS_LIB_SUBDIR + "/";
     ABISYM( mLibexecPath ) = ABISYM( mBuildOutputPath ) + "/" + QGIS_LIBEXEC_SUBDIR + "/";
   }
@@ -856,3 +858,5 @@ void QgsApplication::applyGdalSkippedDrivers()
   CPLSetConfigOption( "GDAL_SKIP", myDriverList.toUtf8() );
   GDALAllRegister(); //to update driver list and skip missing ones
 }
+
+
diff --git a/src/core/qgsbrowsermodel.cpp b/src/core/qgsbrowsermodel.cpp
index dae1a0d97044..dd95fa23e839 100644
--- a/src/core/qgsbrowsermodel.cpp
+++ b/src/core/qgsbrowsermodel.cpp
@@ -399,3 +399,19 @@ QgsDataItem *QgsBrowserModel::dataItem( const QModelIndex &idx ) const
   Q_ASSERT( !v || d );
   return d;
 }
+
+bool QgsBrowserModel::canFetchMore( const QModelIndex & parent ) const
+{
+  QgsDataItem* item = dataItem( parent );
+  // if ( item )
+  //   QgsDebugMsg( QString( "path = %1 canFetchMore = %2" ).arg( item->path() ).arg( item && ! item->isPopulated() ) );
+  return ( item && ! item->isPopulated() );
+}
+
+void QgsBrowserModel::fetchMore( const QModelIndex & parent )
+{
+  QgsDataItem* item = dataItem( parent );
+  if ( item )
+    item->populate();
+  QgsDebugMsg( "path = " + item->path() );
+}
diff --git a/src/core/qgsbrowsermodel.h b/src/core/qgsbrowsermodel.h
index 7bad6c4fa82c..1473439a70c0 100644
--- a/src/core/qgsbrowsermodel.h
+++ b/src/core/qgsbrowsermodel.h
@@ -89,7 +89,11 @@ class CORE_EXPORT QgsBrowserModel : public QAbstractItemModel
 
     void connectItem( QgsDataItem *item );
 
+    bool canFetchMore( const QModelIndex & parent ) const;
+    void fetchMore( const QModelIndex & parent );
+
   public slots:
+
     void beginInsertItems( QgsDataItem *parent, int first, int last );
     void endInsertItems();
     void beginRemoveItems( QgsDataItem *parent, int first, int last );
diff --git a/src/core/qgsdataitem.cpp b/src/core/qgsdataitem.cpp
index d8b9a30b8fee..feb8415de597 100644
--- a/src/core/qgsdataitem.cpp
+++ b/src/core/qgsdataitem.cpp
@@ -203,8 +203,8 @@ void QgsDataItem::populate()
 
 int QgsDataItem::rowCount()
 {
-  if ( !mPopulated )
-    populate();
+  // if ( !mPopulated )
+  //   populate();
   return mChildren.size();
 }
 bool QgsDataItem::hasChildren()
@@ -472,10 +472,8 @@ QVector QgsDirectoryItem::createChildren( )
     QString path = dir.absoluteFilePath( name );
     QFileInfo fileInfo( path );
 
-    QString vsiPrefix = QgsZipItem::vsiPrefix( path );
     // vsizip support was added to GDAL/OGR 1.6 but GDAL_VERSION_NUM not available here
-    if (( settings.value( "/qgis/scanZipInBrowser", QVariant( "basic" ) ).toString() != "no" ) &&
-        ( vsiPrefix == "/vsizip/" || vsiPrefix == "/vsitar/" ) )
+    //   so we assume it's available anyway
     {
       QgsDataItem * item = QgsZipItem::itemFromPath( this, path, name );
       if ( item )
@@ -857,7 +855,7 @@ QVector QgsZipItem::createChildren( )
   QString tmpPath;
   QString childPath;
   QSettings settings;
-  QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser", "basic" ).toString();
+  QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
 
   mZipFileList.clear();
 
@@ -869,14 +867,6 @@ QVector QgsZipItem::createChildren( )
     return children;
   }
 
-  // if scanZipBrowser == passthru: do not scan zip and allow to open directly with /vsizip/
-  // if ( scanZipSetting == 1 )
-  // {
-  //   mPath = "/vsizip/" + path(); // should check for extension
-  //   QgsDebugMsg( "set path to " + path() );
-  //   return children;
-  // }
-
   // first get list of files
   getZipFileList();
 
@@ -955,7 +945,7 @@ QString QgsZipItem::vsiPrefix( QString path )
 QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QString name )
 {
   QSettings settings;
-  QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser", "basic" ).toString();
+  QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
   QString vsiPath = path;
   int zipFileCount = 0;
   QStringList zipFileList;
@@ -966,21 +956,15 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QStrin
 
   QgsDebugMsgLevel( QString( "path = %1 name= %2 scanZipSetting= %3 vsiPrefix= %4" ).arg( path ).arg( name ).arg( scanZipSetting ).arg( vsiPrefix ), 3 );
 
-  // if scanZipBrowser == no: don't read the zip file
+  // don't scan if scanZipBrowser == no
   if ( scanZipSetting == "no" )
-  {
     return 0;
-  }
-  // if scanZipBrowser == passthru: do not scan zip and allow to open directly with /vsizip/
-  // else if ( scanZipSetting == 1 )
-  // {
-  //   vsizipPath = "/vsizip/" + path;
-  //   zipItem = 0;
-  // }
-  else
-  {
-    zipItem = new QgsZipItem( parent, name, path );
-  }
+
+  // don't scan if this file is not a /vsizip/ or /vsitar/ item
+  if (( vsiPrefix != "/vsizip/" && vsiPrefix != "/vsitar/" ) )
+    return 0;
+
+  zipItem = new QgsZipItem( parent, name, path );
 
   if ( zipItem )
   {
@@ -1036,7 +1020,6 @@ QgsDataItem* QgsZipItem::itemFromPath( QgsDataItem* parent, QString path, QStrin
         // try first with normal path (Passthru)
         // this is to simplify .qml handling, and without this some tests will fail
         // (e.g. testZipItemVectorTransparency(), second test)
-        // if (( scanZipSetting == 1 ) ||
         if (( mProviderNames[i] == "ogr" ) ||
             ( mProviderNames[i] == "gdal" && zipFileCount == 1 ) )
           item = dataItem( path, parent );
@@ -1059,7 +1042,7 @@ const QStringList & QgsZipItem::getZipFileList()
 
   QString tmpPath;
   QSettings settings;
-  QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser", "basic" ).toString();
+  QString scanZipSetting = settings.value( "/qgis/scanZipInBrowser2", "basic" ).toString();
 
   QgsDebugMsgLevel( QString( "path = %1 name= %2 scanZipSetting= %3 vsiPrefix= %4" ).arg( path() ).arg( name() ).arg( scanZipSetting ).arg( mVsiPrefix ), 3 );
 
diff --git a/src/core/qgsdataitem.h b/src/core/qgsdataitem.h
index cf213ae0f36b..0578d0a7858d 100644
--- a/src/core/qgsdataitem.h
+++ b/src/core/qgsdataitem.h
@@ -67,6 +67,7 @@ class CORE_EXPORT QgsDataItem : public QObject
 
     // Populate children using children vector created by createChildren()
     virtual void populate();
+    bool isPopulated() { return mPopulated; }
 
     // Insert new child using alphabetical order based on mName, emits necessary signal to model before and after, sets parent and connects signals
     // refresh - refresh populated item, emit signals to model
@@ -265,7 +266,7 @@ class CORE_EXPORT QgsErrorItem : public QgsDataItem
 
 // ---------
 
-class QgsDirectoryParamWidget : public QTreeWidget
+class CORE_EXPORT QgsDirectoryParamWidget : public QTreeWidget
 {
     Q_OBJECT
 
diff --git a/src/core/qgsdataprovider.h b/src/core/qgsdataprovider.h
index 3a6c78bca34d..5972d8d9d0a6 100644
--- a/src/core/qgsdataprovider.h
+++ b/src/core/qgsdataprovider.h
@@ -22,6 +22,7 @@
 #include 
 
 //#include "qgsdataitem.h"
+#include "qgserror.h"
 
 class QgsRectangle;
 class QgsCoordinateReferenceSystem;
@@ -290,6 +291,12 @@ class CORE_EXPORT QgsDataProvider : public QObject
     /** Current time stamp of data source */
     virtual QDateTime dataTimestamp() const { return QDateTime(); }
 
+    /** Get current status error. This error describes some principal problem
+     *  for which provider cannot work and thus is not valid. It is not last error
+     *  after accessing data by block(), identify() etc.
+     */
+    virtual QgsError error() const { return mError; }
+
   signals:
 
     /**
@@ -318,6 +325,16 @@ class CORE_EXPORT QgsDataProvider : public QObject
     * Timestamp of data in the moment when the data were loaded by provider.
     */
     QDateTime mTimestamp;
+
+    /** \brief Error */
+    QgsError mError;
+
+    /** Add error message */
+    void appendError( const QgsErrorMessage & theMessage ) { mError.append( theMessage );}
+
+    /** Set error message */
+    void setError( const QgsError & theError ) { mError = theError;}
+
   private:
 
     /**
diff --git a/src/core/qgsdatasourceuri.cpp b/src/core/qgsdatasourceuri.cpp
index ae46cda4338d..74a0d7479919 100644
--- a/src/core/qgsdatasourceuri.cpp
+++ b/src/core/qgsdatasourceuri.cpp
@@ -149,7 +149,7 @@ QgsDataSourceURI::QgsDataSourceURI( QString uri )
         {
           mWkbType = QGis::WKBMultiPoint;
         }
-        else if ( geomTypeUpper == "MULTLINESTRING" )
+        else if ( geomTypeUpper == "MULTILINESTRING" )
         {
           mWkbType = QGis::WKBMultiLineString;
         }
@@ -480,6 +480,10 @@ QString QgsDataSourceURI::connectionInfo() const
   else if ( mHost != "" )
   {
     connectionItems << "host=" + mHost;
+  }
+
+  if ( mService.isEmpty() )
+  {
     if ( mPort != "" )
       connectionItems << "port=" + mPort;
   }
diff --git a/src/core/qgserror.cpp b/src/core/qgserror.cpp
new file mode 100644
index 000000000000..b0a487a09383
--- /dev/null
+++ b/src/core/qgserror.cpp
@@ -0,0 +1,111 @@
+/***************************************************************************
+                         qgserror.cpp  -  Error container
+                             -------------------
+    begin                : October 2012
+    copyright            : (C) 2012 Radim Blazek
+    email                : radim dot blazek at gmail dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "qgis.h"
+#include "qgsversion.h"
+#include "qgsconfig.h"
+#include "qgserror.h"
+#include "qgslogger.h"
+
+#include 
+
+QgsErrorMessage::QgsErrorMessage( const QString & theMessage, const QString & theTag, const QString & theFile, const QString & theFunction, int theLine )
+    : mMessage( theMessage )
+    , mTag( theTag )
+    , mFile( theFile )
+    , mFunction( theFunction )
+    , mLine( theLine )
+    , mFormat( Text )
+{
+}
+
+QgsError::QgsError( const QString & theMessage, const QString & theTag )
+{
+  append( theMessage, theTag );
+}
+
+void QgsError::append( const QString & theMessage, const QString & theTag )
+{
+  mMessageList.append( QgsErrorMessage( theMessage, theTag ) );
+}
+
+void QgsError::append( const QgsErrorMessage & theMessage )
+{
+  mMessageList.append( theMessage );
+}
+
+QString QgsError::message( QgsErrorMessage::Format theFormat ) const
+{
+  QString str;
+
+  QString srcUrl;
+#if defined(QGISDEBUG) && defined(QGS_GIT_REMOTE_URL)
+  // TODO: verify if we are not ahead to origin (remote hash does not exist)
+  //       and there are no local not commited changes
+  QString hash = QString( QGis::QGIS_DEV_VERSION );
+  QString remote = QString( QGS_GIT_REMOTE_URL );
+  QgsDebugMsg( "remote = " + remote );
+  if ( !hash.isEmpty() && !remote.isEmpty() && remote.contains( "github.com" ) )
+  {
+    QString path = remote.remove( QRegExp( ".*github.com[:/]" ) ).remove( ".git" );
+    srcUrl = "https://github.com/" + path + "/blob/" + hash;
+  }
+#endif
+
+  foreach ( QgsErrorMessage m, mMessageList )
+  {
+#ifdef QGISDEBUG
+    QString file;
+#ifndef _MSC_VER
+    int sPrefixLength = strlen( CMAKE_SOURCE_DIR ) + 1;
+    file = m.file().mid( sPrefixLength );
+#else
+    file = m.file();
+#endif
+#endif
+
+    if ( theFormat == QgsErrorMessage::Text )
+    {
+      str += m.tag() + " " + m.message();
+#ifdef QGISDEBUG
+      str += QString( "\nat %1 : %2 : %3" ).arg( file ).arg( m.line() ).arg( m.function() );
+#endif
+    }
+    else // QgsErrorMessage::Html
+    {
+      str += "
        " + m.tag() + ": " + m.message();
+#ifdef QGISDEBUG
+      QString location = QString( "%1 : %2 : %3" ).arg( file ).arg( m.line() ).arg( m.function() );
+      if ( !srcUrl.isEmpty() )
+      {
+        QString url = QString( "%1/%2#L%3" ).arg( srcUrl ).arg( file ).arg( m.line() );
+        str += QString( "
        (%2)" ).arg( url ).arg( location );
+      }
+      else
+      {
+        str += QString( "
        (%1)" ).arg( location );
+      }
+#endif
+    }
+  }
+  return str;
+}
+
+QString QgsError::summary( ) const
+{
+  // The first message in chain is usually the real error given by backend/server
+  return mMessageList.first().message();
+}
diff --git a/src/core/qgserror.h b/src/core/qgserror.h
new file mode 100644
index 000000000000..854352fb71f1
--- /dev/null
+++ b/src/core/qgserror.h
@@ -0,0 +1,124 @@
+/***************************************************************************
+                         qgserror.h  -  Error container
+                             -------------------
+    begin                : October 2012
+    copyright            : (C) 2012 Radim Blazek
+    email                : radim dot blazek at gmail dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSERROR_H
+#define QGSERROR_H
+
+#include 
+#include 
+
+// Macro to create Error message including info about where it was created.
+#define QGS_ERROR_MESSAGE(message, tag) QgsErrorMessage(QString(message),QString(tag), QString(__FILE__), QString(__FUNCTION__), __LINE__)
+
+/** \ingroup core
+ * QgsErrorMessage represents single error message.
+*/
+class CORE_EXPORT QgsErrorMessage
+{
+  public:
+    /** Format */
+    enum Format
+    {
+      Text, // Plain text
+      Html
+    };
+
+    QgsErrorMessage() {}
+
+    /** Constructor.
+     *  @param theMessage error message string
+     *  @param theTag error label, for example GDAL, GDAL Provider, Raster layer
+     *  @param theFile the file where error was created
+     *  @param theFunction the function where error was created
+     *  @param theLine the line where error was created
+     */
+    QgsErrorMessage( const QString & theMessage, const QString & theTag = QString::null, const QString & theFile = QString::null, const QString & theFunction = QString::null, int theLine = 0 );
+
+    QString message() const { return mMessage; }
+    QString tag() const { return mTag; }
+    QString file() const { return mFile; }
+    QString function() const { return mFunction; }
+    int line() const { return mLine; }
+
+  private:
+    /** Error messages */
+    QString mMessage;
+
+    /** Short description */
+    QString mTag;
+
+    /** Detailed debug info */
+    QString mFile;
+    QString mFunction;
+    int mLine;
+
+    /* Message format */
+    Format mFormat;
+};
+
+/** \ingroup core
+ * QgsError is container for error messages (report). It may contain chain
+ * (sort of traceback) of error messages (e.g. GDAL - provider - layer).
+ * Higher level messages are appended at the end.
+*/
+class CORE_EXPORT QgsError
+{
+  public:
+
+    QgsError() {}
+
+    /** Constructor with single message.
+     *  @param theMessage error message
+     *  @param theTag short description, e.g. GDAL, Provider, Layer
+     */
+    QgsError( const QString & theMessage, const QString & theTag );
+
+    /** Append new error message.
+     *  @param theMessage error message string
+     *  @param theTag error label, for example GDAL, GDAL Provider, Raster layer
+     */
+    void append( const QString & theMessage, const QString & theTag );
+
+    /** Append new error message.
+     *  @param theMessage error message
+     */
+    void append( const QgsErrorMessage & theMessage );
+
+    /** Test if any error is set.
+     *  @return true if contains error
+     */
+    bool isEmpty() const { return mMessageList.isEmpty(); }
+
+    /** Full error messages description
+     *  @param theFormat output format
+     *  @return error report
+     */
+    QString message( QgsErrorMessage::Format theFormat = QgsErrorMessage::Html ) const;
+
+    /** Short error descriprion, usually the first error in chain, the real error.
+     *  @return error description
+     */
+    QString summary() const;
+
+    /** Clear error messages */
+    void clear() { mMessageList.clear(); }
+
+  private:
+    /** List of messages */
+    QList mMessageList;
+};
+
+#endif
diff --git a/src/core/qgsexpression.cpp b/src/core/qgsexpression.cpp
index 1a15c27c946c..cc6908764c4d 100644
--- a/src/core/qgsexpression.cpp
+++ b/src/core/qgsexpression.cpp
@@ -226,6 +226,15 @@ const char* QgsExpression::UnaryOgcOperatorText[] =
   "Not", ""
 };
 
+const char* QgsExpression::SpatialOgcOperatorText[] =
+{
+  "BBOX", "Intersects",
+  "Contians", "Crosses",
+  "Equals", "Disjoint",
+  "Overlaps", "Touches",
+  "Within"
+};
+
 ///////////////////////////////////////////////
 // functions
 
@@ -320,6 +329,14 @@ static QgsExpression::Interval getInterval( const QVariant& value, QgsExpression
 
   return QgsExpression::Interval::invalidInterVal();
 }
+static QgsGeometry getGeometry( const QVariant& value, QgsExpression* parent )
+{
+  if ( value.canConvert() )
+    return value.value();
+
+  parent->setEvalErrorString( "Cannot convert to QgsGeometry" );
+  return QgsGeometry();
+}
 
 
 // this handles also NULL values
@@ -748,6 +765,46 @@ static QVariant fcnYat( const QVariantList& values, QgsFeature* f, QgsExpression
   else
     return QVariant();
 }
+static QVariant fcnGeometry( const QVariantList& , QgsFeature* f, QgsExpression* )
+{
+  QgsGeometry* geom = f->geometry();
+  if ( geom )
+    return  QVariant::fromValue( *geom );
+  else
+    return QVariant();
+}
+static QVariant fcnGeomFromWKT( const QVariantList& values, QgsFeature*, QgsExpression* parent )
+{
+  QString wkt = getStringValue( values.at( 0 ), parent );
+  QgsGeometry* geom = QgsGeometry::fromWkt( wkt );
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  else
+    return QVariant();
+}
+static QVariant fcnGeomFromGML2( const QVariantList& values, QgsFeature*, QgsExpression* parent )
+{
+  QDomDocument doc;
+  QString errorMsg;
+  QString gml = getStringValue( values.at( 0 ), parent );
+  if ( !doc.setContent( gml, true, &errorMsg ) )
+    return QVariant();
+
+  QgsGeometry* geom = 0;
+  QDomElement elem = doc.documentElement();
+  if ( elem.tagName() == "Box" )
+  {
+    QgsRectangle* rect = new QgsRectangle( elem );
+    geom = QgsGeometry::fromRect( *rect );
+  }
+  else
+    geom = QgsGeometry::fromGML2( doc.documentElement() );
+
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  else
+    return QVariant();
+}
 
 static QVariant fcnGeomArea( const QVariantList& , QgsFeature* f, QgsExpression* parent )
 {
@@ -768,6 +825,135 @@ static QVariant fcnGeomPerimeter( const QVariantList& , QgsFeature* f, QgsExpres
   return QVariant( calc->measurePerimeter( f->geometry() ) );
 }
 
+static QVariant fcnBbox( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.intersects( sGeom.boundingBox() ) ? TVL_True : TVL_False;
+}
+static QVariant fcnDisjoint( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.disjoint( &sGeom ) ? TVL_True : TVL_False;
+}
+static QVariant fcnIntersects( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.intersects( &sGeom ) ? TVL_True : TVL_False;
+}
+static QVariant fcnTouches( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.touches( &sGeom ) ? TVL_True : TVL_False;
+}
+static QVariant fcnCrosses( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.crosses( &sGeom ) ? TVL_True : TVL_False;
+}
+static QVariant fcnContains( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.contains( &sGeom ) ? TVL_True : TVL_False;
+}
+static QVariant fcnOverlaps( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.overlaps( &sGeom ) ? TVL_True : TVL_False;
+}
+static QVariant fcnWithin( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return fGeom.within( &sGeom ) ? TVL_True : TVL_False;
+}
+static QVariant fcnBuffer( const QVariantList& values, QgsFeature*, QgsExpression* parent )
+{
+  if ( values.length() < 2 || values.length() > 3 )
+    return QVariant();
+
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  double dist = getDoubleValue( values.at( 1 ), parent );
+  int seg = 8;
+  if ( values.length() == 3 )
+    seg = getIntValue( values.at( 2 ), parent );
+
+  QgsGeometry* geom = fGeom.buffer( dist, seg );
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  return QVariant();
+}
+static QVariant fcnCentroid( const QVariantList& values, QgsFeature*, QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry* geom = fGeom.centroid();
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  return QVariant();
+}
+static QVariant fcnConvexHull( const QVariantList& values, QgsFeature*, QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry* geom = fGeom.convexHull();
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  return QVariant();
+}
+static QVariant fcnDifference( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  QgsGeometry* geom = fGeom.difference( &sGeom );
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  return QVariant();
+}
+static QVariant fcnDistance( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  return QVariant( fGeom.distance( sGeom ) );
+}
+static QVariant fcnIntersection( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  QgsGeometry* geom = fGeom.intersection( &sGeom );
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  return QVariant();
+}
+static QVariant fcnSymDifference( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  QgsGeometry* geom = fGeom.symDifference( &sGeom );
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  return QVariant();
+}
+static QVariant fcnCombine( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QgsGeometry sGeom = getGeometry( values.at( 1 ), parent );
+  QgsGeometry* geom = fGeom.combine( &sGeom );
+  if ( geom )
+    return QVariant::fromValue( *geom );
+  return QVariant();
+}
+static QVariant fcnGeomToWKT( const QVariantList& values, QgsFeature* , QgsExpression* parent )
+{
+  QgsGeometry fGeom = getGeometry( values.at( 0 ), parent );
+  QString wkt = fGeom.exportToWkt();
+  return QVariant( wkt );
+}
+
 static QVariant fcnRound( const QVariantList& values , QgsFeature *f, QgsExpression* parent )
 {
   Q_UNUSED( f );
@@ -802,7 +988,7 @@ static QVariant fcnFormatNumber( const QVariantList& values, QgsFeature*, QgsExp
 static QVariant fcnFormatDate( const QVariantList& values, QgsFeature*, QgsExpression* parent )
 {
   QDateTime dt = getDateTimeValue( values.at( 0 ), parent );
-  QString format = getStringValue( values.at( 1 ), parent );  
+  QString format = getStringValue( values.at( 1 ), parent );
   return dt.toString( format );
 }
 
@@ -812,84 +998,147 @@ static QVariant fcnSpecialColumn( const QVariantList& values, QgsFeature* /*f*/,
   return QgsExpression::specialColumn( varName );
 }
 
-QList QgsExpression::gmBuiltinFunctions;
+bool QgsExpression::registerFunction( QgsExpression::Function* function )
+{
+  int fnIdx = functionIndex( function->name() );
+  if ( fnIdx != -1 )
+  {
+    return false;
+  }
+  QgsExpression::gmFunctions.append( function );
+  return true;
+}
 
-const QList &QgsExpression::BuiltinFunctions()
+bool QgsExpression::unregisterFunction( QString name )
 {
-  if ( gmBuiltinFunctions.isEmpty() )
+  // You can never override the built in functions.
+  if ( QgsExpression::BuiltinFunctions().contains( name ) )
   {
-    // math
-    gmBuiltinFunctions
-    << FunctionDef( "sqrt", 1, fcnSqrt, QObject::tr( "Math" ) )
-    << FunctionDef( "sin", 1, fcnSin, QObject::tr( "Math" ) )
-    << FunctionDef( "cos", 1, fcnCos, QObject::tr( "Math" ) )
-    << FunctionDef( "tan", 1, fcnTan, QObject::tr( "Math" ) )
-    << FunctionDef( "asin", 1, fcnAsin, QObject::tr( "Math" ) )
-    << FunctionDef( "acos", 1, fcnAcos, QObject::tr( "Math" ) )
-    << FunctionDef( "atan", 1, fcnAtan, QObject::tr( "Math" ) )
-    << FunctionDef( "atan2", 2, fcnAtan2, QObject::tr( "Math" ) )
-    << FunctionDef( "exp", 1, fcnExp, QObject::tr( "Math" ) )
-    << FunctionDef( "ln", 1, fcnLn, QObject::tr( "Math" ) )
-    << FunctionDef( "log10", 1, fcnLog10, QObject::tr( "Math" ) )
-    << FunctionDef( "log", 2, fcnLog, QObject::tr( "Math" ) )
-    << FunctionDef( "round", -1, fcnRound, QObject::tr( "Math" ) )
-    // casts
-    << FunctionDef( "toint", 1, fcnToInt, QObject::tr( "Conversions" ) )
-    << FunctionDef( "toreal", 1, fcnToReal, QObject::tr( "Conversions" ) )
-    << FunctionDef( "tostring", 1, fcnToString, QObject::tr( "Conversions" ) )
-    << FunctionDef( "todatetime", 1, fcnToDateTime, QObject::tr( "Conversions" ) )
-    << FunctionDef( "todate", 1, fcnToDate, QObject::tr( "Conversions" ) )
-    << FunctionDef( "totime", 1, fcnToTime, QObject::tr( "Conversions" ) )
-    << FunctionDef( "tointerval", 1, fcnToInterval, QObject::tr( "Conversions" ) )
-    // conditionals
-    << FunctionDef( "coalesce", -1, fcnCoalesce, QObject::tr( "Conditionals" ) )
-    // Date and Time
-    << FunctionDef( "$now", 0, fcnNow, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "age", 2, fcnAge, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "year", 1, fcnYear, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "month", 1, fcnMonth, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "week", 1, fcnWeek, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "day", 1, fcnDay, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "hour", 1, fcnHour, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "minute", 1, fcnMinute, QObject::tr( "Date and Time" ) )
-    << FunctionDef( "second", 1, fcnSeconds, QObject::tr( "Date and Time" ) )
-    // string manipulation
-    << FunctionDef( "lower", 1, fcnLower, QObject::tr( "String" ) )
-    << FunctionDef( "upper", 1, fcnUpper, QObject::tr( "String" ) )
-    << FunctionDef( "title", 1, fcnTitle, QObject::tr( "String" ) )
-    << FunctionDef( "length", 1, fcnLength, QObject::tr( "String" ) )
-    << FunctionDef( "replace", 3, fcnReplace, QObject::tr( "String" ) )
-    << FunctionDef( "regexp_replace", 3, fcnRegexpReplace, QObject::tr( "String" ) )
-    << FunctionDef( "substr", 3, fcnSubstr, QObject::tr( "String" ) )
-    << FunctionDef( "concat", -1, fcnConcat, QObject::tr( "String" ) )
-    << FunctionDef( "strpos", 2, fcnStrpos, QObject::tr( "String" ) )
-    << FunctionDef( "left", 2, fcnLeft, QObject::tr( "String" ) )
-    << FunctionDef( "right", 2, fcnRight, QObject::tr( "String" ) )
-    << FunctionDef( "rpad", 3, fcnRPad, QObject::tr( "String" ) )
-    << FunctionDef( "lpad", 3, fcnLPad, QObject::tr( "String" ) )
-    << FunctionDef( "format_number", 2, fcnFormatNumber, QObject::tr( "String" ) )
-    << FunctionDef( "format_date", 2, fcnFormatDate, QObject::tr( "String" ) )
-
-    // geometry accessors
-    << FunctionDef( "xat", 1, fcnXat, QObject::tr( "Geometry" ), "", true )
-    << FunctionDef( "yat", 1, fcnYat, QObject::tr( "Geometry" ), "", true )
-    << FunctionDef( "$area", 0, fcnGeomArea, QObject::tr( "Geometry" ), "", true )
-    << FunctionDef( "$length", 0, fcnGeomLength, QObject::tr( "Geometry" ), "", true )
-    << FunctionDef( "$perimeter", 0, fcnGeomPerimeter, QObject::tr( "Geometry" ), "", true )
-    << FunctionDef( "$x", 0, fcnX, QObject::tr( "Geometry" ), "", true )
-    << FunctionDef( "$y", 0, fcnY, QObject::tr( "Geometry" ), "" , true )
-    // special columns
-    << FunctionDef( "$rownum", 0, fcnRowNumber, QObject::tr( "Record" ) )
-    << FunctionDef( "$id", 0, fcnFeatureId, QObject::tr( "Record" ) )
-    << FunctionDef( "$scale", 0, fcnScale, QObject::tr( "Record" ) )
-      // private functions
-    << FunctionDef( "_specialcol_", 1, fcnSpecialColumn, QObject::tr( "Special" ) )
-    ;
+    return false;
   }
+  int fnIdx = functionIndex( name );
+  if ( fnIdx != -1 )
+  {
+    QgsExpression::gmFunctions.removeAt( fnIdx );
+    return true;
+  }
+  return false;
+}
+
+QStringList QgsExpression::gmBuiltinFunctions;
 
+const QStringList &QgsExpression::BuiltinFunctions()
+{
+  if ( gmBuiltinFunctions.isEmpty() )
+  {
+    gmBuiltinFunctions << "sqrt"
+    << "sqrt" << "cos" << "sin" << "tan"
+    << "asin" << "acos" << "atan" << "atan2"
+    << "exp" << "ln" << "log10" << "log"
+    << "round" << "toint" << "toreal" << "tostring"
+    << "todatetime" << "todate" << "totime" << "tointerval"
+    << "coalesce" << "$now" << "age" << "year"
+    << "month" << "week" << "day" << "hour"
+    << "minute" << "second" << "lower" << "upper"
+    << "title" << "length" << "replace" << "regexp_replace"
+    << "substr" << "concat" << "strpos" << "left"
+    << "right" << "rpad" << "lpad" << "format_number"
+    << "format_date" << "xat" << "yat" << "$area"
+    << "$length" << "$perimeter" << "$x" << "$y"
+    << "$rownum" << "$id" << "$scale" << "_specialcol_";
+  }
   return gmBuiltinFunctions;
 }
 
+QList QgsExpression::gmFunctions;
+
+const QList &QgsExpression::Functions()
+{
+  if ( gmFunctions.isEmpty() )
+  {
+    gmFunctions
+    << new StaticFunction( "sqrt", 1, fcnSqrt, QObject::tr( "Math" ) )
+    << new StaticFunction( "cos", 1, fcnCos, QObject::tr( "Math" ) )
+    << new StaticFunction( "sin", 1, fcnSin, QObject::tr( "Math" ) )
+    << new StaticFunction( "tan", 1, fcnTan, QObject::tr( "Math" ) )
+    << new StaticFunction( "asin", 1, fcnAsin, QObject::tr( "Math" ) )
+    << new StaticFunction( "acos", 1, fcnAcos, QObject::tr( "Math" ) )
+    << new StaticFunction( "atan", 1, fcnAtan, QObject::tr( "Math" ) )
+    << new StaticFunction( "atan2", 2, fcnAtan2, QObject::tr( "Math" ) )
+    << new StaticFunction( "exp", 1, fcnExp, QObject::tr( "Math" ) )
+    << new StaticFunction( "ln", 1, fcnLn, QObject::tr( "Math" ) )
+    << new StaticFunction( "log10", 1, fcnLog10, QObject::tr( "Math" ) )
+    << new StaticFunction( "log", 2, fcnLog, QObject::tr( "Math" ) )
+    << new StaticFunction( "round", -1, fcnRound, QObject::tr( "Math" ) )
+    << new StaticFunction( "toint", 1, fcnToInt, QObject::tr( "Conversions" ) )
+    << new StaticFunction( "toreal", 1, fcnToReal, QObject::tr( "Conversions" ) )
+    << new StaticFunction( "tostring", 1, fcnToString, QObject::tr( "Conversions" ) )
+    << new StaticFunction( "todatetime", 1, fcnToDateTime, QObject::tr( "Conversions" ) )
+    << new StaticFunction( "todate", 1, fcnToDate, QObject::tr( "Conversions" ) )
+    << new StaticFunction( "totime", 1, fcnToTime, QObject::tr( "Conversions" ) )
+    << new StaticFunction( "tointerval", 1, fcnToInterval, QObject::tr( "Conversions" ) )
+    << new StaticFunction( "coalesce", -1, fcnCoalesce, QObject::tr( "Conditionals" ) )
+    << new StaticFunction( "$now", 0, fcnNow, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "age", 2, fcnAge, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "year", 1, fcnYear, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "month", 1, fcnMonth, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "week", 1, fcnWeek, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "day", 1, fcnDay, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "hour", 1, fcnHour, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "minute", 1, fcnMinute, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "second", 1, fcnSeconds, QObject::tr( "Date and Time" ) )
+    << new StaticFunction( "lower", 1, fcnLower, QObject::tr( "String" ) )
+    << new StaticFunction( "upper", 1, fcnUpper, QObject::tr( "String" ) )
+    << new StaticFunction( "title", 1, fcnTitle, QObject::tr( "String" ) )
+    << new StaticFunction( "length", 1, fcnLength, QObject::tr( "String" ) )
+    << new StaticFunction( "replace", 3, fcnReplace, QObject::tr( "String" ) )
+    << new StaticFunction( "regexp_replace", 3, fcnRegexpReplace, QObject::tr( "String" ) )
+    << new StaticFunction( "substr", 3, fcnSubstr, QObject::tr( "String" ) )
+    << new StaticFunction( "concat", -1, fcnConcat, QObject::tr( "String" ) )
+    << new StaticFunction( "strpos", 2, fcnStrpos, QObject::tr( "String" ) )
+    << new StaticFunction( "left", 2, fcnLeft, QObject::tr( "String" ) )
+    << new StaticFunction( "right", 2, fcnRight, QObject::tr( "String" ) )
+    << new StaticFunction( "rpad", 3, fcnRPad, QObject::tr( "String" ) )
+    << new StaticFunction( "lpad", 3, fcnLPad, QObject::tr( "String" ) )
+    << new StaticFunction( "format_number", 2, fcnFormatNumber, QObject::tr( "String" ) )
+    << new StaticFunction( "format_date", 2, fcnFormatDate, QObject::tr( "String" ) )
+    << new StaticFunction( "xat", 1, fcnXat, QObject::tr( "Geometry" ), "", true )
+    << new StaticFunction( "yat", 1, fcnYat, QObject::tr( "Geometry" ), "", true )
+    << new StaticFunction( "$area", 0, fcnGeomArea, QObject::tr( "Geometry" ), "", true )
+    << new StaticFunction( "$length", 0, fcnGeomLength, QObject::tr( "Geometry" ), "", true )
+    << new StaticFunction( "$perimeter", 0, fcnGeomPerimeter, QObject::tr( "Geometry" ), "", true )
+    << new StaticFunction( "$x", 0, fcnX, QObject::tr( "Geometry" ), "", true )
+    << new StaticFunction( "$y", 0, fcnY, QObject::tr( "Geometry" ), "" , true )
+    << new StaticFunction( "$geometry", 0, fcnGeometry, QObject::tr( "Geometry" ), "" , true )
+    << new StaticFunction( "geomFromWKT", 1, fcnGeomFromWKT, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "geomFromGML2", 1, fcnGeomFromGML2, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "bbox", 2, fcnBbox, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "disjoint", 2, fcnDisjoint, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "intersects", 2, fcnIntersects, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "touches", 2, fcnTouches, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "crosses", 2, fcnCrosses, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "contains", 2, fcnContains, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "overlaps", 2, fcnOverlaps, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "within", 2, fcnWithin, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "buffer", -1, fcnBuffer, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "centroid", 1, fcnCentroid, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "convexHull", 1, fcnConvexHull, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "difference", 2, fcnDifference, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "distance", 2, fcnDistance, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "intersection", 2, fcnIntersection, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "symDifference", 2, fcnSymDifference, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "combine", 2, fcnCombine, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "union", 2, fcnCombine, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "geomToWKT", 1, fcnGeomToWKT, QObject::tr( "Geometry" ) )
+    << new StaticFunction( "$rownum", 0, fcnRowNumber, QObject::tr( "Record" ) )
+    << new StaticFunction( "$id", 0, fcnFeatureId, QObject::tr( "Record" ) )
+    << new StaticFunction( "$scale", 0, fcnScale, QObject::tr( "Record" ) )
+    << new StaticFunction( "_specialcol_", 1, fcnSpecialColumn, QObject::tr( "Special" ) )
+    ;
+  }
+  return gmFunctions;
+}
+
 QMap QgsExpression::gmSpecialColumns;
 
 void QgsExpression::setSpecialColumn( const QString& name, QVariant variant )
@@ -928,12 +1177,12 @@ QVariant QgsExpression::specialColumn( const QString& name )
   return it.value();
 }
 
-QList QgsExpression::specialColumns()
+QList QgsExpression::specialColumns()
 {
-  QList defs;
+  QList defs;
   for ( QMap::const_iterator it = gmSpecialColumns.begin(); it != gmSpecialColumns.end(); ++it )
   {
-    defs << FunctionDef( it.key(), 0, 0, QObject::tr( "Record" ));
+    defs << new StaticFunction( it.key(), 0, 0, QObject::tr( "Record" ) );
   }
   return defs;
 }
@@ -948,7 +1197,7 @@ int QgsExpression::functionIndex( QString name )
   int count = functionCount();
   for ( int i = 0; i < count; i++ )
   {
-    if ( QString::compare( name, BuiltinFunctions()[i].mName, Qt::CaseInsensitive ) == 0 )
+    if ( QString::compare( name, Functions()[i]->name(), Qt::CaseInsensitive ) == 0 )
       return i;
   }
   return -1;
@@ -956,7 +1205,7 @@ int QgsExpression::functionIndex( QString name )
 
 int QgsExpression::functionCount()
 {
-  return BuiltinFunctions().size();
+  return Functions().size();
 }
 
 
@@ -964,8 +1213,10 @@ QgsExpression::QgsExpression( const QString& expr )
     : mExpression( expr )
     , mRowNumber( 0 )
     , mScale( 0 )
-    , mCalc( NULL )
+
 {
+  initGeomCalculator();
+
   mRootNode = ::parseExpression( mExpression, mParserErrorString );
 
   if ( mParserErrorString.isNull() )
@@ -977,7 +1228,6 @@ QgsExpression::QgsExpression( const QString& expr )
 QgsExpression::~QgsExpression()
 {
   delete mRootNode;
-  delete mCalc;
 }
 
 QStringList QgsExpression::referencedColumns()
@@ -1012,11 +1262,16 @@ bool QgsExpression::needsGeometry()
 
 void QgsExpression::initGeomCalculator()
 {
-  mCalc = new QgsDistanceArea;
-  QSettings settings;
-  QString ellipsoid = settings.value( "/qgis/measure/ellipsoid", GEO_NONE ).toString();
-  mCalc->setEllipsoid( ellipsoid );
-  mCalc->setEllipsoidalMode( false );
+  // Use planimetric as default
+  mCalc.setEllipsoidalMode( false );
+}
+
+void QgsExpression::setGeomCalculator( QgsDistanceArea& calc )
+{
+  // Copy from supplied calculator
+  mCalc.setEllipsoid( calc.ellipsoid() );
+  mCalc.setEllipsoidalMode( calc.ellipsoidalEnabled() );
+  mCalc.setSourceCrs( calc.sourceCrs() );
 }
 
 bool QgsExpression::prepare( const QgsFieldMap& fields )
@@ -1062,7 +1317,6 @@ QString QgsExpression::dump() const
   return mRootNode->dump();
 }
 
-
 void QgsExpression::toOgcFilter( QDomDocument &doc, QDomElement &element ) const
 {
   if ( !mRootNode )
@@ -1126,7 +1380,7 @@ QString QgsExpression::replaceExpressionText( QString action, QgsFeature* feat,
     {
       QVariant oldValue = QgsExpression::specialColumn( sit.key() );
       if ( !oldValue.isNull() )
-	savedValues.insert( sit.key(), oldValue );
+        savedValues.insert( sit.key(), oldValue );
 
       // set the new value
       QgsExpression::setSpecialColumn( sit.key(), sit.value() );
@@ -1144,7 +1398,6 @@ QString QgsExpression::replaceExpressionText( QString action, QgsFeature* feat,
 
     int start = index;
     index = pos + rx.matchedLength();
-
     QString to_replace = rx.cap( 1 ).trimmed();
     QgsDebugMsg( "Found expression: " + to_replace );
 
@@ -1208,7 +1461,7 @@ QgsExpression::Node* QgsExpression::Node::createFromOgcFilter( QDomElement &elem
     if ( ogcOperatorName.isEmpty() )
       continue;
 
-    if ( element.localName() == ogcOperatorName )
+    if ( element.tagName() == ogcOperatorName )
     {
       QgsExpression::Node *node = QgsExpression::NodeUnaryOperator::createFromOgcFilter( element, errorMessage );
       if ( node )
@@ -1226,7 +1479,7 @@ QgsExpression::Node* QgsExpression::Node::createFromOgcFilter( QDomElement &elem
     if ( ogcOperatorName.isEmpty() )
       continue;
 
-    if ( element.localName() == ogcOperatorName )
+    if ( element.tagName() == ogcOperatorName )
     {
       QgsExpression::Node *node = QgsExpression::NodeBinaryOperator::createFromOgcFilter( element, errorMessage );
       if ( node )
@@ -1236,25 +1489,43 @@ QgsExpression::Node* QgsExpression::Node::createFromOgcFilter( QDomElement &elem
     }
   }
 
+  // check for spatial operators
+  int spatialOpCount = sizeof( SpatialOgcOperatorText ) / sizeof( SpatialOgcOperatorText[0] );
+  for ( int i = 0; i < spatialOpCount; i++ )
+  {
+    QString ogcOperatorName = SpatialOgcOperatorText[ i ];
+    if ( ogcOperatorName.isEmpty() )
+      continue;
+
+    if ( element.tagName() == ogcOperatorName )
+    {
+      QgsExpression::Node *node = QgsExpression::NodeFunction::createFromOgcFilter( element, errorMessage );
+      if ( node )
+        return node;
+
+      return NULL;
+    }
+  }
+
   // check for other OGC operators, convert them to expressions
 
-  if ( element.localName() == "PropertyIsNull" )
+  if ( element.tagName() == "PropertyIsNull" )
   {
     return QgsExpression::NodeBinaryOperator::createFromOgcFilter( element, errorMessage );
   }
-  else if ( element.localName() == "Literal" )
+  else if ( element.tagName() == "Literal" )
   {
     return QgsExpression::NodeLiteral::createFromOgcFilter( element, errorMessage );
   }
-  else if ( element.localName() == "Function" )
+  else if ( element.tagName() == "Function" )
   {
     return QgsExpression::NodeFunction::createFromOgcFilter( element, errorMessage );
   }
-  else if ( element.localName() == "PropertyName" )
+  else if ( element.tagName() == "PropertyName" )
   {
     return QgsExpression::NodeColumnRef::createFromOgcFilter( element, errorMessage );
   }
-  else if ( element.localName() == "PropertyIsBetween" )
+  else if ( element.tagName() == "PropertyIsBetween" )
   {
     //  encode a Range check
     QgsExpression::Node *operand = 0, *lowerBound = 0;
@@ -1263,12 +1534,12 @@ QgsExpression::Node* QgsExpression::Node::createFromOgcFilter( QDomElement &elem
     QDomElement operandElem = element.firstChildElement();
     while ( !operandElem.isNull() )
     {
-      if ( operandElem.localName() == "LowerBoundary" )
+      if ( operandElem.tagName() == "LowerBoundary" )
       {
         QDomElement lowerBoundElem = operandElem.firstChildElement();
         lowerBound = createFromOgcFilter( lowerBoundElem, errorMessage );
       }
-      else if ( operandElem.localName() ==  "UpperBoundary" )
+      else if ( operandElem.tagName() ==  "UpperBoundary" )
       {
         QDomElement upperBoundElem = operandElem.firstChildElement();
         upperBound = createFromOgcFilter( upperBoundElem, errorMessage );
@@ -1407,7 +1678,7 @@ QgsExpression::Node* QgsExpression::NodeUnaryOperator::createFromOgcFilter( QDom
     if ( ogcOperatorName.isEmpty() )
       continue;
 
-    if ( element.localName() != ogcOperatorName )
+    if ( element.tagName() != ogcOperatorName )
       continue;
 
     QDomElement operandElem = element.firstChildElement();
@@ -1769,7 +2040,7 @@ QgsExpression::Node* QgsExpression::NodeBinaryOperator::createFromOgcFilter( QDo
   QgsExpression::Node* opRight = 0;
 
   // convert ogc:PropertyIsNull to IS operator with NULL right operand
-  if ( element.localName() == "PropertyIsNull" )
+  if ( element.tagName() == "PropertyIsNull" )
   {
     QDomElement operandElem = element.firstChildElement();
     opLeft = QgsExpression::Node::createFromOgcFilter( operandElem, errorMessage );
@@ -1788,7 +2059,7 @@ QgsExpression::Node* QgsExpression::NodeBinaryOperator::createFromOgcFilter( QDo
     if ( ogcOperatorName.isEmpty() )
       continue;
 
-    if ( element.localName() != ogcOperatorName )
+    if ( element.tagName() != ogcOperatorName )
       continue;
 
     QDomElement operandElem = element.firstChildElement();
@@ -1814,7 +2085,8 @@ QgsExpression::Node* QgsExpression::NodeBinaryOperator::createFromOgcFilter( QDo
 
   if ( !opLeft && !opRight )
   {
-    errorMessage = QString( "'%1' binary operator not supported." ).arg( element.tagName() );
+    if ( errorMessage.isEmpty() )
+      errorMessage = QString( "'%1' binary operator not supported." ).arg( element.tagName() );
     return NULL;
   }
 
@@ -1826,7 +2098,6 @@ QgsExpression::Node* QgsExpression::NodeBinaryOperator::createFromOgcFilter( QDo
 
   return NULL;
 }
-
 //
 
 QVariant QgsExpression::NodeInOperator::eval( QgsExpression* parent, QgsFeature* f )
@@ -1919,7 +2190,7 @@ void QgsExpression::NodeInOperator::toOgcFilter( QDomDocument &doc, QDomElement
 
 QVariant QgsExpression::NodeFunction::eval( QgsExpression* parent, QgsFeature* f )
 {
-  const FunctionDef& fd = BuiltinFunctions()[mFnIndex];
+  Function* fd = Functions()[mFnIndex];
 
   // evaluate arguments
   QVariantList argValues;
@@ -1929,14 +2200,14 @@ QVariant QgsExpression::NodeFunction::eval( QgsExpression* parent, QgsFeature* f
     {
       QVariant v = n->eval( parent, f );
       ENSURE_NO_EVAL_ERROR;
-      if ( isNull( v ) && fd.mFcn != fcnCoalesce )
+      if ( isNull( v ) && fd->name() != "coalesce" )
         return QVariant(); // all "normal" functions return NULL, when any parameter is NULL (so coalesce is abnormal)
       argValues.append( v );
     }
   }
 
   // run the function
-  QVariant res = fd.mFcn( argValues, f, parent );
+  QVariant res = fd->func( argValues, f, parent );
   ENSURE_NO_EVAL_ERROR;
 
   // everything went fine
@@ -1958,23 +2229,75 @@ bool QgsExpression::NodeFunction::prepare( QgsExpression* parent, const QgsField
 
 QString QgsExpression::NodeFunction::dump() const
 {
-  const FunctionDef& fd = BuiltinFunctions()[mFnIndex];
-  if ( fd.mParams == 0 )
-    return fd.mName; // special column
+  Function* fd = Functions()[mFnIndex];
+  if ( fd->params() == 0 )
+    return fd->name(); // special column
   else
-    return QString( "%1(%2)" ).arg( fd.mName ).arg( mArgs ? mArgs->dump() : QString() ); // function
+    return QString( "%1(%2)" ).arg( fd->name() ).arg( mArgs ? mArgs->dump() : QString() ); // function
 }
 
 void QgsExpression::NodeFunction::toOgcFilter( QDomDocument &doc, QDomElement &element ) const
 {
-  const FunctionDef& fd = BuiltinFunctions()[mFnIndex];
-  if ( fd.mParams == 0 )
+  Function* fd = Functions()[mFnIndex];
+  if ( fd->params() == 0 )
     return; // TODO: special column
 
-  QDomElement funcElem = doc.createElement( "ogc:Function" );
-  funcElem.setAttribute( "name", fd.mName );
-  mArgs->toOgcFilter( doc, funcElem );
-  element.appendChild( funcElem );
+  bool isSpatial = false;
+  // check for spatial operators
+  int spatialOpCount = sizeof( SpatialOgcOperatorText ) / sizeof( SpatialOgcOperatorText[0] );
+  for ( int i = 0; i < spatialOpCount; i++ )
+  {
+    QString ogcOperatorName = SpatialOgcOperatorText[ i ];
+    if ( ogcOperatorName.isEmpty() )
+      continue;
+
+    if ( fd->name() == ogcOperatorName.toLower() )
+    {
+      isSpatial = true;
+      QDomElement funcElem = doc.createElement( "ogc:" + ogcOperatorName );
+      QDomElement geomProperty = doc.createElement( "ogc:PropertyName" );
+      geomProperty.appendChild( doc.createTextNode( "geometry" ) );
+      funcElem.appendChild( geomProperty );
+
+      QDomDocument tmpDoc;
+      QDomElement tmpElem = tmpDoc.createElement( "tmp" );
+      mArgs->toOgcFilter( tmpDoc, tmpElem );
+      QDomElement childElem = funcElem.firstChildElement();
+      while ( !childElem.isNull() )
+      {
+        if ( childElem.tagName() == "Function" )
+        {
+          if ( childElem.attribute( "name" ) == "geomFromWKT" )
+          {
+            QgsGeometry* geom = 0;
+            geom = QgsGeometry::fromWkt( childElem.firstChildElement().text() );
+            if ( geom )
+              funcElem.appendChild( geom->exportToGML2( doc ) );
+
+          }
+          else if ( childElem.attribute( "name" ) == "geomFromGML2" )
+          {
+            QDomDocument geomDoc;
+            QString errorMsg;
+            QString gml = childElem.firstChildElement().text();
+            if ( geomDoc.setContent( gml, true, &errorMsg ) )
+              funcElem.appendChild( doc.documentElement() );
+          }
+        }
+        childElem = childElem.nextSiblingElement();
+      }
+
+      element.appendChild( funcElem );
+    }
+  }
+
+  if ( !isSpatial )
+  {
+    QDomElement funcElem = doc.createElement( "ogc:Function" );
+    funcElem.setAttribute( "name", fd->name() );
+    mArgs->toOgcFilter( doc, funcElem );
+    element.appendChild( funcElem );
+  }
 }
 
 QgsExpression::Node* QgsExpression::NodeFunction::createFromOgcFilter( QDomElement &element, QString &errorMessage )
@@ -1982,17 +2305,77 @@ QgsExpression::Node* QgsExpression::NodeFunction::createFromOgcFilter( QDomEleme
   if ( element.isNull() )
     return NULL;
 
-  if ( element.localName() != "Function" )
+  // check for spatial operators
+  int spatialOpCount = sizeof( SpatialOgcOperatorText ) / sizeof( SpatialOgcOperatorText[0] );
+  for ( int i = 0; i < spatialOpCount; i++ )
+  {
+    QString ogcOperatorName = SpatialOgcOperatorText[ i ];
+    if ( ogcOperatorName.isEmpty() )
+      continue;
+
+    if ( element.tagName() == ogcOperatorName )
+    {
+      int geomIdx = 0;
+      int gml2Idx = 0;
+      int opeIdx = 0;
+      for ( int j = 0; j < Functions().size(); j++ )
+      {
+        QgsExpression::Function* funcDef = Functions()[j];
+        if ( funcDef->name() == "$geometry" )
+          geomIdx = j;
+        else if ( funcDef->name() == "geomFromGML2" )
+          gml2Idx = j;
+        else if ( funcDef->name() == ogcOperatorName.toLower() )
+          opeIdx = j;
+      }
+
+      if ( geomIdx == 0 || gml2Idx == 0 || opeIdx == 0 )
+      {
+        errorMessage = QString( "spatial functions not find %1, got %2, %3, %4" ).arg( ogcOperatorName ).arg( geomIdx ).arg( gml2Idx ).arg( opeIdx );
+        return NULL;
+      }
+
+      QgsExpression::NodeList *gml2Args = new QgsExpression::NodeList();
+      QDomElement childElem = element.firstChildElement();
+      QString gml2Str = "";
+      while ( !childElem.isNull() && gml2Str == "" )
+      {
+        if ( childElem.tagName() != "PropertyName" )
+        {
+          QTextStream gml2Stream( &gml2Str );
+          childElem.save( gml2Stream, 0 );
+        }
+        childElem = childElem.nextSiblingElement();
+      }
+      if ( gml2Str != "" )
+      {
+        gml2Args->append( new QgsExpression::NodeLiteral( QVariant( gml2Str.remove( "\n" ) ) ) );
+      }
+      else
+      {
+        errorMessage = QString( "No OGC Geometry found" );
+        return NULL;
+      }
+
+      QgsExpression::NodeList *opeArgs = new QgsExpression::NodeList();
+      opeArgs->append( new QgsExpression::NodeFunction( geomIdx, new QgsExpression::NodeList() ) );
+      opeArgs->append( new QgsExpression::NodeFunction( gml2Idx, gml2Args ) );
+
+      return new QgsExpression::NodeFunction( opeIdx, opeArgs );
+    }
+  }
+
+  if ( element.tagName() != "Function" )
   {
     errorMessage = QString( "ogc:Function expected, got %1" ).arg( element.tagName() );
     return NULL;
   }
 
-  for ( int i = 0; i < BuiltinFunctions().size(); i++ )
+  for ( int i = 0; i < Functions().size(); i++ )
   {
-    QgsExpression::FunctionDef funcDef = BuiltinFunctions()[i];
+    QgsExpression::Function* funcDef = Functions()[i];
 
-    if ( element.attribute( "name" ) != funcDef.mName )
+    if ( element.attribute( "name" ) != funcDef->name() )
       continue;
 
     QgsExpression::NodeList *args = new QgsExpression::NodeList();
@@ -2074,7 +2457,7 @@ QgsExpression::Node* QgsExpression::NodeLiteral::createFromOgcFilter( QDomElemen
   if ( element.isNull() )
     return NULL;
 
-  if ( element.localName() != "Literal" )
+  if ( element.tagName() != "Literal" )
   {
     errorMessage = QString( "ogc:Literal expected, got %1" ).arg( element.tagName() );
     return NULL;
@@ -2146,7 +2529,7 @@ QVariant QgsExpression::NodeColumnRef::eval( QgsExpression* /*parent*/, QgsFeatu
   {
     return f->attributeMap()[mIndex];
   }
-  return QVariant("[" + mName + "]");
+  return QVariant( "[" + mName + "]" );
 }
 
 bool QgsExpression::NodeColumnRef::prepare( QgsExpression* parent, const QgsFieldMap& fields )
@@ -2181,7 +2564,7 @@ QgsExpression::Node* QgsExpression::NodeColumnRef::createFromOgcFilter( QDomElem
   if ( element.isNull() )
     return NULL;
 
-  if ( element.localName() != "PropertyName" )
+  if ( element.tagName() != "PropertyName" )
   {
     errorMessage = QString( "ogc:PropertyName expected, got %1" ).arg( element.tagName() );
     return NULL;
diff --git a/src/core/qgsexpression.h b/src/core/qgsexpression.h
index e235d18b7760..6fe19846574c 100644
--- a/src/core/qgsexpression.h
+++ b/src/core/qgsexpression.h
@@ -24,9 +24,11 @@
 
 #include "qgsfield.h"
 #include "qgsvectorlayer.h"
+#include "qgsdistancearea.h"
+#include "qgsgeometry.h"
 
-class QgsDistanceArea;
 class QgsFeature;
+class QgsGeometry;
 class QDomElement;
 
 /**
@@ -138,7 +140,11 @@ class CORE_EXPORT QgsExpression
 
     //! Return calculator used for distance and area calculations
     //! (used by internal functions)
-    QgsDistanceArea* geomCalculator() { if ( !mCalc ) initGeomCalculator(); return mCalc; }
+    QgsDistanceArea* geomCalculator() { return & mCalc; }
+
+    //! Sets the geometry calculator used in evaluation of expressions,
+    // instead of the default.
+    void setGeomCalculator( QgsDistanceArea& calc );
 
     /** This function currently replaces each expression between [% and %]
        in the string with the result of its evaluation on the feature
@@ -155,8 +161,6 @@ class CORE_EXPORT QgsExpression
     static QString replaceExpressionText( QString action, QgsFeature& feat,
                                           QgsVectorLayer* layer,
                                           const QMap *substitutionMap = 0 );
-    //
-
     enum UnaryOperator
     {
       uoNot,
@@ -194,42 +198,94 @@ class CORE_EXPORT QgsExpression
       // strings
       boConcat,
     };
+    enum SpatialOperator
+    {
+      soBbox,
+      soIntersects,
+      soContains,
+      soCrosses,
+      soEquals,
+      soDisjoint,
+      soOverlaps,
+      soTouches,
+      soWithin,
+    };
 
     static const char* BinaryOperatorText[];
     static const char* UnaryOperatorText[];
 
     static const char* BinaryOgcOperatorText[];
     static const char* UnaryOgcOperatorText[];
+    static const char* SpatialOgcOperatorText[];
 
     typedef QVariant( *FcnEval )( const QVariantList& values, QgsFeature* f, QgsExpression* parent );
 
-    struct FunctionDef
+
+    /**
+      * A abstract base class for defining QgsExpression functions.
+      */
+    class CORE_EXPORT Function
+    {
+      public:
+        Function( QString fnname, int params, QString group, QString helpText = QString(), bool usesGeometry = false )
+            : mName( fnname ), mParams( params ), mUsesGeometry( usesGeometry ), mGroup( group ), mHelpText( helpText ) {}
+        /** The name of the function. */
+        QString name() { return mName; }
+        /** The number of parameters this function takes. */
+        int params() { return mParams; }
+        /** Does this function use a geometry object. */
+        bool usesgeometry() { return mUsesGeometry; }
+        /** The group the function belongs to. */
+        QString group() { return mGroup; }
+        /** The help text for the function. */
+        QString helptext() { return mHelpText; }
+
+        virtual QVariant func( const QVariantList& values, QgsFeature* f, QgsExpression* parent ) = 0;
+
+        bool operator==( const Function& other ) const
+        {
+          if ( QString::compare( mName, other.mName, Qt::CaseInsensitive ) == 0 )
+            return true;
+
+          return false;
+        }
+
+      private:
+        QString mName;
+        int mParams;
+        bool mUsesGeometry;
+        QString mGroup;
+        QString mHelpText;
+    };
+
+    class StaticFunction : public Function
     {
-      FunctionDef( QString fnname, int params, FcnEval fcn, QString group, QString helpText = QString(), bool usesGeometry = false )
-          : mName( fnname ), mParams( params ), mFcn( fcn ), mUsesGeometry( usesGeometry ), mGroup( group ), mHelpText( helpText ) {}
-      /** The name of the function. */
-      QString mName;
-      /** The number of parameters this function takes. */
-      int mParams;
-      /** Pointer to funntion.
-        * @note not available in python bindings
-         */
-      FcnEval mFcn;
-      /** Does this function use a geometry object. */
-      bool mUsesGeometry;
-      /** The group the function belongs to. */
-      QString mGroup;
-      /** The help text for the function. */
-      QString mHelpText;
+      public:
+        StaticFunction( QString fnname, int params, FcnEval fcn, QString group, QString helpText = QString(), bool usesGeometry = false )
+            : Function( fnname, params, group, helpText, usesGeometry ), mFnc( fcn ) {}
+
+        virtual QVariant func( const QVariantList& values, QgsFeature* f, QgsExpression* parent )
+        {
+          return mFnc( values, f, parent );
+        }
+
+      private:
+        FcnEval mFnc;
     };
 
-    static const QList &BuiltinFunctions();
-    static QList gmBuiltinFunctions;
+    const static QList &Functions();
+    static QList gmFunctions;
+
+    static QStringList gmBuiltinFunctions;
+    const static QStringList &BuiltinFunctions();
+
+    static bool registerFunction( Function* function );
+    static bool unregisterFunction( QString name );
 
     // tells whether the identifier is a name of existing function
     static bool isFunctionName( QString name );
 
-    // return index of the function in BuiltinFunctions array
+    // return index of the function in Functions array
     static int functionIndex( QString name );
 
     /**  Returns the number of functions defined in the parser
@@ -240,7 +296,7 @@ class CORE_EXPORT QgsExpression
     /**
      * Returns a list of special Column definitions
      */
-    static QList specialColumns();
+    static QList specialColumns();
 
     //! return quoted column reference (in double quotes)
     static QString quotedColumnRef( QString name ) { return QString( "\"%1\"" ).arg( name.replace( "\"", "\"\"" ) ); }
@@ -422,7 +478,7 @@ class CORE_EXPORT QgsExpression
         static QgsExpression::Node* createFromOgcFilter( QDomElement &element, QString &errorMessage );
 
         virtual QStringList referencedColumns() const { QStringList lst; if ( !mArgs ) return lst; foreach ( Node* n, mArgs->list() ) lst.append( n->referencedColumns() ); return lst; }
-        virtual bool needsGeometry() const { bool needs = BuiltinFunctions()[mFnIndex].mUsesGeometry; if ( mArgs ) { foreach ( Node* n, mArgs->list() ) needs |= n->needsGeometry(); } return needs; }
+        virtual bool needsGeometry() const { bool needs = Functions()[mFnIndex]->usesgeometry(); if ( mArgs ) { foreach ( Node* n, mArgs->list() ) needs |= n->needsGeometry(); } return needs; }
         virtual void accept( Visitor& v ) { v.visit( this ); }
 
       protected:
@@ -535,7 +591,7 @@ class CORE_EXPORT QgsExpression
 
   protected:
     // internally used to create an empty expression
-    QgsExpression() : mRootNode( NULL ), mRowNumber( 0 ), mCalc( NULL ) {}
+    QgsExpression() : mRootNode( NULL ), mRowNumber( 0 ) {}
 
     void initGeomCalculator();
 
@@ -549,10 +605,11 @@ class CORE_EXPORT QgsExpression
     double mScale;
 
     static QMap gmSpecialColumns;
+    QgsDistanceArea mCalc;
 
-    QgsDistanceArea* mCalc;
 };
 
-Q_DECLARE_METATYPE( QgsExpression::Interval )
+Q_DECLARE_METATYPE( QgsExpression::Interval );
+Q_DECLARE_METATYPE( QgsGeometry );
 
 #endif // QGSEXPRESSION_H
diff --git a/src/core/qgsexpressionparser.yy b/src/core/qgsexpressionparser.yy
index ffbb9eae28f8..929111b13180 100644
--- a/src/core/qgsexpressionparser.yy
+++ b/src/core/qgsexpressionparser.yy
@@ -165,8 +165,8 @@ expression:
             exp_error("Function is not known");
             YYERROR;
           }
-          if ( QgsExpression::BuiltinFunctions()[fnIndex].mParams != -1
-               && QgsExpression::BuiltinFunctions()[fnIndex].mParams != $3->count() )
+          if ( QgsExpression::Functions()[fnIndex]->params() != -1
+               && QgsExpression::Functions()[fnIndex]->params() != $3->count() )
           {
             exp_error("Function is called with wrong number of arguments");
             YYERROR;
diff --git a/src/core/qgsgeometry.cpp b/src/core/qgsgeometry.cpp
index 9a1ea7f0ac0e..bf349874ec1b 100644
--- a/src/core/qgsgeometry.cpp
+++ b/src/core/qgsgeometry.cpp
@@ -536,43 +536,53 @@ QgsGeometry* QgsGeometry::fromRect( const QgsRectangle& rect )
 static const QString GML_NAMESPACE = "http://www.opengis.net/gml";
 QgsGeometry* QgsGeometry::fromGML2( const QDomNode& geometryNode )
 {
-  QDomNode geometryChild = geometryNode.firstChild();
-  if ( geometryChild.isNull() )
-  {
-    return 0;
-  }
   QgsGeometry* g = new QgsGeometry();
-  QDomElement geometryTypeElement = geometryChild.toElement();
+  QDomElement geometryTypeElement = geometryNode.toElement();
   QString geomType = geometryTypeElement.tagName();
-  if ( geomType == "Point" )
+
+  if ( !( geomType == "Point" || geomType == "LineString" || geomType == "Polygon" || geomType == "MultiPoint" || geomType == "MultiLineString" || geomType == "MultiPolygon" ) )
+  {
+    QDomNode geometryChild = geometryNode.firstChild();
+    if ( geometryChild.isNull() )
+    {
+      return 0;
+    }
+    geometryTypeElement = geometryChild.toElement();
+    geomType = geometryTypeElement.tagName();
+  }
+
+  if ( !( geomType == "Point" || geomType == "LineString" || geomType == "Polygon" || geomType == "MultiPoint" || geomType == "MultiLineString" || geomType == "MultiPolygon" ) )
+    return 0;
+
+  if ( geomType == "Point" && g->setFromGML2Point( geometryTypeElement ) )
   {
-    g->setFromGML2Point( geometryTypeElement );
+    return g;
   }
-  else if ( geomType == "LineString" )
+  else if ( geomType == "LineString" && g->setFromGML2LineString( geometryTypeElement ) )
   {
-    g->setFromGML2LineString( geometryTypeElement );
+    return g;
   }
-  else if ( geomType == "Polygon" )
+  else if ( geomType == "Polygon" && g->setFromGML2Polygon( geometryTypeElement ) )
   {
-    g->setFromGML2Polygon( geometryTypeElement );
+    return g;
   }
-  else if ( geomType == "MultiPoint" )
+  else if ( geomType == "MultiPoint" && g->setFromGML2MultiPoint( geometryTypeElement ) )
   {
-    g->setFromGML2MultiPoint( geometryTypeElement );
+    return g;
   }
-  else if ( geomType == "MultiLineString" )
+  else if ( geomType == "MultiLineString" && g->setFromGML2MultiLineString( geometryTypeElement ) )
   {
-    g->setFromGML2MultiLineString( geometryTypeElement );
+    return g;
   }
-  else if ( geomType == "MultiPolygon" )
+  else if ( geomType == "MultiPolygon" && g->setFromGML2MultiPolygon( geometryTypeElement ) )
   {
-    g->setFromGML2MultiPolygon( geometryTypeElement );
+    return g;
   }
   else //unknown type
   {
     return 0;
   }
-  return g;
+  return 0;
 }
 
 bool QgsGeometry::setFromGML2Point( const QDomElement& geometryElement )
@@ -584,7 +594,7 @@ bool QgsGeometry::setFromGML2Point( const QDomElement& geometryElement )
   }
   QDomElement coordElement = coordList.at( 0 ).toElement();
   std::list pointCoordinate;
-  if ( readGML2Coordinates( pointCoordinate, coordElement ) != 0)
+  if ( readGML2Coordinates( pointCoordinate, coordElement ) != 0 )
   {
     return false;
   }
@@ -593,7 +603,7 @@ bool QgsGeometry::setFromGML2Point( const QDomElement& geometryElement )
   {
     return false;
   }
-  
+
   std::list::const_iterator point_it = pointCoordinate.begin();
   //char e = QgsApplication::endian();
   char e = ( htonl( 1 ) == 1 ) ? 0 : 1 ;
@@ -2968,8 +2978,15 @@ double QgsGeometry::closestVertexWithContext( const QgsPoint& point, int& atVert
     int closestVertexIndex = 0;
 
     // set up the GEOS geometry
-    if ( !exportWkbToGeos() )
+    if ( mDirtyGeos )
+    {
+      exportWkbToGeos();
+    }
+
+    if ( !mGeos )
+    {
       return -1;
+    }
 
     const GEOSGeometry *g = GEOSGetExteriorRing( mGeos );
     if ( !g )
@@ -3266,9 +3283,15 @@ int QgsGeometry::addRing( const QList& ring )
     return 2;
 
   //create geos geometry from wkb if not already there
-  if ( !mGeos || mDirtyGeos )
-    if ( !exportWkbToGeos() )
-      return 6;
+  if ( mDirtyGeos )
+  {
+    exportWkbToGeos();
+  }
+
+  if ( !mGeos )
+  {
+    return 6;
+  }
 
   int type = GEOSGeomTypeId( mGeos );
 
@@ -3495,13 +3518,15 @@ int QgsGeometry::addPart( const QList &points )
   }
 
   //create geos geometry from wkb if not already there
-  if ( !mGeos || mDirtyGeos )
+  if ( mDirtyGeos )
   {
-    if ( !exportWkbToGeos() )
-    {
-      QgsDebugMsg( "could not export to GEOS geometry" );
-      return 4;
-    }
+    exportWkbToGeos();
+  }
+
+  if ( !mGeos )
+  {
+    QgsDebugMsg( "GEOS geometry not available!" );
+    return 4;
   }
 
   int geosType = GEOSGeomTypeId( mGeos );
@@ -3871,10 +3896,14 @@ int QgsGeometry::splitGeometry( const QList& splitLine, QList& reshapeWithLine )
   GEOSGeometry* reshapeLineGeos = createGeosLineString( reshapeWithLine.toVector() );
 
   //make sure this geos geometry is up-to-date
-  if ( !mGeos || mDirtyGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
 
+  if ( !mGeos )
+  {
+    return 1;
+  }
+
   //single or multi?
   int numGeoms = GEOSGetNumGeometries( mGeos );
   if ( numGeoms == -1 )
@@ -4057,7 +4091,7 @@ int QgsGeometry::reshapeGeometry( const QList& reshapeWithLine )
 int QgsGeometry::makeDifference( QgsGeometry* other )
 {
   //make sure geos geometry is up to date
-  if ( !mGeos || mDirtyGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
@@ -4078,7 +4112,7 @@ int QgsGeometry::makeDifference( QgsGeometry* other )
   }
 
   //convert other geometry to geos
-  if ( !other->mGeos || other->mDirtyGeos )
+  if ( other->mDirtyGeos )
   {
     other->exportWkbToGeos();
   }
@@ -4151,6 +4185,7 @@ QgsRectangle QgsGeometry::boundingBox()
     QgsDebugMsg( "WKB geometry not available!" );
     return QgsRectangle( 0, 0, 0, 0 );
   }
+
   // consider endian when fetching feature type
   //wkbType = (mGeometry[0] == 1) ? mGeometry[1] : mGeometry[4]; //MH: Does not work for 25D geometries
   memcpy( &wkbType, &( mGeometry[1] ), sizeof( int ) );
@@ -5121,10 +5156,10 @@ QDomElement QgsGeometry::exportToGML2( QDomDocument& doc )
       coordElem.setAttribute( "ts", " " );
       QString coordString;
       x = ( double * )( mGeometry + 5 );
-      coordString += QString::number( *x, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+      coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
       coordString += ",";
       y = ( double * )( mGeometry + 5 + sizeof( double ) );
-      coordString += QString::number( *y, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+      coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
       QDomText coordText = doc.createTextNode( coordString );
       coordElem.appendChild( coordText );
       pointElem.appendChild( coordElem );
@@ -5151,11 +5186,11 @@ QDomElement QgsGeometry::exportToGML2( QDomDocument& doc )
         coordElem.setAttribute( "ts", " " );
         QString coordString;
         x = ( double * )( ptr );
-        coordString += QString::number( *x, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+        coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
         coordString += ",";
         ptr += sizeof( double );
         y = ( double * )( ptr );
-        coordString += QString::number( *y, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+        coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
         QDomText coordText = doc.createTextNode( coordString );
         coordElem.appendChild( coordText );
         pointElem.appendChild( coordElem );
@@ -5195,11 +5230,11 @@ QDomElement QgsGeometry::exportToGML2( QDomDocument& doc )
           coordString += " ";
         }
         x = ( double * ) ptr;
-        coordString += QString::number( *x, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+        coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
         coordString += ",";
         ptr += sizeof( double );
         y = ( double * ) ptr;
-        coordString += QString::number( *y, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+        coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
         ptr += sizeof( double );
         if ( hasZValue )
         {
@@ -5241,11 +5276,11 @@ QDomElement QgsGeometry::exportToGML2( QDomDocument& doc )
             coordString += " ";
           }
           x = ( double * ) ptr;
-          coordString += QString::number( *x, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+          coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
           ptr += sizeof( double );
           coordString += ",";
           y = ( double * ) ptr;
-          coordString += QString::number( *y, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+          coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
           ptr += sizeof( double );
           if ( hasZValue )
           {
@@ -5305,11 +5340,11 @@ QDomElement QgsGeometry::exportToGML2( QDomDocument& doc )
             coordString += " ";
           }
           x = ( double * ) ptr;
-          coordString += QString::number( *x, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+          coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
           coordString += ",";
           ptr += sizeof( double );
           y = ( double * ) ptr;
-          coordString += QString::number( *y, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+          coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
           ptr += sizeof( double );
           if ( hasZValue )
           {
@@ -5368,11 +5403,11 @@ QDomElement QgsGeometry::exportToGML2( QDomDocument& doc )
               coordString += " ";
             }
             x = ( double * ) ptr;
-            coordString += QString::number( *x, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+            coordString += QString::number( *x, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
             ptr += sizeof( double );
             coordString += ",";
             y = ( double * ) ptr;
-            coordString += QString::number( *y, 'f', 8 ).remove( QRegExp("[0]{1,7}$") );
+            coordString += QString::number( *y, 'f', 8 ).remove( QRegExp( "[0]{1,7}$" ) );
             ptr += sizeof( double );
             if ( hasZValue )
             {
@@ -5380,6 +5415,7 @@ QDomElement QgsGeometry::exportToGML2( QDomDocument& doc )
             }
           }
           QDomText coordText = doc.createTextNode( coordString );
+          coordElem.appendChild( coordText );
           ringElem.appendChild( coordElem );
           boundaryElem.appendChild( ringElem );
           polygonElem.appendChild( boundaryElem );
@@ -6163,10 +6199,14 @@ int QgsGeometry::splitLinearGeometry( GEOSGeometry *splitLine, QList& splitResult )
 {
-  if ( !mGeos || mDirtyGeos )
+  if ( mDirtyGeos )
   {
-    if ( !exportWkbToGeos() )
-      return 1;
+    exportWkbToGeos();
+  }
+
+  if ( !mGeos )
+  {
+    return 1;
   }
 
   //convert mGeos to geometry collection
@@ -7188,10 +7236,14 @@ QgsMultiPolygon QgsGeometry::asMultiPolygon()
 
 double QgsGeometry::area()
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
+  if ( !mGeos )
+  {
+    return -1.0;
+  }
 
   double area;
 
@@ -7207,10 +7259,14 @@ double QgsGeometry::area()
 
 double QgsGeometry::length()
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
+  if ( !mGeos )
+  {
+    return -1.0;
+  }
 
   double length;
 
@@ -7225,12 +7281,11 @@ double QgsGeometry::length()
 }
 double QgsGeometry::distance( QgsGeometry& geom )
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
-
-  if ( !geom.mGeos )
+  if ( geom.mDirtyGeos )
   {
     geom.exportWkbToGeos();
   }
@@ -7252,7 +7307,7 @@ double QgsGeometry::distance( QgsGeometry& geom )
 
 QgsGeometry* QgsGeometry::buffer( double distance, int segments )
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
@@ -7270,7 +7325,7 @@ QgsGeometry* QgsGeometry::buffer( double distance, int segments )
 
 QgsGeometry* QgsGeometry::simplify( double tolerance )
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
@@ -7287,7 +7342,7 @@ QgsGeometry* QgsGeometry::simplify( double tolerance )
 
 QgsGeometry* QgsGeometry::centroid()
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
@@ -7304,7 +7359,7 @@ QgsGeometry* QgsGeometry::centroid()
 
 QgsGeometry* QgsGeometry::convexHull()
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
@@ -7324,7 +7379,7 @@ QgsGeometry* QgsGeometry::interpolate( double distance )
 {
 #if defined(GEOS_VERSION_MAJOR) && defined(GEOS_VERSION_MINOR) && \
     ((GEOS_VERSION_MAJOR>3) || ((GEOS_VERSION_MAJOR==3) && (GEOS_VERSION_MINOR>=2)))
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
@@ -7349,14 +7404,17 @@ QgsGeometry* QgsGeometry::intersection( QgsGeometry* geometry )
   {
     return NULL;
   }
-  if ( !mGeos )
+
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
-  if ( !geometry->mGeos )
+  if ( geometry->mDirtyGeos )
   {
     geometry->exportWkbToGeos();
   }
+
+
   if ( !mGeos || !geometry->mGeos )
   {
     return 0;
@@ -7375,14 +7433,16 @@ QgsGeometry* QgsGeometry::combine( QgsGeometry* geometry )
   {
     return NULL;
   }
-  if ( !mGeos )
+
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
-  if ( !geometry->mGeos )
+  if ( geometry->mDirtyGeos )
   {
     geometry->exportWkbToGeos();
   }
+
   if ( !mGeos || !geometry->mGeos )
   {
     return 0;
@@ -7411,14 +7471,16 @@ QgsGeometry* QgsGeometry::difference( QgsGeometry* geometry )
   {
     return NULL;
   }
-  if ( !mGeos )
+
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
-  if ( !geometry->mGeos )
+  if ( geometry->mDirtyGeos )
   {
     geometry->exportWkbToGeos();
   }
+
   if ( !mGeos || !geometry->mGeos )
   {
     return 0;
@@ -7437,14 +7499,16 @@ QgsGeometry* QgsGeometry::symDifference( QgsGeometry* geometry )
   {
     return NULL;
   }
-  if ( !mGeos )
+
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
   }
-  if ( !geometry->mGeos )
+  if ( geometry->mDirtyGeos )
   {
     geometry->exportWkbToGeos();
   }
+
   if ( !mGeos || !geometry->mGeos )
   {
     return 0;
@@ -7459,11 +7523,14 @@ QgsGeometry* QgsGeometry::symDifference( QgsGeometry* geometry )
 
 QList QgsGeometry::asGeometryCollection()
 {
-  if ( !mGeos )
+  if ( mDirtyGeos )
   {
     exportWkbToGeos();
-    if ( !mGeos )
-      return QList();
+  }
+
+  if ( !mGeos )
+  {
+    return QList();
   }
 
   int type = GEOSGeomTypeId( mGeos );
diff --git a/src/core/qgsgeometry.h b/src/core/qgsgeometry.h
index 10e3d477f99f..58542b88e113 100644
--- a/src/core/qgsgeometry.h
+++ b/src/core/qgsgeometry.h
@@ -89,7 +89,7 @@ class CORE_EXPORT QgsGeometry
     /** static method that creates geometry from Wkt */
     static QgsGeometry* fromWkt( QString wkt );
 
-    /** static method that creates geometry from GML2 
+    /** static method that creates geometry from GML2
       @note added in 1.9
       */
     static QgsGeometry* fromGML2( const QDomNode& geometryNode );
diff --git a/src/core/qgsmaplayer.cpp b/src/core/qgsmaplayer.cpp
index e988ed899eb7..192ae83117b1 100644
--- a/src/core/qgsmaplayer.cpp
+++ b/src/core/qgsmaplayer.cpp
@@ -103,7 +103,9 @@ QString QgsMapLayer::id() const
 void QgsMapLayer::setLayerName( const QString & name )
 {
   QgsDebugMsg( "new name is '" + name + "'" );
-  mLayerName = capitaliseLayerName( name );
+  QString newName = capitaliseLayerName( name );
+  if ( newName == mLayerName ) return;
+  mLayerName = newName;
   emit layerNameChanged();
 }
 
diff --git a/src/core/qgsmaplayer.h b/src/core/qgsmaplayer.h
index 879525dea8b9..ffe17353217f 100644
--- a/src/core/qgsmaplayer.h
+++ b/src/core/qgsmaplayer.h
@@ -26,6 +26,7 @@
 #include 
 
 #include "qgis.h"
+#include "qgserror.h"
 #include "qgsrectangle.h"
 
 class QgsRenderContext;
@@ -218,6 +219,12 @@ class CORE_EXPORT QgsMapLayer : public QObject
      */
     virtual QString lastError();
 
+    /** Get current status error. This error describes some principal problem
+     *  for which layer cannot work and thus is not valid. It is not last error
+     *  after accessing data by draw() etc.
+     */
+    virtual QgsError error() const { return mError; }
+
     /** Returns layer's spatial reference system
     @note This was introduced in QGIS 1.4
     */
@@ -335,11 +342,11 @@ class CORE_EXPORT QgsMapLayer : public QObject
     /** Event handler for when a coordinate transform fails due to bad vertex error */
     virtual void invalidTransformInput();
 
-    /** Accessor and mutator for the minimum scale member */
+    /** Accessor and mutator for the minimum scale denominator member */
     void setMinimumScale( float theMinScale );
     float minimumScale();
 
-    /** Accessor and mutator for the maximum scale member */
+    /** Accessor and mutator for the maximum scale denominator member */
     void setMaximumScale( float theMaxScale );
     float maximumScale();
 
@@ -419,6 +426,11 @@ class CORE_EXPORT QgsMapLayer : public QObject
     /** debugging member - invoked when a connect() is made to this object */
     void connectNotify( const char * signal );
 
+    /** Add error message */
+    void appendError( const QgsErrorMessage & theMessage ) { mError.append( theMessage );}
+    /** Set error message */
+    void setError( const QgsError & theError ) { mError = theError;}
+
     /** Transparency level for this layer should be 0-255 (255 being opaque) */
     unsigned int mTransparencyLevel;
 
@@ -439,6 +451,9 @@ class CORE_EXPORT QgsMapLayer : public QObject
     /**Description of the layer*/
     QString mAbstract;
 
+    /** \brief Error */
+    QgsError mError;
+
   private:
     /** layer's spatial reference system.
         private to make sure setCrs must be used and layerCrsChanged() is emitted */
@@ -459,9 +474,9 @@ class CORE_EXPORT QgsMapLayer : public QObject
     /** Tag for embedding additional information */
     QString mTag;
 
-    /** Minimum scale at which this layer should be displayed */
+    /** Minimum scale denominator at which this layer should be displayed */
     float mMinScale;
-    /** Maximum scale at which this layer should be displayed */
+    /** Maximum scale denominator at which this layer should be displayed */
     float mMaxScale;
     /** A flag that tells us whether to use the above vars to restrict layer visibility */
     bool mScaleBasedVisibility;
diff --git a/src/core/qgsmaprenderer.h b/src/core/qgsmaprenderer.h
index b3ca8a200b1f..792b0c2b7fde 100644
--- a/src/core/qgsmaprenderer.h
+++ b/src/core/qgsmaprenderer.h
@@ -39,6 +39,7 @@ class QgsDistanceArea;
 class QgsOverlayObjectPositionManager;
 class QgsVectorLayer;
 
+class QgsPalLayerSettings;
 class QgsDiagramLayerSettings;
 
 class CORE_EXPORT QgsLabelPosition
@@ -75,6 +76,9 @@ class CORE_EXPORT QgsLabelingEngineInterface
     //! called when starting rendering of a layer
     //! @note: this method was added in version 1.6
     virtual int prepareLayer( QgsVectorLayer* layer, QSet& attrIndices, QgsRenderContext& ctx ) = 0;
+    //! returns PAL layer settings for a registered layer
+    //! @note: this method was added in version 1.9
+    virtual QgsPalLayerSettings& layer( const QString& layerName ) = 0;
     //! adds a diagram layer to the labeling engine
     virtual int addDiagramLayer( QgsVectorLayer* layer, QgsDiagramLayerSettings* s )
     { Q_UNUSED( layer ); Q_UNUSED( s ); return 0; }
@@ -136,6 +140,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject
 
     const QgsMapToPixel* coordinateTransform() { return &( mRenderContext.mapToPixel() ); }
 
+    //! Scale denominator
     double scale() const { return mScale; }
     /**Sets scale for scale based visibility. Normally, the scale is calculated automatically. This
      function is only used to force a preview scale (e.g. for print composer)*/
@@ -288,7 +293,7 @@ class CORE_EXPORT QgsMapRenderer : public QObject
     //! map units per pixel
     double mMapUnitsPerPixel;
 
-    //! Map scale at its current zoom level
+    //! Map scale denominator at its current zoom level
     double mScale;
 
     //! scale calculator
diff --git a/src/core/qgspallabeling.cpp b/src/core/qgspallabeling.cpp
index 20a0386ef8ad..bd90718be7b2 100644
--- a/src/core/qgspallabeling.cpp
+++ b/src/core/qgspallabeling.cpp
@@ -49,6 +49,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 using namespace pal;
@@ -57,7 +58,8 @@ using namespace pal;
 class QgsPalGeometry : public PalGeometry
 {
   public:
-    QgsPalGeometry( QgsFeatureId id, QString text, GEOSGeometry* g )
+    QgsPalGeometry( QgsFeatureId id, QString text, GEOSGeometry* g,
+                    qreal ltrSpacing = 0.0, qreal wordSpacing = 0.0, bool curvedLabeling = false )
         : mG( g )
         , mText( text )
         , mId( id )
@@ -65,6 +67,9 @@ class QgsPalGeometry : public PalGeometry
         , mIsDiagram( false )
         , mIsPinned( false )
         , mFontMetrics( NULL )
+        , mLetterSpacing( ltrSpacing )
+        , mWordSpacing( wordSpacing )
+        , mCurvedLabeling( curvedLabeling )
     {
       mStrId = FID_TO_STRING( id ).toAscii();
     }
@@ -91,22 +96,57 @@ class QgsPalGeometry : public PalGeometry
     const char* strId() { return mStrId.data(); }
     QString text() { return mText; }
 
-    pal::LabelInfo* info( QFontMetricsF* fm, const QgsMapToPixel* xform, double fontScale )
+    pal::LabelInfo* info( QFontMetricsF* fm, const QgsMapToPixel* xform, double fontScale, double maxinangle, double maxoutangle )
     {
       if ( mInfo )
         return mInfo;
 
       mFontMetrics = new QFontMetricsF( *fm ); // duplicate metrics for when drawing label
 
+      // max angle between curved label characters (20.0/-20.0 was default in QGIS <= 1.8)
+      if ( maxinangle < 20.0 )
+        maxinangle = 20.0;
+      if ( 60.0 < maxinangle )
+        maxinangle = 60.0;
+      if ( maxoutangle > -20.0 )
+        maxoutangle = -20.0;
+      if ( -95.0 > maxoutangle )
+        maxoutangle = -95.0;
+
       // create label info!
       QgsPoint ptZero = xform->toMapCoordinates( 0, 0 );
       QgsPoint ptSize = xform->toMapCoordinatesF( 0.0, -fm->height() / fontScale );
 
-      mInfo = new pal::LabelInfo( mText.count(), ptSize.y() - ptZero.y() );
+      // mLetterSpacing/mWordSpacing = 0.0 is default for non-curved labels
+      // (non-curved spacings handled by Qt in QgsPalLayerSettings/QgsPalLabeling)
+      qreal charWidth;
+      qreal wordSpaceFix;
+      mInfo = new pal::LabelInfo( mText.count(), ptSize.y() - ptZero.y(), maxinangle, maxoutangle );
       for ( int i = 0; i < mText.count(); i++ )
       {
         mInfo->char_info[i].chr = mText[i].unicode();
-        ptSize = xform->toMapCoordinatesF( fm->width( mText[i] ) / fontScale , 0.0 );
+
+        // reconstruct how Qt creates word spacing, then adjust per individual stored character
+        // this will allow PAL to create each candidate width = character width + correct spacing
+        charWidth = fm->width( mText[i] );
+        if ( mCurvedLabeling )
+        {
+          wordSpaceFix = qreal( 0.0 );
+          if ( mText[i] == QString( " " )[0] )
+          {
+            // word spacing only gets added once at end of consecutive run of spaces, see QTextEngine::shapeText()
+            int nxt = i + 1;
+            wordSpaceFix = ( nxt < mText.count() && mText[nxt] != QString( " " )[0] ) ? mWordSpacing : qreal( 0.0 );
+          }
+          if ( fm->width( QString( mText[i] ) ) - fm->width( mText[i] ) - mLetterSpacing != qreal( 0.0 ) )
+          {
+            // word spacing applied when it shouldn't be
+            wordSpaceFix -= mWordSpacing;
+          }
+          charWidth = fm->width( QString( mText[i] ) ) + wordSpaceFix;
+        }
+
+        ptSize = xform->toMapCoordinatesF((( double ) charWidth ) / fontScale , 0.0 );
         mInfo->char_info[i].width = ptSize.x() - ptZero.x();
       }
       return mInfo;
@@ -135,6 +175,9 @@ class QgsPalGeometry : public PalGeometry
     bool mIsDiagram;
     bool mIsPinned;
     QFontMetricsF* mFontMetrics;
+    qreal mLetterSpacing; // for use with curved labels
+    qreal mWordSpacing; // for use with curved labels
+    bool mCurvedLabeling; // whether the geometry is to be used for curved labeling placement
     /**Stores attribute values for data defined properties*/
     QMap< QgsPalLayerSettings::DataDefinedProperties, QVariant > mDataDefinedValues;
 
@@ -145,7 +188,7 @@ class QgsPalGeometry : public PalGeometry
 // -------------
 
 QgsPalLayerSettings::QgsPalLayerSettings()
-    : palLayer( NULL ), ct( NULL ), extentGeom( NULL ), expression( NULL )
+    : palLayer( NULL ), ct( NULL ), extentGeom( NULL ), mFeaturesToLabel( 0 ), mFeatsSendingToPal( 0 ), mFeatsRegPal( 0 ), expression( NULL )
 {
   placement = AroundPoint;
   placementFlags = 0;
@@ -178,11 +221,22 @@ QgsPalLayerSettings::QgsPalLayerSettings()
   displayAll = false;
   mergeLines = false;
   minFeatureSize = 0.0;
+  limitNumLabels = false;
+  maxNumLabels = 2000;
   vectorScaleFactor = 1.0;
   rasterCompressFactor = 1.0;
   addDirectionSymbol = false;
+  leftDirectionSymbol = QString( "<" );
+  rightDirectionSymbol = QString( ">" );
+  reverseDirectionSymbol = false;
+  placeDirectionSymbol = SymbolLeftRight;
   upsidedownLabels = Upright;
+  maxCurvedCharAngleIn = 20.0;
+  maxCurvedCharAngleOut = -20.0;
   fontSizeInMapUnits = false;
+  fontLimitPixelSize = false;
+  fontMinPixelSize = 0; //trigger to turn it on by default for map unit labels
+  fontMaxPixelSize = 10000;
   bufferSizeInMapUnits = false;
   labelOffsetInMapUnits = true;
   distInMapUnits = false;
@@ -228,11 +282,22 @@ QgsPalLayerSettings::QgsPalLayerSettings( const QgsPalLayerSettings& s )
   displayAll = s.displayAll;
   mergeLines = s.mergeLines;
   minFeatureSize = s.minFeatureSize;
+  limitNumLabels = s.limitNumLabels;
+  maxNumLabels = s.maxNumLabels;
   vectorScaleFactor = s.vectorScaleFactor;
   rasterCompressFactor = s.rasterCompressFactor;
   addDirectionSymbol = s.addDirectionSymbol;
+  leftDirectionSymbol = s.leftDirectionSymbol;
+  rightDirectionSymbol = s.rightDirectionSymbol;
+  reverseDirectionSymbol = s.reverseDirectionSymbol;
+  placeDirectionSymbol = s.placeDirectionSymbol;
   upsidedownLabels = s.upsidedownLabels;
+  maxCurvedCharAngleIn = s.maxCurvedCharAngleIn;
+  maxCurvedCharAngleOut = s.maxCurvedCharAngleOut;
   fontSizeInMapUnits = s.fontSizeInMapUnits;
+  fontLimitPixelSize = s.fontLimitPixelSize;
+  fontMinPixelSize = s.fontMinPixelSize;
+  fontMaxPixelSize = s.fontMaxPixelSize;
   bufferSizeInMapUnits = s.bufferSizeInMapUnits;
   distInMapUnits = s.distInMapUnits;
   labelOffsetInMapUnits = s.labelOffsetInMapUnits;
@@ -347,6 +412,7 @@ static void _readDataDefinedPropertyMap( QgsVectorLayer* layer, QMap< QgsPalLaye
   _readDataDefinedProperty( layer, QgsPalLayerSettings::MaxScale, propertyMap );
   _readDataDefinedProperty( layer, QgsPalLayerSettings::FontTransp, propertyMap );
   _readDataDefinedProperty( layer, QgsPalLayerSettings::BufferTransp, propertyMap );
+  _readDataDefinedProperty( layer, QgsPalLayerSettings::AlwaysShow, propertyMap );
 }
 
 void QgsPalLayerSettings::updateFontViaStyle( const QString & fontstyle )
@@ -394,7 +460,7 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
   textFont.setWordSpacing( layer->customProperty( "labeling/fontWordSpacing", QVariant( 0.0 ) ).toDouble() );
   textColor = _readColor( layer, "labeling/textColor" );
   textTransp = layer->customProperty( "labeling/textTransp" ).toInt();
-  previewBkgrdColor = QColor( layer->customProperty( "labeling/previewBkgrdColor", "#ffffff" ).toString() );
+  previewBkgrdColor = QColor( layer->customProperty( "labeling/previewBkgrdColor", QVariant( "#ffffff" ) ).toString() );
   enabled = layer->customProperty( "labeling/enabled" ).toBool();
   priority = layer->customProperty( "labeling/priority" ).toInt();
   obstacle = layer->customProperty( "labeling/obstacle" ).toBool();
@@ -413,9 +479,20 @@ void QgsPalLayerSettings::readFromLayer( QgsVectorLayer* layer )
   displayAll = layer->customProperty( "labeling/displayAll", QVariant( false ) ).toBool();
   mergeLines = layer->customProperty( "labeling/mergeLines" ).toBool();
   addDirectionSymbol = layer->customProperty( "labeling/addDirectionSymbol" ).toBool();
+  leftDirectionSymbol = layer->customProperty( "labeling/leftDirectionSymbol", QVariant( "<" ) ).toString();
+  rightDirectionSymbol = layer->customProperty( "labeling/rightDirectionSymbol", QVariant( ">" ) ).toString();
+  reverseDirectionSymbol = layer->customProperty( "labeling/reverseDirectionSymbol" ).toBool();
+  placeDirectionSymbol = ( DirectionSymbols ) layer->customProperty( "labeling/placeDirectionSymbol", QVariant( SymbolLeftRight ) ).toUInt();
   upsidedownLabels = ( UpsideDownLabels ) layer->customProperty( "labeling/upsidedownLabels", QVariant( Upright ) ).toUInt();
+  maxCurvedCharAngleIn = layer->customProperty( "labeling/maxCurvedCharAngleIn", QVariant( 20.0 ) ).toDouble();
+  maxCurvedCharAngleOut = layer->customProperty( "labeling/maxCurvedCharAngleOut", QVariant( -20.0 ) ).toDouble();
   minFeatureSize = layer->customProperty( "labeling/minFeatureSize" ).toDouble();
+  limitNumLabels = layer->customProperty( "labeling/limitNumLabels", QVariant( false ) ).toBool();
+  maxNumLabels = layer->customProperty( "labeling/maxNumLabels", QVariant( 2000 ) ).toInt();
   fontSizeInMapUnits = layer->customProperty( "labeling/fontSizeInMapUnits" ).toBool();
+  fontLimitPixelSize = layer->customProperty( "labeling/fontLimitPixelSize", QVariant( false ) ).toBool();
+  fontMinPixelSize = layer->customProperty( "labeling/fontMinPixelSize", QVariant( 0 ) ).toInt();
+  fontMaxPixelSize = layer->customProperty( "labeling/fontMaxPixelSize", QVariant( 10000 ) ).toInt();
   bufferSizeInMapUnits = layer->customProperty( "labeling/bufferSizeInMapUnits" ).toBool();
   distInMapUnits = layer->customProperty( "labeling/distInMapUnits" ).toBool();
   labelOffsetInMapUnits = layer->customProperty( "labeling/labelOffsetInMapUnits", QVariant( true ) ).toBool();
@@ -474,9 +551,20 @@ void QgsPalLayerSettings::writeToLayer( QgsVectorLayer* layer )
   layer->setCustomProperty( "labeling/displayAll", displayAll );
   layer->setCustomProperty( "labeling/mergeLines", mergeLines );
   layer->setCustomProperty( "labeling/addDirectionSymbol", addDirectionSymbol );
+  layer->setCustomProperty( "labeling/leftDirectionSymbol", leftDirectionSymbol );
+  layer->setCustomProperty( "labeling/rightDirectionSymbol", rightDirectionSymbol );
+  layer->setCustomProperty( "labeling/reverseDirectionSymbol", reverseDirectionSymbol );
+  layer->setCustomProperty( "labeling/placeDirectionSymbol", ( unsigned int )placeDirectionSymbol );
   layer->setCustomProperty( "labeling/upsidedownLabels", ( unsigned int )upsidedownLabels );
+  layer->setCustomProperty( "labeling/maxCurvedCharAngleIn", maxCurvedCharAngleIn );
+  layer->setCustomProperty( "labeling/maxCurvedCharAngleOut", maxCurvedCharAngleOut );
   layer->setCustomProperty( "labeling/minFeatureSize", minFeatureSize );
+  layer->setCustomProperty( "labeling/limitNumLabels", limitNumLabels );
+  layer->setCustomProperty( "labeling/maxNumLabels", maxNumLabels );
   layer->setCustomProperty( "labeling/fontSizeInMapUnits", fontSizeInMapUnits );
+  layer->setCustomProperty( "labeling/fontLimitPixelSize", fontLimitPixelSize );
+  layer->setCustomProperty( "labeling/fontMinPixelSize", fontMinPixelSize );
+  layer->setCustomProperty( "labeling/fontMaxPixelSize", fontMaxPixelSize );
   layer->setCustomProperty( "labeling/bufferSizeInMapUnits", bufferSizeInMapUnits );
   layer->setCustomProperty( "labeling/distInMapUnits", distInMapUnits );
   layer->setCustomProperty( "labeling/labelOffsetInMapUnits", labelOffsetInMapUnits );
@@ -542,18 +630,29 @@ void QgsPalLayerSettings::calculateLabelSize( const QFontMetricsF* fm, QString t
     return;
   }
 
+  QString wrapchr = !wrapChar.isEmpty() ? wrapChar : QString( "\n" );
+
   //consider the space needed for the direction symbol
-  if ( addDirectionSymbol && placement == QgsPalLayerSettings::Line )
+  if ( addDirectionSymbol && placement == QgsPalLayerSettings::Line
+       && ( !leftDirectionSymbol.isEmpty() || !rightDirectionSymbol.isEmpty() ) )
   {
-    text.append( ">" );
+    QString dirSym = leftDirectionSymbol;
+
+    if ( fm->width( rightDirectionSymbol ) > fm->width( dirSym ) )
+      dirSym = rightDirectionSymbol;
+
+    if ( placeDirectionSymbol == QgsPalLayerSettings::SymbolLeftRight )
+    {
+      text.append( dirSym );
+    }
+    else
+    {
+      text.append( dirSym + wrapchr ); // SymbolAbove or SymbolBelow
+    }
   }
 
   double w = 0.0, h = 0.0;
-  QStringList multiLineSplit;
-  if ( !wrapChar.isEmpty() )
-    multiLineSplit = text.split( wrapChar );
-  else
-    multiLineSplit = text.split( "\n" );
+  QStringList multiLineSplit = text.split( wrapchr );
   int lines = multiLineSplit.size();
 
   double labelHeight = fm->ascent() + fm->descent(); // ignore +1 for baseline
@@ -626,6 +725,33 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
     }
   }
 
+  QFont labelFont = textFont;
+
+  //data defined label size?
+  QMap< DataDefinedProperties, int >::const_iterator it = dataDefinedProperties.find( QgsPalLayerSettings::Size );
+  if ( it != dataDefinedProperties.constEnd() )
+  {
+    //find out size
+    QVariant size = f.attributeMap().value( *it );
+    if ( size.isValid() )
+    {
+      double sizeDouble = size.toDouble();
+      if ( sizeDouble <= 0.0 || sizeToPixel( sizeDouble, context ) < 1 )
+      {
+        return;
+      }
+      labelFont.setPixelSize( sizeToPixel( sizeDouble, context ) );
+    }
+  }
+
+  // defined 'minimum/maximum pixel font size' option
+  // TODO: add any data defined setting to override fontMinPixelSize/fontMaxPixelSize
+  if ( fontLimitPixelSize && fontSizeInMapUnits &&
+       ( fontMinPixelSize > labelFont.pixelSize()  || labelFont.pixelSize() > fontMaxPixelSize ) )
+  {
+    return;
+  }
+
   QString labelText;
 
   // Check to see if we are a expression string.
@@ -663,29 +789,20 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
     labelText = f.attributeMap()[fieldIndex].toString();
   }
 
+  // this should come AFTER any data defined option that affects font metrics
+  QFontMetricsF* labelFontMetrics = new QFontMetricsF( labelFont );
   double labelX, labelY; // will receive label size
-  QFont labelFont = textFont;
+  calculateLabelSize( labelFontMetrics, labelText, labelX, labelY );
 
-  //data defined label size?
-  QMap< DataDefinedProperties, int >::const_iterator it = dataDefinedProperties.find( QgsPalLayerSettings::Size );
-  if ( it != dataDefinedProperties.constEnd() )
+  // maximum angle between curved label characters
+  double maxcharanglein = 20.0;
+  double maxcharangleout = -20.0;
+  if ( placement == QgsPalLayerSettings::Curved )
   {
-    //find out size
-    QVariant size = f.attributeMap().value( *it );
-    if ( size.isValid() )
-    {
-      double sizeDouble = size.toDouble();
-      if ( sizeDouble <= 0.0 || sizeToPixel( sizeDouble, context ) < 1 )
-      {
-        return;
-      }
-      labelFont.setPixelSize( sizeToPixel( sizeDouble, context ) );
-    }
+    maxcharanglein = maxCurvedCharAngleIn;
+    maxcharangleout = maxCurvedCharAngleOut > 0 ? -maxCurvedCharAngleOut : maxCurvedCharAngleOut;
   }
-
-  // this should come after any data defined option that affects font metrics
-  QFontMetricsF* labelFontMetrics = new QFontMetricsF( labelFont );
-  calculateLabelSize( labelFontMetrics, labelText, labelX, labelY );
+  // TODO: add data defined override for maximum angle between curved label characters
 
   QgsGeometry* geom = f.geometry();
   if ( !geom )
@@ -727,6 +844,32 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
   if ( geos_geom == NULL )
     return; // invalid geometry
 
+  // likelihood exists label will be registered with PAL and may be drawn
+  // check if max number of features to label (already registered with PAL) has been reached
+  // Debug output at end of QgsPalLabeling::drawLabeling(), when deleting temp geometries
+  if ( limitNumLabels )
+  {
+    if ( !maxNumLabels )
+    {
+      return;
+    }
+    mFeatsRegPal = palLayer->getNbFeatures();
+    if ( mFeatsRegPal >= maxNumLabels )
+    {
+      return;
+    }
+
+    int divNum = ( int )(( mFeaturesToLabel / maxNumLabels ) + 0.5 );
+    if ( divNum && ( mFeatsRegPal == ( int )( mFeatsSendingToPal / divNum ) ) )
+    {
+      mFeatsSendingToPal += 1;
+      if ( divNum &&  mFeatsSendingToPal % divNum )
+      {
+        return;
+      }
+    }
+  }
+
   GEOSGeometry* geos_geom_clone = GEOSGeom_clone( geos_geom );
 
   //data defined position / alignment / rotation?
@@ -881,7 +1024,25 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
     }
   }
 
-  QgsPalGeometry* lbl = new QgsPalGeometry( f.id(), labelText, geos_geom_clone );
+  // data defined always show?
+  bool alwaysShow = false;
+  QMap< DataDefinedProperties, int >::const_iterator dAlwShowIt = dataDefinedProperties.find( QgsPalLayerSettings::AlwaysShow );
+  if ( dAlwShowIt != dataDefinedProperties.constEnd() )
+  {
+    QVariant alwShow = f.attributeMap().value( *dAlwShowIt );
+    if ( alwShow.isValid() )
+    {
+      alwaysShow = alwShow.toBool();
+    }
+  }
+
+  QgsPalGeometry* lbl = new QgsPalGeometry(
+    f.id(),
+    labelText,
+    geos_geom_clone,
+    labelFont.letterSpacing(),
+    labelFont.wordSpacing(),
+    placement == QgsPalLayerSettings::Curved );
 
   // record the created geometry - it will be deleted at the end.
   geometries.append( lbl );
@@ -891,7 +1052,7 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
   {
     if ( !palLayer->registerFeature( lbl->strId(), lbl, labelX, labelY, labelText.toUtf8().constData(),
                                      xPos, yPos, dataDefinedPosition, angle, dataDefinedRotation,
-                                     quadOffsetX, quadOffsetY, offsetX, offsetY ) )
+                                     quadOffsetX, quadOffsetY, offsetX, offsetY, alwaysShow ) )
       return;
   }
   catch ( std::exception &e )
@@ -904,7 +1065,7 @@ void QgsPalLayerSettings::registerFeature( QgsVectorLayer* layer,  QgsFeature& f
   // TODO: only for placement which needs character info
   pal::Feature* feat = palLayer->getFeature( lbl->strId() );
   // account for any data defined font metrics adjustments
-  feat->setLabelInfo( lbl->info( labelFontMetrics, xform, rasterCompressFactor ) );
+  feat->setLabelInfo( lbl->info( labelFontMetrics, xform, rasterCompressFactor, maxcharanglein, maxcharangleout ) );
   delete labelFontMetrics;
 
   // TODO: allow layer-wide feature dist in PAL...?
@@ -1146,6 +1307,8 @@ int QgsPalLabeling::prepareLayer( QgsVectorLayer* layer, QSet& attrIndices,
   // rect for clipping
   lyr.extentGeom = QgsGeometry::fromRect( mMapRenderer->extent() );
 
+  lyr.mFeatsSendingToPal = 0;
+
   return 1; // init successful
 }
 
@@ -1543,6 +1706,13 @@ void QgsPalLabeling::drawLabeling( QgsRenderContext& context )
     QgsPalLayerSettings& lyr = lit.value();
     for ( QList::iterator git = lyr.geometries.begin(); git != lyr.geometries.end(); ++git )
       delete *git;
+    if ( lyr.limitNumLabels )
+    {
+      QgsDebugMsg( QString( "mFeaturesToLabel: %1" ).arg( lyr.mFeaturesToLabel ) );
+      QgsDebugMsg( QString( "maxNumLabels: %1" ).arg( lyr.maxNumLabels ) );
+      QgsDebugMsg( QString( "mFeatsSendingToPal: %1" ).arg( lyr.mFeatsSendingToPal ) );
+      QgsDebugMsg( QString( "mFeatsRegPal: %1" ).arg( lyr.geometries.count() ) );
+    }
     lyr.geometries.clear();
   }
 
@@ -1651,28 +1821,59 @@ void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QPainter* painter, co
   QString txt = ( label->getPartId() == -1 ? text : QString( text[label->getPartId()] ) );
   QFontMetricsF* labelfm = (( QgsPalGeometry* )label->getFeaturePart()->getUserGeometry() )->getLabelFontMetrics();
 
+  QString wrapchr = !lyr.wrapChar.isEmpty() ? lyr.wrapChar : QString( "\n" );
+
   //add the direction symbol if needed
   if ( !txt.isEmpty() && lyr.placement == QgsPalLayerSettings::Line &&
        lyr.addDirectionSymbol )
   {
+    bool prependSymb = false;
+    QString symb = lyr.rightDirectionSymbol;
+
     if ( label->getReversed() )
     {
-      txt.prepend( "<" );
+      prependSymb = true;
+      symb = lyr.leftDirectionSymbol;
+    }
+
+    if ( lyr.reverseDirectionSymbol )
+    {
+      if ( symb == lyr.rightDirectionSymbol )
+      {
+        prependSymb = true;
+        symb = lyr.leftDirectionSymbol;
+      }
+      else
+      {
+        prependSymb = false;
+        symb = lyr.rightDirectionSymbol;
+      }
+    }
+
+    if ( lyr.placeDirectionSymbol == QgsPalLayerSettings::SymbolAbove )
+    {
+      prependSymb = true;
+      symb = symb + wrapchr;
+    }
+    else if ( lyr.placeDirectionSymbol == QgsPalLayerSettings::SymbolBelow )
+    {
+      prependSymb = false;
+      symb = wrapchr + symb;
+    }
+
+    if ( prependSymb )
+    {
+      txt.prepend( symb );
     }
     else
     {
-      txt.append( ">" );
+      txt.append( symb );
     }
   }
 
   //QgsDebugMsg( "drawLabel " + QString::number( drawBuffer ) + " " + txt );
 
-  QStringList multiLineList;
-  if ( !lyr.wrapChar.isEmpty() )
-    multiLineList = txt.split( lyr.wrapChar );
-  else
-    multiLineList = txt.split( "\n" );
-
+  QStringList multiLineList = txt.split( wrapchr );
   int lines = multiLineList.size();
 
   double labelWidest = 0.0;
@@ -1710,8 +1911,8 @@ void QgsPalLabeling::drawLabel( pal::LabelPosition* label, QPainter* painter, co
       {
         labelWidthDiff /= 2;
       }
-      xMultiLineOffset = labelWidthDiff * lyr.rasterCompressFactor;
-      QgsDebugMsg( QString( "xMultiLineOffset: %0" ).arg( xMultiLineOffset ) );
+      xMultiLineOffset = labelWidthDiff;
+      //QgsDebugMsg( QString( "xMultiLineOffset: %1" ).arg( xMultiLineOffset ) );
     }
 
     double yMultiLineOffset = ( lines - 1 - i ) * labelHeight * lyr.multilineHeight;
@@ -1757,6 +1958,48 @@ void QgsPalLabeling::drawLabelBuffer( QPainter* p, QString text, const QFont& fo
   p->drawPath( path );
 }
 
+void QgsPalLabeling::loadEngineSettings()
+{
+  // start with engine defaults for new project, or project that has no saved settings
+  Pal p;
+  bool saved = false;
+  mSearch = ( QgsPalLabeling::Search )( QgsProject::instance()->readNumEntry(
+                                          "PAL", "/SearchMethod", ( int )p.getSearch(), &saved ) );
+  mCandPoint = QgsProject::instance()->readNumEntry(
+                 "PAL", "/CandidatesPoint", p.getPointP(), &saved );
+  mCandLine = QgsProject::instance()->readNumEntry(
+                "PAL", "/CandidatesLine", p.getLineP(), &saved );
+  mCandPolygon = QgsProject::instance()->readNumEntry(
+                   "PAL", "/CandidatesPolygon", p.getPolyP(), &saved );
+  mShowingCandidates = QgsProject::instance()->readBoolEntry(
+                         "PAL", "/ShowingCandidates", false, &saved );
+  mShowingAllLabels = QgsProject::instance()->readBoolEntry(
+                        "PAL", "/ShowingAllLabels", false, &saved );
+  mSavedWithProject = saved;
+}
+
+void QgsPalLabeling::saveEngineSettings()
+{
+  QgsProject::instance()->writeEntry( "PAL", "/SearchMethod", ( int )mSearch );
+  QgsProject::instance()->writeEntry( "PAL", "/CandidatesPoint", mCandPoint );
+  QgsProject::instance()->writeEntry( "PAL", "/CandidatesLine", mCandLine );
+  QgsProject::instance()->writeEntry( "PAL", "/CandidatesPolygon", mCandPolygon );
+  QgsProject::instance()->writeEntry( "PAL", "/ShowingCandidates", mShowingCandidates );
+  QgsProject::instance()->writeEntry( "PAL", "/ShowingAllLabels", mShowingAllLabels );
+  mSavedWithProject = true;
+}
+
+void QgsPalLabeling::clearEngineSettings()
+{
+  QgsProject::instance()->removeEntry( "PAL", "/SearchMethod" );
+  QgsProject::instance()->removeEntry( "PAL", "/CandidatesPoint" );
+  QgsProject::instance()->removeEntry( "PAL", "/CandidatesLine" );
+  QgsProject::instance()->removeEntry( "PAL", "/CandidatesPolygon" );
+  QgsProject::instance()->removeEntry( "PAL", "/ShowingCandidates" );
+  QgsProject::instance()->removeEntry( "PAL", "/ShowingAllLabels" );
+  mSavedWithProject = false;
+}
+
 QgsLabelingEngineInterface* QgsPalLabeling::clone()
 {
   QgsPalLabeling* lbl = new QgsPalLabeling();
diff --git a/src/core/qgspallabeling.h b/src/core/qgspallabeling.h
index f06a211aff89..20080a2ec723 100644
--- a/src/core/qgspallabeling.h
+++ b/src/core/qgspallabeling.h
@@ -88,6 +88,13 @@ class CORE_EXPORT QgsPalLayerSettings
       ShowAll // show upside down for all labels, including dynamic ones
     };
 
+    enum DirectionSymbols
+    {
+      SymbolLeftRight, // place direction symbols on left/right of label
+      SymbolAbove, // place direction symbols on above label
+      SymbolBelow // place direction symbols on below label
+    };
+
     enum MultiLineAlign
     {
       MultiLeft = 0,
@@ -118,6 +125,7 @@ class CORE_EXPORT QgsPalLayerSettings
       MaxScale,
       FontTransp,
       BufferTransp,
+      AlwaysShow,
       PropertyCount, // keep last entry
     };
 
@@ -170,11 +178,23 @@ class CORE_EXPORT QgsPalLayerSettings
     bool displayAll;  // if true, all features will be labelled even though overlaps occur
     bool mergeLines;
     double minFeatureSize; // minimum feature size to be labelled (in mm)
-    // Adds '<' or '>' to the label string pointing to the direction of the line / polygon ring
+    bool limitNumLabels; // whether to limit the number of labels to be drawn
+    int maxNumLabels; // maximum number of labels to be drawn
+    // Adds '<' or '>', or user-defined symbol to the label string pointing to the
+    // direction of the line / polygon ring
     // Works only if Placement == Line
     bool addDirectionSymbol;
+    QString leftDirectionSymbol;
+    QString rightDirectionSymbol;
+    bool reverseDirectionSymbol;
+    DirectionSymbols placeDirectionSymbol; // whether to place left/right, above or below label
     unsigned int upsidedownLabels; // whether, or how, to show upsidedown labels
+    double maxCurvedCharAngleIn; // maximum angle between inside curved label characters (defaults to 20.0, range 20.0 to 60.0)
+    double maxCurvedCharAngleOut; // maximum angle between outside curved label characters (defaults to -20.0, range -20.0 to -95.0)
     bool fontSizeInMapUnits; //true if font size is in map units (otherwise in points)
+    bool fontLimitPixelSize; // true is label should be limited by fontMinPixelSize/fontMaxPixelSize
+    int fontMinPixelSize; // minimum pixel size for showing rendered map unit labels (1 - 1000)
+    int fontMaxPixelSize; // maximum pixel size for showing rendered map unit labels (1 - 10000)
     bool bufferSizeInMapUnits; //true if buffer is in map units (otherwise in mm)
     bool labelOffsetInMapUnits; //true if label offset is in map units (otherwise in mm)
     bool distInMapUnits; //true if distance is in map units (otherwise in mm)
@@ -208,7 +228,7 @@ class CORE_EXPORT QgsPalLayerSettings
      @return font pixel size*/
     int sizeToPixel( double size, const QgsRenderContext& c , bool buffer = false ) const;
 
-    // temporary stuff: set when layer gets prepared
+    // temporary stuff: set when layer gets prepared or labeled
     pal::Layer* palLayer;
     int fieldIndex;
     const QgsMapToPixel* xform;
@@ -216,6 +236,9 @@ class CORE_EXPORT QgsPalLayerSettings
     QgsPoint ptZero, ptOne;
     QList geometries;
     QgsGeometry* extentGeom;
+    int mFeaturesToLabel; // total features that will probably be labeled, may be less (figured before PAL)
+    int mFeatsSendingToPal; // total features tested for sending into PAL (relative to maxNumLabels)
+    int mFeatsRegPal; // number of features registered in PAL, when using limitNumLabels
 
   private:
     /**Checks if a feature is larger than a minimum size (in mm)
@@ -293,6 +316,14 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
                     const QColor& bufferColor = QColor( 255, 255, 255 ), bool drawBuffer = false );
     static void drawLabelBuffer( QPainter* p, QString text, const QFont& font, double size, QColor color , Qt::PenJoinStyle joinstyle = Qt::BevelJoin, bool noFill = false );
 
+    //! load/save engine settings to project file
+    //! @note added in QGIS 1.9
+    void loadEngineSettings();
+    void saveEngineSettings();
+    void clearEngineSettings();
+    bool isStoredWithProject() const { return mSavedWithProject; }
+    void setStoredWithProject( bool store ) { mSavedWithProject = store; }
+
   protected:
     // hashtable of layer settings, being filled during labeling
     QHash mActiveLayers;
@@ -312,6 +343,8 @@ class CORE_EXPORT QgsPalLabeling : public QgsLabelingEngineInterface
 
     bool mShowingAllLabels; // whether to avoid collisions or not
 
+    bool mSavedWithProject; // whether engine settings have been read from project file
+
     QgsLabelSearchTree* mLabelSearchTree;
 };
 
diff --git a/src/core/qgsproject.cpp b/src/core/qgsproject.cpp
index f88293fe2a01..ac0e1c995b7a 100644
--- a/src/core/qgsproject.cpp
+++ b/src/core/qgsproject.cpp
@@ -1064,6 +1064,8 @@ bool QgsProject::write()
 
   dirty( false );               // reset to pristine state
 
+  emit projectSaved();
+
   return true;
 } // QgsProject::write
 
diff --git a/src/core/qgsproject.h b/src/core/qgsproject.h
index d4b587c3b7bb..61a8e51848ca 100644
--- a/src/core/qgsproject.h
+++ b/src/core/qgsproject.h
@@ -332,6 +332,9 @@ class CORE_EXPORT QgsProject : public QObject
     //! emitted when project is being written
     void writeProject( QDomDocument & );
 
+    //! emitted when the project file has been written and closed
+    void projectSaved();
+
     //! emitted when an old project file is read.
     void oldProjectVersionWarning( QString );
 
diff --git a/src/core/qgsproviderregistry.cpp b/src/core/qgsproviderregistry.cpp
index bdf69d090ba5..1075f262f4da 100644
--- a/src/core/qgsproviderregistry.cpp
+++ b/src/core/qgsproviderregistry.cpp
@@ -449,6 +449,7 @@ void * QgsProviderRegistry::function( QString const & providerKey,
     delete myLib;
     return ptr;
   }
+  QgsDebugMsg( "Cannot load library: " + myLib->errorString() );
   delete myLib;
   return 0;
 }
@@ -467,6 +468,7 @@ QLibrary *QgsProviderRegistry::providerLibrary( QString const & providerKey ) co
   {
     return myLib;
   }
+  QgsDebugMsg( "Cannot load library: " + myLib->errorString() );
   delete myLib;
   return 0;
 }
diff --git a/src/core/qgsrectangle.cpp b/src/core/qgsrectangle.cpp
index 3b0dbc811c7e..f1f321d2520a 100644
--- a/src/core/qgsrectangle.cpp
+++ b/src/core/qgsrectangle.cpp
@@ -21,6 +21,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 
 #include "qgspoint.h"
@@ -54,6 +55,33 @@ QgsRectangle::QgsRectangle( const QgsRectangle &r )
   ymax = r.yMaximum();
 }
 
+QgsRectangle::QgsRectangle( const QDomNode& boxNode )
+{
+  QDomElement boxElem = boxNode.toElement();
+  if ( boxElem.tagName() == "Box" )
+  {
+    QDomElement bElem = boxElem.firstChild().toElement();
+    QString coordSeparator = ",";
+    QString tupelSeparator = " ";
+    if ( bElem.hasAttribute( "cs" ) )
+    {
+      coordSeparator = bElem.attribute( "cs" );
+    }
+    if ( bElem.hasAttribute( "ts" ) )
+    {
+      tupelSeparator = bElem.attribute( "ts" );
+    }
+
+    QString bString = bElem.text();
+    bool conversionSuccess;
+    xmin = bString.section( tupelSeparator, 0, 0 ).section( coordSeparator, 0, 0 ).toDouble( &conversionSuccess );
+    ymin = bString.section( tupelSeparator, 0, 0 ).section( coordSeparator, 1, 1 ).toDouble( &conversionSuccess );
+    xmax = bString.section( tupelSeparator, 1, 1 ).section( coordSeparator, 0, 0 ).toDouble( &conversionSuccess );
+    ymax = bString.section( tupelSeparator, 1, 1 ).section( coordSeparator, 1, 1 ).toDouble( &conversionSuccess );
+  }
+  normalize();
+}
+
 void QgsRectangle::set( const QgsPoint& p1, const QgsPoint& p2 )
 {
   xmin = p1.x();
@@ -185,10 +213,10 @@ bool QgsRectangle::isEmpty() const
 QString QgsRectangle::asWktCoordinates() const
 {
   QString rep =
-    QString::number( xmin, 'f', 16 ) + " " +
-    QString::number( ymin, 'f', 16 ) + ", " +
-    QString::number( xmax, 'f', 16 ) + " " +
-    QString::number( ymax, 'f', 16 );
+    QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
+    QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
+    QString::number( xmax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
+    QString::number( ymax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) );
 
   return rep;
 }
@@ -197,16 +225,16 @@ QString QgsRectangle::asWktPolygon() const
 {
   QString rep =
     QString( "POLYGON((" ) +
-    QString::number( xmin, 'f', 16 ) + " " +
-    QString::number( ymin, 'f', 16 ) + ", " +
-    QString::number( xmax, 'f', 16 ) + " " +
-    QString::number( ymin, 'f', 16 ) + ", " +
-    QString::number( xmax, 'f', 16 ) + " " +
-    QString::number( ymax, 'f', 16 ) + ", " +
-    QString::number( xmin, 'f', 16 ) + " " +
-    QString::number( ymax, 'f', 16 ) + ", " +
-    QString::number( xmin, 'f', 16 ) + " " +
-    QString::number( ymin, 'f', 16 ) +
+    QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
+    QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
+    QString::number( xmax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
+    QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
+    QString::number( xmax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
+    QString::number( ymax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
+    QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
+    QString::number( ymax, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + ", " +
+    QString::number( xmin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) + " " +
+    QString::number( ymin, 'f', 16 ).remove( QRegExp( "[0]{1,15}$" ) ) +
     QString( "))" );
 
   return rep;
diff --git a/src/core/qgsrectangle.h b/src/core/qgsrectangle.h
index c9d0b2e7640e..756ac472cf2f 100644
--- a/src/core/qgsrectangle.h
+++ b/src/core/qgsrectangle.h
@@ -19,6 +19,7 @@
 #define QGSRECT_H
 
 #include 
+#include 
 
 class QString;
 class QRectF;
@@ -43,6 +44,9 @@ class CORE_EXPORT QgsRectangle
     QgsRectangle( const QRectF & qRectF );
     //! Copy constructor
     QgsRectangle( const QgsRectangle &other );
+    //! GML2 constructor
+    //@note added in 1.9
+    QgsRectangle( const QDomNode& boxNode );
     //! Destructor
     ~QgsRectangle();
     //! Set the rectangle from two QgsPoints. The rectangle is
diff --git a/src/core/qgsscalecalculator.cpp b/src/core/qgsscalecalculator.cpp
index 57ba1864fb2f..526fc89689ff 100644
--- a/src/core/qgsscalecalculator.cpp
+++ b/src/core/qgsscalecalculator.cpp
@@ -74,13 +74,13 @@ double QgsScaleCalculator::calculate( const QgsRectangle &mapExtent, int canvasW
       delta = calculateGeographicDistance( mapExtent );
       break;
   }
-  QgsDebugMsg( "Using conversionFactor of " + QString::number( conversionFactor ) );
   if ( canvasWidth == 0 || mDpi == 0 )
   {
     QgsDebugMsg( "Can't calculate scale from the input values" );
     return 0;
   }
   double scale = ( delta * conversionFactor ) / (( double )canvasWidth / mDpi );
+  QgsDebugMsg( QString( "scale = %1 conversionFactor = %2" ).arg( scale ).arg( conversionFactor ) );
   return scale;
 }
 
diff --git a/src/core/qgsscalecalculator.h b/src/core/qgsscalecalculator.h
index 6ff07af4bccd..0f25a3492705 100644
--- a/src/core/qgsscalecalculator.h
+++ b/src/core/qgsscalecalculator.h
@@ -66,10 +66,10 @@ class CORE_EXPORT QgsScaleCalculator
     QGis::UnitType mapUnits() const;
 
     /**
-     * Calculate the scale
+     * Calculate the scale denominator
      * @param mapExtent QgsRectangle containing the current map extent
      * @param canvasWidth Width of the map canvas in pixel (physical) units
-     * @return scale of current map view
+     * @return scale denominator of current map view
      */
     double calculate( const QgsRectangle &mapExtent, int canvasWidth );
 
diff --git a/src/core/qgsvectorfilewriter.cpp b/src/core/qgsvectorfilewriter.cpp
index 4d7df1ceec4a..515539a14006 100644
--- a/src/core/qgsvectorfilewriter.cpp
+++ b/src/core/qgsvectorfilewriter.cpp
@@ -71,10 +71,30 @@ QgsVectorFileWriter::QgsVectorFileWriter(
   QString vectorFileName = theVectorFileName;
   QString fileEncoding = theFileEncoding;
 
+  QStringList dsOptions = datasourceOptions;
+
+  QString ogrDriverName;
+  if ( driverName == "MapInfo MIF" )
+  {
+    ogrDriverName = "MapInfo File";
+  }
+  else if ( driverName == "SpatiaLite" )
+  {
+    ogrDriverName = "SQLite";
+    if ( !dsOptions.contains( "SPATIALITE=YES" ) )
+    {
+      dsOptions.append( "SPATIALITE=YES" );
+    }
+  }
+  else
+  {
+    ogrDriverName = driverName;
+  }
+
   // find driver in OGR
   OGRSFDriverH poDriver;
   QgsApplication::registerOgrDrivers();
-  poDriver = OGRGetDriverByName( driverName.toLocal8Bit().data() );
+  poDriver = OGRGetDriverByName( ogrDriverName.toLocal8Bit().data() );
 
   if ( poDriver == NULL )
   {
@@ -157,14 +177,14 @@ QgsVectorFileWriter::QgsVectorFileWriter(
   }
 
   char **options = NULL;
-  if ( !datasourceOptions.isEmpty() )
+  if ( !dsOptions.isEmpty() )
   {
-    options = new char *[ datasourceOptions.size()+1 ];
-    for ( int i = 0; i < datasourceOptions.size(); i++ )
+    options = new char *[ dsOptions.size()+1 ];
+    for ( int i = 0; i < dsOptions.size(); i++ )
     {
-      options[i] = CPLStrdup( datasourceOptions[i].toLocal8Bit().data() );
+      options[i] = CPLStrdup( dsOptions[i].toLocal8Bit().data() );
     }
-    options[ datasourceOptions.size()] = NULL;
+    options[ dsOptions.size()] = NULL;
   }
 
   // create the data source
@@ -172,7 +192,7 @@ QgsVectorFileWriter::QgsVectorFileWriter(
 
   if ( options )
   {
-    for ( int i = 0; i < datasourceOptions.size(); i++ )
+    for ( int i = 0; i < dsOptions.size(); i++ )
       CPLFree( options[i] );
     delete [] options;
     options = NULL;
@@ -482,6 +502,13 @@ bool QgsVectorFileWriter::addFeature( QgsFeature& feature )
   {
     // build geometry from WKB
     QgsGeometry *geom = feature.geometry();
+
+    // turn single geoemetry to multi geometry if needed
+    if ( geom && geom->wkbType() != mWkbType && geom->wkbType() == QGis::flatType( mWkbType ) )
+    {
+      geom->convertToMultiType();
+    }
+
     if ( geom && geom->wkbType() != mWkbType )
     {
       // there's a problem when layer type is set as wkbtype Polygon
@@ -596,6 +623,7 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
     bool skipAttributeCreation,
     QString *newFilename )
 {
+  QgsDebugMsg( "fileName = " + fileName );
   const QgsCoordinateReferenceSystem* outputCRS;
   QgsCoordinateTransform* ct = 0;
   int shallTransform = false;
@@ -619,6 +647,11 @@ QgsVectorFileWriter::writeAsVectorFormat( QgsVectorLayer* layer,
   QgsVectorFileWriter* writer =
     new QgsVectorFileWriter( fileName, fileEncoding, skipAttributeCreation ? QgsFieldMap() : layer->pendingFields(), layer->wkbType(), outputCRS, driverName, datasourceOptions, layerOptions, newFilename );
 
+  if ( newFilename )
+  {
+    QgsDebugMsg( "newFilename = " + *newFilename );
+  }
+
   // check whether file creation was successful
   WriterError err = writer->hasError();
   if ( err != NoError )
@@ -790,6 +823,7 @@ QMap QgsVectorFileWriter::ogrDriverList()
   QgsApplication::registerOgrDrivers();
   int const drvCount = OGRGetDriverCount();
 
+  QStringList writableDrivers;
   for ( int i = 0; i < drvCount; ++i )
   {
     OGRSFDriverH drv = OGRGetDriver( i );
@@ -798,18 +832,54 @@ QMap QgsVectorFileWriter::ogrDriverList()
       QString drvName = OGR_Dr_GetName( drv );
       if ( OGR_Dr_TestCapability( drv, "CreateDataSource" ) != 0 )
       {
-        QString longName;
-        QString trLongName;
-        QString glob;
-        QString exts;
-        if ( QgsVectorFileWriter::driverMetadata( drvName, longName, trLongName, glob, exts ) && !trLongName.isEmpty() )
+        // Add separate format for Mapinfo MIF (MITAB is OGR default)
+        if ( drvName == "MapInfo File" )
+        {
+          writableDrivers << "MapInfo MIF";
+        }
+        else if ( drvName == "SQLite" )
         {
-          resultMap.insert( trLongName, drvName );
+          // Unfortunately it seems that there is no simple way to detect if
+          // OGR SQLite driver is compiled with SpatiaLite support.
+          // We have HAVE_SPATIALITE in QGIS, but that may differ from OGR
+          // http://lists.osgeo.org/pipermail/gdal-dev/2012-November/034580.html
+          // -> test if creation failes
+          QString option = "SPATIALITE=YES";
+          char **options =  new char *[2];
+          options[0] = CPLStrdup( option.toLocal8Bit().data() );
+          options[1] = NULL;
+          OGRSFDriverH poDriver;
+          QgsApplication::registerOgrDrivers();
+          poDriver = OGRGetDriverByName( drvName.toLocal8Bit().data() );
+          if ( poDriver )
+          {
+            OGRDataSourceH ds = OGR_Dr_CreateDataSource( poDriver, TO8( QString( "/vsimem/spatialitetest.sqlite" ) ), options );
+            if ( ds )
+            {
+              writableDrivers << "SpatiaLite";
+              OGR_DS_Destroy( ds );
+            }
+          }
+          CPLFree( options[0] );
+          delete [] options;
         }
+        writableDrivers << drvName;
       }
     }
   }
 
+  foreach ( QString drvName, writableDrivers )
+  {
+    QString longName;
+    QString trLongName;
+    QString glob;
+    QString exts;
+    if ( QgsVectorFileWriter::driverMetadata( drvName, longName, trLongName, glob, exts ) && !trLongName.isEmpty() )
+    {
+      resultMap.insert( trLongName, drvName );
+    }
+  }
+
   return resultMap;
 }
 
@@ -935,10 +1005,18 @@ bool QgsVectorFileWriter::driverMetadata( QString driverName, QString &longName,
   }
   else if ( driverName.startsWith( "MapInfo File" ) )
   {
-    longName = "Mapinfo File";
-    trLongName = QObject::tr( "Mapinfo File" );
-    glob = "*.mif *.tab";
-    ext = "mif tab";
+    longName = "Mapinfo TAB";
+    trLongName = QObject::tr( "Mapinfo TAB" );
+    glob = "*.tab";
+    ext = "tab";
+  }
+  // 'MapInfo MIF' is internal QGIS addition to distinguish between MITAB and MIF
+  else if ( driverName.startsWith( "MapInfo MIF" ) )
+  {
+    longName = "Mapinfo MIF";
+    trLongName = QObject::tr( "Mapinfo MIF" );
+    glob = "*.mif";
+    ext = "mif";
   }
   else if ( driverName.startsWith( "DGN" ) )
   {
@@ -968,6 +1046,14 @@ bool QgsVectorFileWriter::driverMetadata( QString driverName, QString &longName,
     glob = "*.sqlite";
     ext = "sqlite";
   }
+  // QGIS internal addition for SpatialLite
+  else if ( driverName.startsWith( "SpatiaLite" ) )
+  {
+    longName = "SpatiaLite";
+    trLongName = QObject::tr( "SpatiaLite" );
+    glob = "*.sqlite";
+    ext = "sqlite";
+  }
   else if ( driverName.startsWith( "DXF" ) )
   {
     longName = "AutoCAD DXF";
diff --git a/src/core/qgsvectorfilewriter.h b/src/core/qgsvectorfilewriter.h
index 0414a7499c7e..5b6fdd659f0a 100644
--- a/src/core/qgsvectorfilewriter.h
+++ b/src/core/qgsvectorfilewriter.h
@@ -69,7 +69,20 @@ class CORE_EXPORT QgsVectorFileWriter
                                                          );
 
     /** Write contents of vector layer to an (OGR supported) vector formt
-        @note: this method was added in version 1.5*/
+        @note: this method was added in version 1.5
+    @param layer layer to write
+    @param fileName file name to write to
+    @param fileEncoding encoding to use
+    @param destCRS pointer to CRS to reproject exported geometries to
+    @param driverName OGR driver to use
+    @param onlySelected write only selected features of layer
+    @param errorMessage pointer to buffer fo error message
+    @param datasourceOptions list of OGR data source creation options
+    @param layerOptions list of OGR layer creation options
+    @param skipAttributeCreation only write geometries
+    @param newFilename QString pointer which will contain the new file name created
+        (in case it is different to fileName).
+    */
     static WriterError writeAsVectorFormat( QgsVectorLayer* layer,
                                             const QString& fileName,
                                             const QString& fileEncoding,
@@ -98,7 +111,10 @@ class CORE_EXPORT QgsVectorFileWriter
     /**Returns map with format filter string as key and OGR format key as value*/
     static QMap< QString, QString> supportedFiltersAndFormats();
 
-    /**Returns driver list that can be used for dialogs*/
+    /**Returns driver list that can be used for dialogs. It contains all OGR drivers
+     * + some additional internal QGIS driver names to distinguish between more
+     * supported formats of the same OGR driver
+     */
     static QMap< QString, QString> ogrDriverList();
 
     /**Returns filter string that can be used for dialogs*/
diff --git a/src/core/qgsvectorlayer.cpp b/src/core/qgsvectorlayer.cpp
index 826a123abf36..f53f32788ffd 100644
--- a/src/core/qgsvectorlayer.cpp
+++ b/src/core/qgsvectorlayer.cpp
@@ -27,6 +27,7 @@
 #include 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -106,6 +107,7 @@ QgsVectorLayer::QgsVectorLayer( QString vectorLayerPath,
     , mDiagramRenderer( 0 )
     , mDiagramLayerSettings( 0 )
     , mValidExtent( false )
+    , mSymbolFeatureCounted( false )
 {
   mActions = new QgsAttributeAction( this );
 
@@ -1451,8 +1453,6 @@ QgsRectangle QgsVectorLayer::boundingBoxOfSelected()
   return retval;
 }
 
-
-
 long QgsVectorLayer::featureCount() const
 {
   if ( !mDataProvider )
@@ -1464,6 +1464,82 @@ long QgsVectorLayer::featureCount() const
   return mDataProvider->featureCount();
 }
 
+long QgsVectorLayer::featureCount( QgsSymbolV2* symbol )
+{
+  if ( !mSymbolFeatureCounted ) return -1;
+  return mSymbolFeatureCountMap.value( symbol );
+}
+
+bool QgsVectorLayer::countSymbolFeatures( bool showProgress )
+{
+  if ( mSymbolFeatureCounted ) return true;
+  mSymbolFeatureCountMap.clear();
+
+  if ( !mDataProvider )
+  {
+    QgsDebugMsg( "invoked with null mDataProvider" );
+    return false;
+  }
+  if ( !mRendererV2 )
+  {
+    QgsDebugMsg( "invoked with null mRendererV2" );
+    return false;
+  }
+
+  QgsLegendSymbolList symbolList = mRendererV2->legendSymbolItems();
+  QgsLegendSymbolList::const_iterator symbolIt = symbolList.constBegin();
+
+  for ( ; symbolIt != symbolList.constEnd(); ++symbolIt )
+  {
+    mSymbolFeatureCountMap.insert( symbolIt->second, 0 );
+  }
+
+  long nFeatures = pendingFeatureCount();
+  QProgressDialog progressDialog( tr( "Updating feature count for layer %1" ).arg( name() ), tr( "Abort" ), 0, nFeatures );
+  progressDialog.setWindowModality( Qt::WindowModal );
+  int featuresCounted = 0;
+
+  select( pendingAllAttributesList(), QgsRectangle(), false, false );
+  QgsFeature f;
+
+  // Renderer (rule based) may depend on context scale, with scale is ignored if 0
+  QgsRenderContext renderContext;
+  renderContext.setRendererScale( 0 );
+  mRendererV2->startRender( renderContext, this );
+
+  while ( nextFeature( f ) )
+  {
+    QgsSymbolV2List featureSymbolList = mRendererV2->symbolsForFeature( f );
+    for ( QgsSymbolV2List::iterator symbolIt = featureSymbolList.begin(); symbolIt != featureSymbolList.end(); ++symbolIt )
+    {
+      mSymbolFeatureCountMap[*symbolIt] += 1;
+    }
+    ++featuresCounted;
+
+    if ( showProgress )
+    {
+      if ( featuresCounted % 50 == 0 )
+      {
+        if ( featuresCounted > nFeatures ) //sometimes the feature count is not correct
+        {
+          progressDialog.setMaximum( 0 );
+        }
+        progressDialog.setValue( featuresCounted );
+        if ( progressDialog.wasCanceled() )
+        {
+          mSymbolFeatureCountMap.clear();
+          mRendererV2->stopRender( renderContext );
+          return false;
+        }
+      }
+    }
+  }
+  mRendererV2->stopRender( renderContext );
+  progressDialog.setValue( nFeatures );
+  mSymbolFeatureCounted = true;
+  return true;
+}
+
 long QgsVectorLayer::updateFeatureCount() const
 {
   return -1;
@@ -1486,6 +1562,7 @@ QgsRectangle QgsVectorLayer::extent()
     return QgsMapLayer::extent();
 
   QgsRectangle rect;
+  rect.setMinimal();
 
   if ( !hasGeometryType() )
     return rect;
@@ -3057,6 +3134,28 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
     //also restore custom properties (for labeling-ng)
     readCustomProperties( node, "labeling" );
 
+    // tab display
+    QDomNode editorLayoutNode = node.namedItem( "editorlayout" );
+    if ( editorLayoutNode.isNull() )
+    {
+      mEditorLayout = GeneratedLayout;
+    }
+    else
+    {
+      if ( editorLayoutNode.toElement().text() == "uifilelayout" )
+      {
+        mEditorLayout = UiFileLayout;
+      }
+      else if ( editorLayoutNode.toElement().text() == "tablayout" )
+      {
+        mEditorLayout = TabLayout;
+      }
+      else
+      {
+        mEditorLayout = GeneratedLayout;
+      }
+    }
+
     // Test if labeling is on or off
     QDomNode labelnode = node.namedItem( "label" );
     QDomElement element = labelnode.toElement();
@@ -3236,6 +3335,7 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
     }
   }
 
+
   //Attributes excluded from WMS and WFS
   mExcludeAttributesWMS.clear();
   QDomNode excludeWMSNode = node.namedItem( "excludeAttributesWMS" );
@@ -3258,9 +3358,49 @@ bool QgsVectorLayer::readSymbology( const QDomNode& node, QString& errorMessage
       mExcludeAttributesWFS.insert( attributeNodeList.at( i ).toElement().text() );
     }
   }
+
+  // tabs and groups display info
+  mAttributeEditorElements.clear();
+  QDomNode attributeEditorFormNode = node.namedItem( "attributeEditorForm" );
+  QDomNodeList attributeEditorFormNodeList = attributeEditorFormNode.toElement().childNodes();
+
+  for ( int i = 0; i < attributeEditorFormNodeList.size(); i++ )
+  {
+    QDomElement elem = attributeEditorFormNodeList.at( i ).toElement();
+
+    QgsAttributeEditorElement *attributeEditorWidget = attributeEditorElementFromDomElement( elem, this );
+    mAttributeEditorElements.append( attributeEditorWidget );
+  }
   return true;
 }
 
+QgsAttributeEditorElement* QgsVectorLayer::attributeEditorElementFromDomElement( QDomElement &elem, QObject* parent )
+{
+  QgsAttributeEditorElement* newElement = NULL;
+
+  if ( elem.tagName() == "attributeEditorContainer" )
+  {
+    QgsAttributeEditorContainer* container = new QgsAttributeEditorContainer( elem.attribute( "name" ), parent );
+
+    QDomNodeList childNodeList = elem.childNodes();
+
+    for ( int i = 0; i < childNodeList.size(); i++ )
+    {
+      QDomElement childElem = childNodeList.at( i ).toElement();
+      QgsAttributeEditorElement* myElem = attributeEditorElementFromDomElement( childElem, container );
+      container->addChildElement( myElem );
+    }
+
+    newElement = container;
+  }
+  else if ( elem.tagName() == "attributeEditorField" )
+  {
+    newElement = new QgsAttributeEditorField( elem.attribute( "name" ), elem.attribute( "idx" ).toInt(), parent );
+  }
+
+  return newElement;
+}
+
 bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString& errorMessage ) const
 {
   QDomElement mapLayerNode = node.toElement();
@@ -3311,6 +3451,26 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
     //save customproperties (for labeling ng)
     writeCustomProperties( node, doc );
 
+    // tab display
+    QDomElement editorLayoutElem  = doc.createElement( "editorlayout" );
+    switch ( mEditorLayout )
+    {
+      case UiFileLayout:
+        editorLayoutElem.appendChild( doc.createTextNode( "uifilelayout" ) );
+        break;
+
+      case TabLayout:
+        editorLayoutElem.appendChild( doc.createTextNode( "tablayout" ) );
+        break;
+
+      case GeneratedLayout:
+      default:
+        editorLayoutElem.appendChild( doc.createTextNode( "generatedlayout" ) );
+        break;
+    }
+
+    node.appendChild( editorLayoutElem );
+
     // add the display field
     QDomElement dField  = doc.createElement( "displayfield" );
     QDomText dFieldText = doc.createTextNode( displayField() );
@@ -3497,6 +3657,20 @@ bool QgsVectorLayer::writeSymbology( QDomNode& node, QDomDocument& doc, QString&
   }
   node.appendChild( excludeWFSElem );
 
+  // tabs and groups of edit form
+  if ( mAttributeEditorElements.size() > 0 )
+  {
+    QDomElement tabsElem = doc.createElement( "attributeEditorForm" );
+
+    for ( QList< QgsAttributeEditorElement* >::const_iterator it = mAttributeEditorElements.begin(); it != mAttributeEditorElements.end(); it++ )
+    {
+      QDomElement attributeEditorWidgetElem = ( *it )->toDomElement( doc );
+      tabsElem.appendChild( attributeEditorWidgetElem );
+    }
+
+    node.appendChild( tabsElem );
+  }
+
   // add attribute actions
   mActions->writeXML( node, doc );
 
@@ -3646,6 +3820,11 @@ void QgsVectorLayer::addAttributeAlias( int attIndex, QString aliasString )
   emit layerModified( false );
 }
 
+void QgsVectorLayer::addAttributeEditorWidget( QgsAttributeEditorElement* data )
+{
+  mAttributeEditorElements.append( data );
+}
+
 QString QgsVectorLayer::attributeAlias( int attributeIndex ) const
 {
   if ( !pendingFields().contains( attributeIndex ) )
@@ -4706,6 +4885,16 @@ void QgsVectorLayer::setEditType( int idx, EditType type )
     mEditTypes[ fields[idx].name()] = type;
 }
 
+QgsVectorLayer::EditorLayout QgsVectorLayer::editorLayout()
+{
+  return mEditorLayout;
+}
+
+void QgsVectorLayer::setEditorLayout( EditorLayout editorLayout )
+{
+  mEditorLayout = editorLayout;
+}
+
 QString QgsVectorLayer::editForm()
 {
   return mEditForm;
@@ -4814,6 +5003,8 @@ void QgsVectorLayer::setRendererV2( QgsFeatureRendererV2 *r )
       setUsingRendererV2( true );
     delete mRendererV2;
     mRendererV2 = r;
+    mSymbolFeatureCounted = false;
+    mSymbolFeatureCountMap.clear();
   }
 }
 bool QgsVectorLayer::isUsingRendererV2()
@@ -5375,14 +5566,14 @@ QVariant QgsVectorLayer::minimumValue( int index )
   }
   else // a joined field?
   {
-    int indexOffset; //offset between layer index and joined provider index
+    int indexOffset = 0; //offset between layer index and joined provider index
     const QgsVectorJoinInfo* join = mJoinBuffer->joinForFieldIndex( index, maxProviderIndex, indexOffset );
     if ( join )
     {
       QgsVectorLayer* vl = dynamic_cast( QgsMapLayerRegistry::instance()->mapLayer( join->joinLayerId ) );
       if ( vl )
       {
-        return vl->minimumValue( index );
+        return vl->minimumValue( index - indexOffset );
       }
     }
   }
@@ -5429,14 +5620,14 @@ QVariant QgsVectorLayer::maximumValue( int index )
   }
   else // a joined field?
   {
-    int indexOffset; //offset between layer index and joined provider index
+    int indexOffset = 0; //offset between layer index and joined provider index
     const QgsVectorJoinInfo* join = mJoinBuffer->joinForFieldIndex( index, maxProviderIndex, indexOffset );
     if ( join )
     {
       QgsVectorLayer* vl = dynamic_cast( QgsMapLayerRegistry::instance()->mapLayer( join->joinLayerId ) );
       if ( vl )
       {
-        return vl->maximumValue( index );
+        return vl->maximumValue( index - indexOffset );
       }
     }
   }
@@ -5508,6 +5699,21 @@ void QgsVectorLayer::prepareLabelingAndDiagrams( QgsRenderContext& rendererConte
     labeling = true;
   }
 
+  if ( labeling )
+  {
+    // see if feature count limit is set for labeling
+    QgsPalLayerSettings& palyr = rendererContext.labelingEngine()->layer( this->id() );
+    if ( palyr.limitNumLabels && palyr.maxNumLabels > 0 )
+    {
+      select( QgsAttributeList(), rendererContext.extent() );
+      // total number of features that may be labeled
+      QgsFeature ftr;
+      int nFeatsToLabel = 0;
+      while ( nextFeature( ftr ) ) { nFeatsToLabel += 1; }
+      palyr.mFeaturesToLabel = nFeatsToLabel;
+    }
+  }
+
   //register diagram layers
   if ( mDiagramRenderer && mDiagramLayerSettings )
   {
@@ -5798,3 +6004,38 @@ QgsVectorLayer::ValueRelationData &QgsVectorLayer::valueRelation( int idx )
 
   return mValueRelations[ fields[idx].name()];
 }
+
+QList &QgsVectorLayer::attributeEditorElements()
+{
+  return mAttributeEditorElements;
+}
+
+void QgsVectorLayer::clearAttributeEditorWidgets()
+{
+  mAttributeEditorElements.clear();
+}
+
+QDomElement QgsAttributeEditorContainer::toDomElement( QDomDocument& doc ) const
+{
+  QDomElement elem = doc.createElement( "attributeEditorContainer" );
+  elem.setAttribute( "name", mName );
+  for ( QList< QgsAttributeEditorElement* >::const_iterator it = mChildren.begin(); it != mChildren.end(); ++it )
+  {
+    elem.appendChild(( *it )->toDomElement( doc ) );
+  }
+  return elem;
+}
+
+
+void QgsAttributeEditorContainer::addChildElement( QgsAttributeEditorElement *widget )
+{
+  mChildren.append( widget );
+}
+
+QDomElement QgsAttributeEditorField::toDomElement( QDomDocument& doc ) const
+{
+  QDomElement elem = doc.createElement( "attributeEditorField" );
+  elem.setAttribute( "name", mName );
+  elem.setAttribute( "index", mIdx );
+  return elem;
+}
diff --git a/src/core/qgsvectorlayer.h b/src/core/qgsvectorlayer.h
index 7518372272f7..d532c1ced116 100644
--- a/src/core/qgsvectorlayer.h
+++ b/src/core/qgsvectorlayer.h
@@ -49,10 +49,72 @@ class QgsVectorLayerJoinBuffer;
 class QgsFeatureRendererV2;
 class QgsDiagramRendererV2;
 class QgsDiagramLayerSettings;
+class QgsSymbolV2;
 
 typedef QList QgsAttributeList;
 typedef QSet QgsAttributeIds;
 
+/** @note Added in 1.9 */
+class CORE_EXPORT QgsAttributeEditorElement : public QObject
+{
+    Q_OBJECT
+  public:
+
+    enum AttributeEditorType
+    {
+      AeTypeContainer,
+      AeTypeField,
+      AeTypeInvalid
+    };
+
+    QgsAttributeEditorElement( AttributeEditorType type, QString name, QObject *parent = NULL )
+        : QObject( parent ), mType( type ), mName( name ) {}
+
+    virtual ~QgsAttributeEditorElement() {}
+
+    QString name() const { return mName; }
+    AttributeEditorType type() const { return mType; }
+
+    virtual QDomElement toDomElement( QDomDocument& doc ) const = 0;
+
+  protected:
+    AttributeEditorType mType;
+    QString mName;
+};
+
+/** @note Added in 1.9 */
+class CORE_EXPORT QgsAttributeEditorContainer : public QgsAttributeEditorElement
+{
+  public:
+    QgsAttributeEditorContainer( QString name, QObject *parent )
+        : QgsAttributeEditorElement( AeTypeContainer, name, parent ) {}
+
+    ~QgsAttributeEditorContainer() {}
+
+    virtual QDomElement toDomElement( QDomDocument& doc ) const;
+    virtual void addChildElement( QgsAttributeEditorElement *widget );
+    QList children() const { return mChildren; }
+
+  private:
+    QList mChildren;
+};
+
+/** @note Added in 1.9 */
+class CORE_EXPORT QgsAttributeEditorField : public QgsAttributeEditorElement
+{
+  public:
+    QgsAttributeEditorField( QString name , int idx, QObject *parent )
+        : QgsAttributeEditorElement( AeTypeField, name, parent ), mIdx( idx ) {}
+
+    ~QgsAttributeEditorField() {}
+
+    virtual QDomElement toDomElement( QDomDocument& doc ) const;
+    int idx() const { return mIdx; }
+
+  private:
+    int mIdx;
+};
+
 /** @note added in 1.7 */
 struct CORE_EXPORT QgsVectorJoinInfo
 {
@@ -89,6 +151,14 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     Q_OBJECT
 
   public:
+    /** The different types to layout the attribute editor. @note added in 1.9 */
+    enum EditorLayout
+    {
+      GeneratedLayout = 0,
+      TabLayout = 1,
+      UiFileLayout = 2
+    };
+
     enum EditType
     {
       LineEdit,
@@ -148,6 +218,25 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
       bool mAllowMulti;  /* allow selection of multiple keys @added in 1.9 */
     };
 
+    struct GroupData
+    {
+      GroupData() {}
+      GroupData( QString name , QList fields )
+          : mName( name ), mFields( fields ) {}
+      QString mName;
+      QList mFields;
+    };
+
+    struct TabData
+    {
+      TabData() {}
+      TabData( QString name , QList fields , QList groups )
+          : mName( name ), mFields( fields ), mGroups( groups ) {}
+      QString mName;
+      QList mFields;
+      QList mGroups;
+    };
+
     /** Constructor */
     QgsVectorLayer( QString path = QString::null, QString baseName = QString::null,
                     QString providerLib = QString::null, bool loadDefaultStyleFlag = true );
@@ -296,6 +385,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      */
     virtual bool writeXml( QDomNode & layer_node, QDomDocument & doc );
 
+    /** convert a saved attribute editor element into a AttributeEditor structure as it's used internally.
+     * @param elem the DOM element
+     * @param parent the QObject which will own this object
+     */
+    static QgsAttributeEditorElement* attributeEditorElementFromDomElement( QDomElement &elem, QObject* parent );
+
     /** Read the symbology for the current layer from the Dom node supplied.
      * @param node node that will contain the symbology definition for this layer.
      * @param errorMessage reference to string that will be updated with any error messages
@@ -323,6 +418,21 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
      */
     virtual long featureCount() const;
 
+    /**
+     * Number of features rendered with specified symbol. Features must be first
+     * calculated by countSymbolFeatures()
+     * @param symbol the symbol
+     * @return number of features rendered by symbol or -1 if failed or counts are not available
+     */
+    long featureCount( QgsSymbolV2* symbol );
+
+    /**
+     * Count features for symbols. Feature counts may be get by featureCount( QgsSymbolV2*).
+     * @param showProgress show progress dialog
+     * @return true if calculated, false if failed or was canceled by user
+     */
+    bool countSymbolFeatures( bool showProgress = true );
+
     /** This function does nothing useful, it's kept only for compatibility.
      * @todo to be removed
      */
@@ -564,6 +674,16 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
       @note added in version 1.2*/
     void addAttributeAlias( int attIndex, QString aliasString );
 
+    /**Adds a tab (for the attribute editor form) holding groups and fields
+      @note added in version 1.9*/
+    void addAttributeEditorWidget( QgsAttributeEditorElement* data );
+    /**Returns a list of tabs holding groups and fields
+      @note added in version 1.9*/
+    QList< QgsAttributeEditorElement* > &attributeEditorElements();
+    /**Clears all the tabs for the attribute editor form
+      @note added in version 1.9*/
+    void clearAttributeEditorWidgets();
+
     /**Returns the alias of an attribute name or an empty string if there is no alias
       @note added in version 1.2*/
     QString attributeAlias( int attributeIndex ) const;
@@ -616,6 +736,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /**set edit type*/
     void setEditType( int idx, EditType edit );
 
+    /** get the active layout for the attribute editor for this layer (added in 1.9) */
+    EditorLayout editorLayout();
+
+    /** set the active layout for the attribute editor for this layer (added in 1.9) */
+    void setEditorLayout( EditorLayout editorLayout );
+
     /** set string representing 'true' for a checkbox (added in 1.4) */
     void setCheckedState( int idx, QString checked, QString notChecked );
 
@@ -974,11 +1100,17 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /**Map that stores the aliases for attributes. Key is the attribute name and value the alias for that attribute*/
     QMap< QString, QString > mAttributeAliasMap;
 
+    /**Stores a list of attribute editor elements (Each holding a tree structure for a tab in the attribute editor)*/
+    QList< QgsAttributeEditorElement* > mAttributeEditorElements;
+
     /**Attributes which are not published in WMS*/
     QSet mExcludeAttributesWMS;
     /**Attributes which are not published in WFS*/
     QSet mExcludeAttributesWFS;
 
+    /**Map that stores the tab for attributes in the edit form. Key is the tab order and value the tab name*/
+    QList< TabData > mTabs;
+
     /** max field index */
     int mMaxUpdatedIndex;
 
@@ -1008,10 +1140,10 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     /** The current size of editing marker */
     int mCurrentVertexMarkerSize;
 
-    /**Flag if the vertex markers should be drawn only for selection (true) or for all features (false)*/
+    /** Flag if the vertex markers should be drawn only for selection (true) or for all features (false) */
     bool mVertexMarkerOnlyForSelection;
 
-    /**List of overlays. Vector overlays will be rendered on top of all maplayers*/
+    /** List of overlays. Vector overlays will be rendered on top of all maplayers */
     QList mOverlays;
 
     QStringList mCommitErrors;
@@ -1022,6 +1154,9 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     QMap< QString, QPair > mCheckedStates;
     QMap< QString, ValueRelationData > mValueRelations;
 
+    /** Defines the default layout to use for the attribute editor (Drag and drop, UI File, Generated) */
+    EditorLayout mEditorLayout;
+
     QString mEditForm, mEditFormInit;
     //annotation form for this layer
     QString mAnnotationForm;
@@ -1046,6 +1181,12 @@ class CORE_EXPORT QgsVectorLayer : public QgsMapLayer
     QgsDiagramLayerSettings *mDiagramLayerSettings;
 
     bool mValidExtent;
+
+    // Features in renderer classes counted
+    bool mSymbolFeatureCounted;
+
+    // Feature counts for each renderer symbol
+    QMap mSymbolFeatureCountMap;
 };
 
 #endif
diff --git a/src/core/qgsvectorlayerimport.cpp b/src/core/qgsvectorlayerimport.cpp
index e0cc612f762c..0e6349b5ad7a 100644
--- a/src/core/qgsvectorlayerimport.cpp
+++ b/src/core/qgsvectorlayerimport.cpp
@@ -121,11 +121,12 @@ bool QgsVectorLayerImport::addFeature( QgsFeature& feat )
   const QgsAttributeMap &attrs = feat.attributeMap();
 
   QgsFeature newFeat;
-  newFeat.setGeometry( *feat.geometry() );
+  if ( feat.geometry() )
+    newFeat.setGeometry( *feat.geometry() );
 
   for ( QgsAttributeMap::const_iterator it = attrs.begin(); it != attrs.end(); it++ )
   {
-    // add only mapped attributes (un-mapped ones are not present in the
+    // add only mapped attributes (un-mapped ones will not be present in the
     // destination layer)
     if ( mOldToNewAttrIdx.contains( it.key() ) )
     {
@@ -203,7 +204,19 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer* layer,
     outputCRS = &layer->crs();
   }
 
+
+  bool overwrite = false;
+  bool forceSinglePartGeom = false;
+  if ( options )
+  {
+    overwrite = options->take( "overwrite" ).toBool();
+    forceSinglePartGeom = options->take( "forceSinglePartGeometryType" ).toBool();
+  }
+
   QgsFieldMap fields = skipAttributeCreation ? QgsFieldMap() : layer->pendingFields();
+  QGis::WkbType wkbType = layer->wkbType();
+
+  // Special handling for Shapefiles
   if ( layer->providerType() == "ogr" && layer->storageType() == "ESRI Shapefile" )
   {
     // convert field names to lowercase
@@ -211,16 +224,38 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer* layer,
     {
       fldIt.value().setName( fldIt.value().name().toLower() );
     }
-  }
 
-  bool overwrite = false;
-  if ( options )
-  {
-    overwrite = options->take( "overwrite" ).toBool();
+    if ( !forceSinglePartGeom )
+    {
+      // convert wkbtype to multipart (see #5547)
+      switch ( wkbType )
+      {
+        case QGis::WKBPoint:
+          wkbType = QGis::WKBMultiPoint;
+          break;
+        case QGis::WKBLineString:
+          wkbType = QGis::WKBMultiLineString;
+          break;
+        case QGis::WKBPolygon:
+          wkbType = QGis::WKBMultiPolygon;
+          break;
+        case QGis::WKBPoint25D:
+          wkbType = QGis::WKBMultiPoint25D;
+          break;
+        case QGis::WKBLineString25D:
+          wkbType = QGis::WKBMultiLineString25D;
+          break;
+        case QGis::WKBPolygon25D:
+          wkbType = QGis::WKBMultiPolygon25D;
+          break;
+        default:
+          break;
+      }
+    }
   }
 
   QgsVectorLayerImport * writer =
-    new QgsVectorLayerImport( uri, providerKey, fields, layer->wkbType(), outputCRS, overwrite, options );
+    new QgsVectorLayerImport( uri, providerKey, fields, wkbType, outputCRS, overwrite, options );
 
   // check whether file creation was successful
   ImportError err = writer->hasError();
@@ -240,7 +275,7 @@ QgsVectorLayerImport::importLayer( QgsVectorLayer* layer,
   QgsAttributeList allAttr = skipAttributeCreation ? QgsAttributeList() : layer->pendingAllAttributesList();
   QgsFeature fet;
 
-  layer->select( allAttr, QgsRectangle(), layer->wkbType() != QGis::WKBNoGeometry );
+  layer->select( allAttr, QgsRectangle(), wkbType != QGis::WKBNoGeometry );
 
   const QgsFeatureIds& ids = layer->selectedFeaturesIds();
 
diff --git a/src/core/raster/qgsmultibandcolorrenderer.cpp b/src/core/raster/qgsmultibandcolorrenderer.cpp
index ec03b5fe7b3c..adfa19bd8edf 100644
--- a/src/core/raster/qgsmultibandcolorrenderer.cpp
+++ b/src/core/raster/qgsmultibandcolorrenderer.cpp
@@ -57,7 +57,6 @@ QgsRasterInterface * QgsMultiBandColorRenderer::clone() const
   }
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setInvertColor( mInvertColor );
   renderer->setRasterTransparency( mRasterTransparency );
 
   return renderer;
@@ -136,8 +135,7 @@ QgsRasterBlock* QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle  cons
   //In some (common) cases, we can simplify the drawing loop considerably and save render time
   bool fastDraw = ( !usesTransparency()
                     && mRedBand > 0 && mGreenBand > 0 && mBlueBand > 0
-                    && mAlphaBand < 1 && !mRedContrastEnhancement && !mGreenContrastEnhancement && !mBlueContrastEnhancement
-                    && !mInvertColor );
+                    && mAlphaBand < 1 && !mRedContrastEnhancement && !mGreenContrastEnhancement && !mBlueContrastEnhancement );
 
   QSet bands;
   if ( mRedBand > 0 )
@@ -243,7 +241,9 @@ QgsRasterBlock* QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle  cons
     }
 
     bool isNoData = false;
-    double redVal, greenVal, blueVal;
+    double redVal = 0;
+    double greenVal = 0;
+    double blueVal = 0;
     if ( mRedBand > 0 )
     {
       redVal = redBlock->value( i );
@@ -288,13 +288,6 @@ QgsRasterBlock* QgsMultiBandColorRenderer::block( int bandNo, QgsRectangle  cons
       blueVal = mBlueContrastEnhancement->enhanceContrast( blueVal );
     }
 
-    if ( mInvertColor )
-    {
-      redVal = 255 - redVal;
-      greenVal = 255 - greenVal;
-      blueVal = 255 - blueVal;
-    }
-
     //opacity
     double currentOpacity = mOpacity;
     if ( mRasterTransparency )
diff --git a/src/core/raster/qgspalettedrasterrenderer.cpp b/src/core/raster/qgspalettedrasterrenderer.cpp
index b9a1e6499d59..37b1beb4cb0e 100644
--- a/src/core/raster/qgspalettedrasterrenderer.cpp
+++ b/src/core/raster/qgspalettedrasterrenderer.cpp
@@ -39,7 +39,6 @@ QgsRasterInterface * QgsPalettedRasterRenderer::clone() const
   QgsPalettedRasterRenderer * renderer = new QgsPalettedRasterRenderer( 0, mBand, colors(), mNColors );
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setInvertColor( mInvertColor );
   renderer->setRasterTransparency( mRasterTransparency );
   return renderer;
 }
@@ -179,14 +178,7 @@ QgsRasterBlock * QgsPalettedRasterRenderer::block( int bandNo, QgsRectangle  con
       }
       QColor& currentColor = mColors[val];
 
-      if ( mInvertColor )
-      {
-        outputBlock->setColor( i, qRgba( currentOpacity * currentColor.blue(), currentOpacity * currentColor.green(), currentOpacity * currentColor.red(), currentOpacity * 255 ) );
-      }
-      else
-      {
-        outputBlock->setColor( i, qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 ) );
-      }
+      outputBlock->setColor( i, qRgba( currentOpacity * currentColor.red(), currentOpacity * currentColor.green(), currentOpacity * currentColor.blue(), currentOpacity * 255 ) );
     }
   }
 
diff --git a/src/core/raster/qgsrasterblock.cpp b/src/core/raster/qgsrasterblock.cpp
index c265fae0a8e8..bed5d318a5e7 100644
--- a/src/core/raster/qgsrasterblock.cpp
+++ b/src/core/raster/qgsrasterblock.cpp
@@ -413,12 +413,16 @@ bool QgsRasterBlock::convert( QgsRasterBlock::DataType destDataType )
     }
     QgsFree( mData );
     mData = data;
+    mDataType = destDataType;
+    mTypeSize = typeSize( mDataType );
   }
   else if ( typeIsColor( mDataType ) && typeIsColor( destDataType ) )
   {
     QImage::Format format = imageFormat( destDataType );
     QImage image = mImage->convertToFormat( format );
     *mImage = image;
+    mDataType = destDataType;
+    mTypeSize = typeSize( mDataType );
   }
   else
   {
@@ -516,7 +520,7 @@ void * QgsRasterBlock::convert( void *srcData, QgsRasterBlock::DataType srcDataT
     double value = readValue( srcData, srcDataType, i );
     writeValue( destData, destDataType, i, value );
     //double newValue = readValue( destData, destDataType, i );
-    //QgsDebugMsg( QString("convert type %1 to %2: %3 -> %4").arg(srcDataType).arg(destDataType).arg( value ).arg( newValue ) );
+    //QgsDebugMsg( QString("convert %1 type %2 to %3: %4 -> %5").arg(i).arg(srcDataType).arg(destDataType).arg( value ).arg( newValue ) );
   }
   return destData;
 }
diff --git a/src/core/raster/qgsrasterchecker.cpp b/src/core/raster/qgsrasterchecker.cpp
index 86ebcf98d3f6..147b2fde9b77 100644
--- a/src/core/raster/qgsrasterchecker.cpp
+++ b/src/core/raster/qgsrasterchecker.cpp
@@ -13,6 +13,7 @@
  *                                                                         *
  ***************************************************************************/
 
+#include "qgsproviderregistry.h"
 #include "qgsrasterchecker.h"
 #include "qgsrasterdataprovider.h"
 #include "qgsrasterlayer.h"
@@ -43,14 +44,16 @@ bool QgsRasterChecker::runTest( QString theVerifiedKey, QString theVerifiedUri,
   bool ok = true;
   mReport += "\n\n";
 
-  QgsRasterDataProvider* verifiedProvider = QgsRasterLayer::loadProvider( theVerifiedKey, theVerifiedUri );
+  //QgsRasterDataProvider* verifiedProvider = QgsRasterLayer::loadProvider( theVerifiedKey, theVerifiedUri );
+  QgsRasterDataProvider* verifiedProvider = ( QgsRasterDataProvider* ) QgsProviderRegistry::instance()->provider( theVerifiedKey, theVerifiedUri );
   if ( !verifiedProvider || !verifiedProvider->isValid() )
   {
     error( QString( "Cannot load provider %1 with URI: %2" ).arg( theVerifiedKey ).arg( theVerifiedUri ), mReport );
     ok = false;
   }
 
-  QgsRasterDataProvider* expectedProvider = QgsRasterLayer::loadProvider( theExpectedKey, theExpectedUri );
+  //QgsRasterDataProvider* expectedProvider = QgsRasterLayer::loadProvider( theExpectedKey, theExpectedUri );
+  QgsRasterDataProvider* expectedProvider = ( QgsRasterDataProvider* ) QgsProviderRegistry::instance()->provider( theExpectedKey, theExpectedUri );
   if ( !expectedProvider || !expectedProvider->isValid() )
   {
     error( QString( "Cannot load provider %1 with URI: %2" ).arg( theExpectedKey ).arg( theExpectedUri ), mReport );
diff --git a/src/core/raster/qgsrasterdataprovider.h b/src/core/raster/qgsrasterdataprovider.h
index a771be891c62..28e3e80f9c64 100644
--- a/src/core/raster/qgsrasterdataprovider.h
+++ b/src/core/raster/qgsrasterdataprovider.h
@@ -25,6 +25,7 @@
 #include "qgslogger.h"
 #include "qgsrectangle.h"
 #include "qgsdataprovider.h"
+#include "qgserror.h"
 #include "qgsrasterinterface.h"
 #include "qgscolorrampshader.h"
 #include "qgsrasterpyramid.h"
@@ -144,31 +145,6 @@ class CORE_EXPORT QgsRasterDataProvider : public QgsDataProvider, public QgsRast
     /* It makes no sense to set input on provider */
     bool setInput( QgsRasterInterface* input ) { Q_UNUSED( input ); return false; }
 
-    /**
-     * Add the list of WMS layer names to be rendered by this server
-     */
-    virtual void addLayers( const QStringList & layers,
-                            const QStringList & styles = QStringList() ) = 0;
-
-    //! get raster image encodings supported by (e.g.) the WMS Server, expressed as MIME types
-    virtual QStringList supportedImageEncodings() = 0;
-
-    /**
-     * Get the image encoding (as a MIME type) used in the transfer from (e.g.) the WMS server
-     */
-    virtual QString imageEncoding() const = 0;
-
-    /**
-     * Set the image encoding (as a MIME type) used in the transfer from (e.g.) the WMS server
-     */
-    virtual void setImageEncoding( const QString & mimeType ) = 0;
-
-    /**
-     * Set the image projection (in WMS CRS format) used in the transfer from (e.g.) the WMS server
-     */
-    virtual void setImageCrs( const QString & crs ) = 0;
-
-
     // TODO: Document this better.
     /** \brief   Renders the layer as an image
      */
diff --git a/src/core/raster/qgsrasterfilewriter.cpp b/src/core/raster/qgsrasterfilewriter.cpp
index 1026d1296d45..21bc2c4a4cca 100644
--- a/src/core/raster/qgsrasterfilewriter.cpp
+++ b/src/core/raster/qgsrasterfilewriter.cpp
@@ -668,7 +668,8 @@ void QgsRasterFileWriter::buildPyramids( const QString& filename )
 void QgsRasterFileWriter::buildPyramids( const QString& filename )
 {
   // open new dataProvider so we can build pyramids with it
-  QgsRasterDataProvider* destProvider = QgsRasterLayer::loadProvider( mOutputProviderKey, filename );
+  //QgsRasterDataProvider* destProvider = QgsRasterLayer::loadProvider( mOutputProviderKey, filename );
+  QgsRasterDataProvider* destProvider = ( QgsRasterDataProvider* ) QgsProviderRegistry::instance()->provider( mOutputProviderKey, filename );
   if ( !destProvider )
   {
     return;
@@ -834,7 +835,8 @@ QgsRasterDataProvider* QgsRasterFileWriter::createPartProvider( const QgsRectang
   QgsRectangle mapRect( mapLeft, mapBottom, mapRight, mapTop );
 
   QString outputFile = outputUrl + "/" + QString::number( fileIndex );
-  QgsRasterDataProvider* destProvider = QgsRasterLayer::loadProvider( mOutputProviderKey, outputFile );
+  //QgsRasterDataProvider* destProvider = QgsRasterLayer::loadProvider( mOutputProviderKey, outputFile );
+  QgsRasterDataProvider* destProvider = ( QgsRasterDataProvider* ) QgsProviderRegistry::instance()->provider( mOutputProviderKey, outputFile );
   if ( !destProvider )
   {
     return 0;
@@ -869,7 +871,8 @@ QgsRasterDataProvider* QgsRasterFileWriter::initOutput( int nCols, int nRows, co
   }
   else
   {
-    QgsRasterDataProvider* destProvider = QgsRasterLayer::loadProvider( mOutputProviderKey, mOutputUrl );
+    //QgsRasterDataProvider* destProvider = QgsRasterLayer::loadProvider( mOutputProviderKey, mOutputUrl );
+    QgsRasterDataProvider* destProvider = ( QgsRasterDataProvider* ) QgsProviderRegistry::instance()->provider( mOutputProviderKey, mOutputUrl );
     if ( !destProvider )
     {
       return 0;
diff --git a/src/core/raster/qgsrasterlayer.cpp b/src/core/raster/qgsrasterlayer.cpp
index ecd8fdff4a3f..75746f13afb3 100644
--- a/src/core/raster/qgsrasterlayer.cpp
+++ b/src/core/raster/qgsrasterlayer.cpp
@@ -86,6 +86,8 @@ typedef bool isvalidrasterfilename_t( QString const & theFileNameQString, QStrin
 // doubles can take for the current system.  (Yes, 20 was arbitrary.)
 #define TINY_VALUE  std::numeric_limits::epsilon() * 20
 
+#define ERR(message) QGS_ERROR_MESSAGE(message,"Raster layer")
+
 const double QgsRasterLayer::CUMULATIVE_CUT_LOWER = 0.02;
 const double QgsRasterLayer::CUMULATIVE_CUT_UPPER = 0.98;
 const double QgsRasterLayer::SAMPLE_SIZE = 250000;
@@ -121,6 +123,7 @@ QgsRasterLayer::QgsRasterLayer(
   // TODO, call constructor with provider key
   init();
   setDataProvider( "gdal" );
+  if ( !mValid ) return;
 
   bool defaultLoadedFlag = false;
   if ( mValid && loadDefaultStyleFlag )
@@ -157,6 +160,7 @@ QgsRasterLayer::QgsRasterLayer( const QString & uri,
   QgsDebugMsg( "Entered" );
   init();
   setDataProvider( providerKey );
+  if ( !mValid ) return;
 
   // load default style
   bool defaultLoadedFlag = false;
@@ -189,6 +193,8 @@ QgsRasterLayer::QgsRasterLayer( const QString & uri,
 QgsRasterLayer::~QgsRasterLayer()
 {
   mValid = false;
+  // TODO fix this - provider is not deleted!
+  //delete mDataProvider; // deleted by pipe
 }
 
 //////////////////////////////////////////////////////////
@@ -207,21 +213,14 @@ QgsRasterLayer::~QgsRasterLayer()
 void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersString )
 {
   QgsDebugMsg( "Entered" );
-  QLibrary*  myLib = QgsRasterLayer::loadProviderLibrary( "gdal" );
-  if ( !myLib )
-  {
-    QgsDebugMsg( "Could not load gdal provider library" );
-    return;
-  }
-  buildsupportedrasterfilefilter_t *pBuild = ( buildsupportedrasterfilefilter_t * ) cast_to_fptr( myLib->resolve( "buildSupportedRasterFileFilter" ) );
+  buildsupportedrasterfilefilter_t *pBuild = ( buildsupportedrasterfilefilter_t * ) cast_to_fptr( QgsProviderRegistry::instance()->function( "gdal", "buildSupportedRasterFileFilter" ) );
   if ( ! pBuild )
   {
-    QgsDebugMsg( "Could not resolve buildSupportedRasterFileFilter in gdal provider library" );
+    QgsDebugMsg( "Could get buildSupportedRasterFileFilter in gdal provider library" );
     return;
   }
 
   pBuild( theFileFiltersString );
-  delete myLib;
 }
 
 /**
@@ -229,14 +228,7 @@ void QgsRasterLayer::buildSupportedRasterFileFilter( QString & theFileFiltersStr
  */
 bool QgsRasterLayer::isValidRasterFileName( QString const & theFileNameQString, QString & retErrMsg )
 {
-
-  QLibrary*  myLib = QgsRasterLayer::loadProviderLibrary( "gdal" );
-  if ( !myLib )
-  {
-    QgsDebugMsg( "Could not load gdal provider library" );
-    return false;
-  }
-  isvalidrasterfilename_t *pValid = ( isvalidrasterfilename_t * ) cast_to_fptr( myLib->resolve( "isValidRasterFileName" ) );
+  isvalidrasterfilename_t *pValid = ( isvalidrasterfilename_t * ) cast_to_fptr( QgsProviderRegistry::instance()->function( "gdal",  "isValidRasterFileName" ) );
   if ( ! pValid )
   {
     QgsDebugMsg( "Could not resolve isValidRasterFileName in gdal provider library" );
@@ -244,7 +236,6 @@ bool QgsRasterLayer::isValidRasterFileName( QString const & theFileNameQString,
   }
 
   bool myIsValid = pValid( theFileNameQString, retErrMsg );
-  delete myLib;
   return myIsValid;
 }
 
@@ -929,12 +920,12 @@ bool QgsRasterLayer::hasStatistics( int theBandNo )
 }
 #endif
 
+#if 0
 /**
  * @param thePoint the QgsPoint for which to obtain pixel values
  * @param theResults QMap to hold the pixel values at thePoint for each layer in the raster file
  * @return False if WMS layer and true otherwise
  */
-#if 0
 bool QgsRasterLayer::identify( const QgsPoint& thePoint, QMap& theResults )
 {
   theResults.clear();
@@ -1029,10 +1020,6 @@ QString QgsRasterLayer::identifyAsHtml( const QgsPoint& thePoint )
 }
 #endif
 
-/**
- * @note Note implemented yet
- * @return Always returns false
- */
 bool QgsRasterLayer::isEditable() const
 {
   return false;
@@ -1587,96 +1574,18 @@ void QgsRasterLayer::init()
   mLastViewPort.drawableAreaYDim = 0;
 }
 
-QLibrary* QgsRasterLayer::loadProviderLibrary( QString theProviderKey )
-{
-  QgsDebugMsg( "theProviderKey = " + theProviderKey );
-  // load the plugin
-  QgsProviderRegistry * pReg = QgsProviderRegistry::instance();
-  QString myLibPath = pReg->library( theProviderKey );
-  QgsDebugMsg( "myLibPath = " + myLibPath );
-
-#ifdef TESTPROVIDERLIB
-  const char *cOgrLib = ( const char * ) myLibPath;
-  // test code to help debug provider loading problems
-  //  void *handle = dlopen(cOgrLib, RTLD_LAZY);
-  void *handle = dlopen( cOgrLib, RTLD_LAZY | RTLD_GLOBAL );
-  if ( !handle )
-  {
-    QgsLogger::warning( "Error in dlopen: " );
-  }
-  else
-  {
-    QgsDebugMsg( "dlopen suceeded" );
-    dlclose( handle );
-  }
-
-#endif
-
-  // load the data provider
-  QLibrary*  myLib = new QLibrary( myLibPath );
-
-  QgsDebugMsg( "Library name is " + myLib->fileName() );
-  bool loaded = myLib->load();
-
-  if ( !loaded )
-  {
-    QgsMessageLog::logMessage( tr( "Failed to load provider %1 (Reason: %2)" ).arg( myLib->fileName() ).arg( myLib->errorString() ), tr( "Raster" ) );
-    return NULL;
-  }
-  QgsDebugMsg( "Loaded data provider library" );
-  return myLib;
-}
-
-// This code should be shared also by vector layer -> move it to QgsMapLayer
-QgsRasterDataProvider* QgsRasterLayer::loadProvider( QString theProviderKey, QString theDataSource )
+void QgsRasterLayer::setDataProvider( QString const & provider )
 {
   QgsDebugMsg( "Entered" );
-  QLibrary*  myLib = QgsRasterLayer::loadProviderLibrary( theProviderKey );
-  QgsDebugMsg( "Library loaded" );
-  if ( !myLib )
-  {
-    QgsDebugMsg( "myLib is NULL" );
-    return NULL;
-  }
-
-  QgsDebugMsg( "Attempting to resolve the classFactory function" );
-  classFactoryFunction_t * classFactory = ( classFactoryFunction_t * ) cast_to_fptr( myLib->resolve( "classFactory" ) );
-
-  if ( !classFactory )
-  {
-    QgsMessageLog::logMessage( tr( "Cannot resolve the classFactory function" ), tr( "Raster" ) );
-    return NULL;
-  }
-  QgsDebugMsg( "Getting pointer to a mDataProvider object from the library" );
-  //XXX - This was a dynamic cast but that kills the Windows
-  //      version big-time with an abnormal termination error
-  //      mDataProvider = (QgsRasterDataProvider*)(classFactory((const
-  //                                              char*)(dataSource.utf8())));
+  mValid = false; // assume the layer is invalid until we determine otherwise
 
-  // Copied from qgsproviderregistry in preference to the above.
-  QgsRasterDataProvider* myDataProvider = ( QgsRasterDataProvider* )( *classFactory )( &theDataSource );
-
-  if ( !myDataProvider )
-  {
-    QgsMessageLog::logMessage( tr( "Cannot instantiate the data provider" ), tr( "Raster" ) );
-    return NULL;
-  }
-  QgsDebugMsg( "Data driver created" );
-  return myDataProvider;
-}
+  mPipe.remove( mDataProvider ); // deletes if exists
+  mDataProvider = 0;
 
-/** Copied from QgsVectorLayer::setDataProvider
- *  TODO: Make it work in the raster environment
- */
-void QgsRasterLayer::setDataProvider( QString const & provider )
-{
-  QgsDebugMsg( "Entered" );
   // XXX should I check for and possibly delete any pre-existing providers?
   // XXX How often will that scenario occur?
 
   mProviderKey = provider;
-  mValid = false;            // assume the layer is invalid until we determine otherwise
-
   // set the layer name (uppercase first character)
   if ( ! mLayerName.isEmpty() )   // XXX shouldn't this happen in parent?
   {
@@ -1685,13 +1594,19 @@ void QgsRasterLayer::setDataProvider( QString const & provider )
 
   mBandCount = 0;
 
-  mDataProvider = QgsRasterLayer::loadProvider( mProviderKey, mDataSource );
+  mDataProvider = ( QgsRasterDataProvider* )QgsProviderRegistry::instance()->provider( mProviderKey, mDataSource );
   if ( !mDataProvider )
   {
+    //QgsMessageLog::logMessage( tr( "Cannot instantiate the data provider" ), tr( "Raster" ) );
+    appendError( ERR( tr( "Cannot instantiate the '%1' data provider" ).arg( mProviderKey ) ) );
     return;
   }
+  QgsDebugMsg( "Data provider created" );
+
   if ( !mDataProvider->isValid() )
   {
+    setError( mDataProvider->error() );
+    appendError( ERR( tr( "Provider is not valid (provider: %1, URI: %2" ).arg( mProviderKey ).arg( mDataSource ) ) );
     return;
   }
   mPipe.set( mDataProvider );
@@ -2619,7 +2534,7 @@ bool QgsRasterLayer::readXml( const QDomNode& layer_node )
   }
 
   setDataProvider( mProviderKey );
-
+  if ( !mValid ) return false;
 
   QString theError;
   bool res = readSymbology( layer_node, theError );
@@ -2644,6 +2559,7 @@ bool QgsRasterLayer::readXml( const QDomNode& layer_node )
       closeDataProvider();
       init();
       setDataProvider( mProviderKey );
+      if ( !mValid ) return false;
     }
   }
 
diff --git a/src/core/raster/qgsrasterlayer.h b/src/core/raster/qgsrasterlayer.h
index e8d7a9447d0a..207cec37e8f2 100644
--- a/src/core/raster/qgsrasterlayer.h
+++ b/src/core/raster/qgsrasterlayer.h
@@ -309,10 +309,6 @@ class CORE_EXPORT QgsRasterLayer : public QgsMapLayer
     /**  [ data provider interface ] Set the data provider */
     void setDataProvider( const QString & provider );
 
-    static QLibrary* loadProviderLibrary( QString theProviderKey );
-    static QgsRasterDataProvider* loadProvider( QString theProviderKey, QString theDataSource = 0 );
-
-
     /** \brief  Accessor for blue band name mapping */
     QString blueBandName() const { return mBlueBandName; }
 
diff --git a/src/core/raster/qgsrasterprojector.cpp b/src/core/raster/qgsrasterprojector.cpp
index 7cbffab5b2f1..73a7a8a1a539 100644
--- a/src/core/raster/qgsrasterprojector.cpp
+++ b/src/core/raster/qgsrasterprojector.cpp
@@ -701,10 +701,10 @@ QgsRasterBlock * QgsRasterProjector::block( int bandNo, QgsRectangle  const & ex
   QgsRasterBlock *outputBlock = new QgsRasterBlock();
   if ( !mInput )
   {
+    QgsDebugMsg( "Input not set" );
     return outputBlock;
   }
 
-
   if ( ! mSrcCRS.isValid() || ! mDestCRS.isValid() || mSrcCRS == mDestCRS )
   {
     QgsDebugMsg( "No projection necessary" );
@@ -723,6 +723,7 @@ QgsRasterBlock * QgsRasterProjector::block( int bandNo, QgsRectangle  const & ex
   // If we zoom out too much, projector srcRows / srcCols maybe 0, which can cause problems in providers
   if ( srcRows() <= 0 || srcCols() <= 0 )
   {
+    QgsDebugMsg( "Zero srcRows or srcCols" );
     return outputBlock;
   }
 
@@ -737,13 +738,15 @@ QgsRasterBlock * QgsRasterProjector::block( int bandNo, QgsRectangle  const & ex
 
   size_t pixelSize = QgsRasterBlock::typeSize( mInput->dataType( bandNo ) );
 
-  if ( !outputBlock->reset( QgsRasterBlock::ARGB32_Premultiplied, width, height ) )
+  if ( !outputBlock->reset( mInput->dataType( bandNo ), width, height ) )
   {
+    QgsDebugMsg( "Cannot reset block" );
     delete inputBlock;
     return outputBlock;
   }
+  outputBlock->setNoDataValue( mInput->noDataValue( bandNo ) );
 
-  // TODO: fill by transparent
+  // TODO: fill by no data or transparent
 
   int srcRow, srcCol;
   for ( int i = 0; i < height; ++i )
@@ -751,6 +754,7 @@ QgsRasterBlock * QgsRasterProjector::block( int bandNo, QgsRectangle  const & ex
     for ( int j = 0; j < width; ++j )
     {
       srcRowCol( i, j, &srcRow, &srcCol );
+      QgsDebugMsgLevel( QString( "row = %1 col = %2 srcRow = %3 srcCol = %4" ).arg( i ).arg( j ).arg( srcRow ).arg( srcCol ), 5 );
       size_t srcIndex = srcRow * mSrcCols + srcCol;
       size_t destIndex = i * width + j;
 
diff --git a/src/core/raster/qgsrasterrenderer.cpp b/src/core/raster/qgsrasterrenderer.cpp
index 5bc9daa80f6f..ccffb766573c 100644
--- a/src/core/raster/qgsrasterrenderer.cpp
+++ b/src/core/raster/qgsrasterrenderer.cpp
@@ -40,7 +40,7 @@ const QRgb QgsRasterRenderer::NODATA_COLOR = qRgba( 0, 0, 0, 0 );
 QgsRasterRenderer::QgsRasterRenderer( QgsRasterInterface* input, const QString& type )
     : QgsRasterInterface( input )
     , mType( type ), mOpacity( 1.0 ), mRasterTransparency( 0 )
-    , mAlphaBand( -1 ), mInvertColor( false )
+    , mAlphaBand( -1 ) //, mInvertColor( false )
 {
 }
 
@@ -117,7 +117,7 @@ void QgsRasterRenderer::_writeXML( QDomDocument& doc, QDomElement& rasterRendere
   rasterRendererElem.setAttribute( "type", mType );
   rasterRendererElem.setAttribute( "opacity", QString::number( mOpacity ) );
   rasterRendererElem.setAttribute( "alphaBand", mAlphaBand );
-  rasterRendererElem.setAttribute( "invertColor", mInvertColor );
+  //rasterRendererElem.setAttribute( "invertColor", mInvertColor );
 
   if ( mRasterTransparency )
   {
@@ -135,7 +135,7 @@ void QgsRasterRenderer::readXML( const QDomElement& rendererElem )
   mType = rendererElem.attribute( "type" );
   mOpacity = rendererElem.attribute( "opacity", "1.0" ).toDouble();
   mAlphaBand = rendererElem.attribute( "alphaBand", "-1" ).toInt();
-  mInvertColor = rendererElem.attribute( "invertColor", "0" ).toInt();
+  //mInvertColor = rendererElem.attribute( "invertColor", "0" ).toInt();
 
   //todo: read mRasterTransparency
   QDomElement rasterTransparencyElem = rendererElem.firstChildElement( "rasterTransparency" );
diff --git a/src/core/raster/qgsrasterrenderer.h b/src/core/raster/qgsrasterrenderer.h
index e2a139735254..735c5d640efe 100644
--- a/src/core/raster/qgsrasterrenderer.h
+++ b/src/core/raster/qgsrasterrenderer.h
@@ -92,8 +92,8 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
     void setAlphaBand( int band ) { mAlphaBand = band; }
     int alphaBand() const { return mAlphaBand; }
 
-    void setInvertColor( bool invert ) { mInvertColor = invert; }
-    bool invertColor() const { return mInvertColor; }
+    //void setInvertColor( bool invert ) { mInvertColor = invert; }
+    //bool invertColor() const { return mInvertColor; }
 
     /**Get symbology items if provided by renderer*/
     virtual void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const { Q_UNUSED( symbolItems ); }
@@ -124,7 +124,7 @@ class CORE_EXPORT QgsRasterRenderer : public QgsRasterInterface
         Default: -1 (not set)*/
     int mAlphaBand;
 
-    bool mInvertColor;
+    //bool mInvertColor;
 };
 
 #endif // QGSRASTERRENDERER_H
diff --git a/src/core/raster/qgssinglebandcolordatarenderer.cpp b/src/core/raster/qgssinglebandcolordatarenderer.cpp
index 68a223343a98..27fb690348a1 100644
--- a/src/core/raster/qgssinglebandcolordatarenderer.cpp
+++ b/src/core/raster/qgssinglebandcolordatarenderer.cpp
@@ -36,7 +36,6 @@ QgsRasterInterface * QgsSingleBandColorDataRenderer::clone() const
   QgsSingleBandColorDataRenderer * renderer = new QgsSingleBandColorDataRenderer( 0, mBand );
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setInvertColor( mInvertColor );
   renderer->setRasterTransparency( mRasterTransparency );
   return renderer;
 }
diff --git a/src/core/raster/qgssinglebandgrayrenderer.cpp b/src/core/raster/qgssinglebandgrayrenderer.cpp
index f3b94d6107b8..07b0455c41c1 100644
--- a/src/core/raster/qgssinglebandgrayrenderer.cpp
+++ b/src/core/raster/qgssinglebandgrayrenderer.cpp
@@ -23,7 +23,7 @@
 #include 
 
 QgsSingleBandGrayRenderer::QgsSingleBandGrayRenderer( QgsRasterInterface* input, int grayBand ):
-    QgsRasterRenderer( input, "singlebandgray" ), mGrayBand( grayBand ), mContrastEnhancement( 0 )
+    QgsRasterRenderer( input, "singlebandgray" ), mGrayBand( grayBand ), mGradient( BlackToWhite ), mContrastEnhancement( 0 )
 {
 }
 
@@ -37,7 +37,6 @@ QgsRasterInterface * QgsSingleBandGrayRenderer::clone() const
   QgsSingleBandGrayRenderer * renderer = new QgsSingleBandGrayRenderer( 0, mGrayBand );
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setInvertColor( mInvertColor );
   renderer->setRasterTransparency( mRasterTransparency );
   if ( mContrastEnhancement )
   {
@@ -57,6 +56,11 @@ QgsRasterRenderer* QgsSingleBandGrayRenderer::create( const QDomElement& elem, Q
   QgsSingleBandGrayRenderer* r = new QgsSingleBandGrayRenderer( input, grayBand );
   r->readXML( elem );
 
+  if ( elem.attribute( "gradient" ) == "WhiteToBlack" )
+  {
+    r->setGradient( WhiteToBlack );  // BlackToWhite is default
+  }
+
   QDomElement contrastEnhancementElem = elem.firstChildElement( "contrastEnhancement" );
   if ( !contrastEnhancementElem.isNull() )
   {
@@ -149,7 +153,7 @@ QgsRasterBlock* QgsSingleBandGrayRenderer::block( int bandNo, QgsRectangle  cons
       grayVal = mContrastEnhancement->enhanceContrast( grayVal );
     }
 
-    if ( mInvertColor )
+    if ( mGradient == WhiteToBlack )
     {
       grayVal = 255 - grayVal;
     }
@@ -184,6 +188,18 @@ void QgsSingleBandGrayRenderer::writeXML( QDomDocument& doc, QDomElement& parent
   _writeXML( doc, rasterRendererElem );
 
   rasterRendererElem.setAttribute( "grayBand", mGrayBand );
+
+  QString gradient;
+  if ( mGradient == BlackToWhite )
+  {
+    gradient = "BlackToWhite";
+  }
+  else
+  {
+    gradient = "WhiteToBlack";
+  }
+  rasterRendererElem.setAttribute( "gradient", gradient );
+
   if ( mContrastEnhancement )
   {
     QDomElement contrastElem = doc.createElement( "contrastEnhancement" );
diff --git a/src/core/raster/qgssinglebandgrayrenderer.h b/src/core/raster/qgssinglebandgrayrenderer.h
index 4245c409863b..16125bfdeba4 100644
--- a/src/core/raster/qgssinglebandgrayrenderer.h
+++ b/src/core/raster/qgssinglebandgrayrenderer.h
@@ -29,6 +29,12 @@ class QDomElement;
 class CORE_EXPORT QgsSingleBandGrayRenderer: public QgsRasterRenderer
 {
   public:
+    enum Gradient
+    {
+      BlackToWhite,
+      WhiteToBlack
+    };
+
     QgsSingleBandGrayRenderer( QgsRasterInterface* input, int grayBand );
     ~QgsSingleBandGrayRenderer();
     QgsRasterInterface * clone() const;
@@ -43,6 +49,9 @@ class CORE_EXPORT QgsSingleBandGrayRenderer: public QgsRasterRenderer
     /**Takes ownership*/
     void setContrastEnhancement( QgsContrastEnhancement* ce );
 
+    void setGradient( Gradient theGradient ) { mGradient = theGradient; }
+    Gradient gradient() const { return mGradient; }
+
     void writeXML( QDomDocument& doc, QDomElement& parentElem ) const;
 
     void legendSymbologyItems( QList< QPair< QString, QColor > >& symbolItems ) const;
@@ -51,6 +60,7 @@ class CORE_EXPORT QgsSingleBandGrayRenderer: public QgsRasterRenderer
 
   private:
     int mGrayBand;
+    Gradient mGradient;
     QgsContrastEnhancement* mContrastEnhancement;
 };
 
diff --git a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
index fab4f599f049..7af3af64f2a8 100644
--- a/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
+++ b/src/core/raster/qgssinglebandpseudocolorrenderer.cpp
@@ -63,7 +63,6 @@ QgsRasterInterface * QgsSingleBandPseudoColorRenderer::clone() const
 
   renderer->setOpacity( mOpacity );
   renderer->setAlphaBand( mAlphaBand );
-  renderer->setInvertColor( mInvertColor );
   renderer->setRasterTransparency( mRasterTransparency );
 
   return renderer;
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
index 93557c456221..b7f7c930c527 100644
--- a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
+++ b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.cpp
@@ -12,6 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+#include 
 
 #include "qgscategorizedsymbolrendererv2.h"
 
@@ -27,21 +28,40 @@
 #include 
 #include  // for legend
 
+QgsRendererCategoryV2::QgsRendererCategoryV2()
+    : mValue(), mSymbol( 0 ), mLabel()
+{
+}
+
 QgsRendererCategoryV2::QgsRendererCategoryV2( QVariant value, QgsSymbolV2* symbol, QString label )
     : mValue( value ), mSymbol( symbol ), mLabel( label )
 {
 }
 
 QgsRendererCategoryV2::QgsRendererCategoryV2( const QgsRendererCategoryV2& cat )
-    : mValue( cat.mValue ), mLabel( cat.mLabel )
+    : mValue( cat.mValue ), mSymbol( 0 ), mLabel( cat.mLabel )
 {
-  mSymbol = cat.mSymbol->clone();
+  if ( cat.mSymbol )
+  {
+    mSymbol = cat.mSymbol->clone();
+  }
 }
 
-
 QgsRendererCategoryV2::~QgsRendererCategoryV2()
 {
-  delete mSymbol;
+  if ( mSymbol ) delete mSymbol;
+}
+
+QgsRendererCategoryV2& QgsRendererCategoryV2::operator=( const QgsRendererCategoryV2 & cat )
+{
+  mValue = cat.mValue;
+  mLabel = cat.mLabel;
+  mSymbol = 0;
+  if ( cat.mSymbol )
+  {
+    mSymbol = cat.mSymbol->clone();
+  }
+  return *this;
 }
 
 QVariant QgsRendererCategoryV2::value() const
@@ -159,7 +179,6 @@ void QgsCategorizedSymbolRendererV2::rebuildHash()
 QgsSymbolV2* QgsCategorizedSymbolRendererV2::symbolForValue( QVariant value )
 {
   // TODO: special case for int, double
-
   QHash::iterator it = mSymbolHash.find( value.toString() );
   if ( it == mSymbolHash.end() )
   {
@@ -169,7 +188,7 @@ QgsSymbolV2* QgsCategorizedSymbolRendererV2::symbolForValue( QVariant value )
     }
     else
     {
-      //QgsDebugMsg( "attribute value not found: " + value.toString() );
+      QgsDebugMsg( "attribute value not found: " + value.toString() );
     }
     return NULL;
   }
@@ -192,7 +211,12 @@ QgsSymbolV2* QgsCategorizedSymbolRendererV2::symbolForFeature( QgsFeature& featu
   if ( symbol == NULL )
   {
     // if no symbol found use default one
-    return symbolForValue( QVariant( "" ) );
+    //return symbolForValue( QVariant( "" ) );
+    // What is default? Empty string may be a legal value, and features not found
+    // should not be rendered using empty string value category symbology.
+    // We also need to get NULL in that case so that willRenderFeature()
+    // may be used to count features.
+    return 0;
   }
 
   if ( mRotationFieldIdx == -1 && mSizeScaleFieldIdx == -1 )
@@ -289,6 +313,55 @@ void QgsCategorizedSymbolRendererV2::deleteAllCategories()
   mCategories.clear();
 }
 
+void QgsCategorizedSymbolRendererV2::moveCategory( int from, int to )
+{
+  if ( from < 0 || from >= mCategories.size() || to < 0 || to >= mCategories.size() ) return;
+  mCategories.move( from, to );
+}
+
+bool valueLessThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 )
+{
+  return qgsVariantLessThan( c1.value(), c2.value() );
+}
+bool valueGreaterThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 )
+{
+  return qgsVariantGreaterThan( c1.value(), c2.value() );
+}
+
+void QgsCategorizedSymbolRendererV2::sortByValue( Qt::SortOrder order )
+{
+  if ( order == Qt::AscendingOrder )
+  {
+    qSort( mCategories.begin(), mCategories.end(), valueLessThan );
+  }
+  else
+  {
+    qSort( mCategories.begin(), mCategories.end(), valueGreaterThan );
+  }
+}
+
+bool labelLessThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 )
+{
+  return QString::localeAwareCompare( c1.label(), c2.label() ) < 0;
+}
+
+bool labelGreaterThan( const QgsRendererCategoryV2 &c1, const QgsRendererCategoryV2 &c2 )
+{
+  return !labelLessThan( c1, c2 );
+}
+
+void QgsCategorizedSymbolRendererV2::sortByLabel( Qt::SortOrder order )
+{
+  if ( order == Qt::AscendingOrder )
+  {
+    qSort( mCategories.begin(), mCategories.end(), labelLessThan );
+  }
+  else
+  {
+    qSort( mCategories.begin(), mCategories.end(), labelGreaterThan );
+  }
+}
+
 void QgsCategorizedSymbolRendererV2::startRender( QgsRenderContext& context, const QgsVectorLayer *vlayer )
 {
   // make sure that the hash table is up to date
@@ -600,7 +673,7 @@ void QgsCategorizedSymbolRendererV2::setSourceColorRamp( QgsVectorColorRampV2* r
 void QgsCategorizedSymbolRendererV2::updateSymbols( QgsSymbolV2 * sym )
 {
   int i = 0;
-  foreach( QgsRendererCategoryV2 cat, mCategories )
+  foreach ( QgsRendererCategoryV2 cat, mCategories )
   {
     QgsSymbolV2* symbol = sym->clone();
     symbol->setColor( cat.symbol()->color() );
diff --git a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
index 6c7457e1c228..0e32cca636a1 100644
--- a/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
+++ b/src/core/symbology-ng/qgscategorizedsymbolrendererv2.h
@@ -27,6 +27,7 @@ class QgsVectorLayer;
 class CORE_EXPORT QgsRendererCategoryV2
 {
   public:
+    QgsRendererCategoryV2( );
 
     //! takes ownership of symbol
     QgsRendererCategoryV2( QVariant value, QgsSymbolV2* symbol, QString label );
@@ -34,8 +35,11 @@ class CORE_EXPORT QgsRendererCategoryV2
     //! copy constructor
     QgsRendererCategoryV2( const QgsRendererCategoryV2& cat );
 
+
     ~QgsRendererCategoryV2();
 
+    QgsRendererCategoryV2& operator=( const QgsRendererCategoryV2& cat );
+
     QVariant value() const;
     QgsSymbolV2* symbol() const;
     QString label() const;
@@ -81,7 +85,7 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2
 
     //! returns bitwise OR-ed capabilities of the renderer
     //! \note added in 2.0
-    virtual int capabilities() { return SymbolLevels | RotationField; }
+    virtual int capabilities() { return SymbolLevels | RotationField | Filter; }
 
     virtual QgsSymbolV2List symbols();
     //! @note added in 2.0
@@ -100,6 +104,12 @@ class CORE_EXPORT QgsCategorizedSymbolRendererV2 : public QgsFeatureRendererV2
     bool deleteCategory( int catIndex );
     void deleteAllCategories();
 
+    //! Moves the category at index position from to index position to.
+    void moveCategory( int from, int to );
+
+    void sortByValue( Qt::SortOrder order = Qt::AscendingOrder );
+    void sortByLabel( Qt::SortOrder order = Qt::AscendingOrder );
+
     QString classAttribute() const { return mAttrName; }
     void setClassAttribute( QString attr ) { mAttrName = attr; }
 
diff --git a/src/core/symbology-ng/qgscptcityarchive.cpp b/src/core/symbology-ng/qgscptcityarchive.cpp
index f1a2b8e315f2..cfc06b31caef 100644
--- a/src/core/symbology-ng/qgscptcityarchive.cpp
+++ b/src/core/symbology-ng/qgscptcityarchive.cpp
@@ -46,7 +46,8 @@ QgsCptCityArchive::QgsCptCityArchive( QString archiveName, QString baseDir )
     : mArchiveName( archiveName ), mBaseDir( baseDir )
 {
   QgsDebugMsg( "archiveName = " + archiveName + " baseDir = " + baseDir );
-  // make root items
+
+  // make Author items
   QgsCptCityDirectoryItem* dirItem = 0;
   foreach ( QString path, QDir( mBaseDir ).entryList( QDir::Dirs | QDir::NoDotAndDotDot, QDir::Name ) )
   {
@@ -61,21 +62,29 @@ QgsCptCityArchive::QgsCptCityArchive( QString archiveName, QString baseDir )
   }
 
   // make selection items
-  QgsCptCitySelectionItem* item = 0;
+  QgsCptCitySelectionItem* selItem = 0;
   QDir seldir( mBaseDir + QDir::separator() + "selections" );
   QgsDebugMsg( "populating selection from " + seldir.path() );
   foreach ( QString selfile, seldir.entryList( QStringList( "*.xml" ), QDir::Files ) )
   {
     QgsDebugMsg( "file= " + seldir.path() + "/" + selfile );
-    item = new QgsCptCitySelectionItem( NULL, QFileInfo( selfile ).baseName(),
-                                        seldir.dirName() +  QDir::separator() + selfile );
+    selItem = new QgsCptCitySelectionItem( NULL, QFileInfo( selfile ).baseName(),
+                                           seldir.dirName() +  QDir::separator() + selfile );
     //TODO remove item if there are no children (e.g. esri in qgis-sel)
-    if ( item->isValid() )
-      mSelectionItems << item;
+    if ( selItem->isValid() )
+      mSelectionItems << selItem;
     else
-      delete item;
+      delete selItem;
   }
 
+  // make "All Ramps items" (which will contain all ramps without hierarchy)
+  QgsCptCityAllRampsItem* allRampsItem;
+  allRampsItem = new QgsCptCityAllRampsItem( NULL, QObject::tr( "All Ramps" ),
+      mRootItems );
+  mRootItems.prepend( allRampsItem );
+  allRampsItem = new QgsCptCityAllRampsItem( NULL, QObject::tr( "All Ramps" ),
+      mSelectionItems );
+  mSelectionItems.prepend( allRampsItem );
 }
 
 QgsCptCityArchive::~QgsCptCityArchive( )
@@ -157,9 +166,9 @@ QString QgsCptCityArchive::descFileName( const QString& path ) const
                                           baseDir() + QDir::separator() + path, baseDir() );
 }
 
-QMap< QString, QString > QgsCptCityArchive::copyingInfo( const QString& fileName )
+QgsStringMap QgsCptCityArchive::copyingInfo( const QString& fileName )
 {
-  QMap< QString, QString > copyingMap;
+  QgsStringMap copyingMap;
 
   if ( fileName.isNull() )
     return copyingMap;
@@ -258,9 +267,9 @@ QMap< QString, QString > QgsCptCityArchive::copyingInfo( const QString& fileName
   return copyingMap;
 }
 
-QMap< QString, QString > QgsCptCityArchive::description( const QString& fileName )
+QgsStringMap QgsCptCityArchive::description( const QString& fileName )
 {
-  QMap< QString, QString > descMap;
+  QgsStringMap descMap;
 
   QgsDebugMsg( "description fileName = " + fileName );
 
@@ -435,7 +444,7 @@ void QgsCptCityArchive::initDefaultArchive()
 
 void QgsCptCityArchive::initArchives( bool loadAll )
 {
-  QMap< QString, QString > archivesMap;
+  QgsStringMap archivesMap;
   QString baseDir, defArchiveName;
   QSettings settings;
 
@@ -460,7 +469,7 @@ void QgsCptCityArchive::initArchives( bool loadAll )
     archivesMap[ defArchiveName ] = baseDir + QDir::separator() + defArchiveName;
   }
 
-  for ( QMap< QString, QString >::iterator it = archivesMap.begin();
+  for ( QgsStringMap::iterator it = archivesMap.begin();
         it != archivesMap.end(); ++it )
   {
     if ( QDir( it.value() ).exists() )
@@ -730,16 +739,18 @@ void QgsCptCityColorRampItem::init( )
     if ( variantList.isEmpty() )
     {
       int count = mRamp.count();
-      QgsCptCityColorRampV2::GradientType type = mRamp.gradientType();
-      if ( type == QgsCptCityColorRampV2::Discrete )
+      if ( mRamp.isDiscrete() )
         count--;
       mInfo = QString::number( count ) + " " + tr( "colors" ) + " - ";
-      if ( type == QgsCptCityColorRampV2::Continuous )
-        mInfo += tr( "continuous" );
-      else if ( type == QgsCptCityColorRampV2::ContinuousMulti )
-        mInfo += tr( "continuous (multi)" );
-      else if ( type == QgsCptCityColorRampV2::Discrete )
+      if ( mRamp.isDiscrete() )
         mInfo += tr( "discrete" );
+      else
+      {
+        if ( !mRamp.hasMultiStops() )
+          mInfo += tr( "continuous" );
+        else
+          mInfo += tr( "continuous (multi)" );
+      }
       mShortInfo = QFileInfo( mName ).fileName();
     }
     else
@@ -858,16 +869,18 @@ QgsCptCityDirectoryItem::QgsCptCityDirectoryItem( QgsCptCityDataItem* parent,
     : QgsCptCityCollectionItem( parent, name, path )
 {
   mType = Directory;
-  mValid = QDir( QgsCptCityArchive::defaultBaseDir() ).exists();
+  mValid = QDir( QgsCptCityArchive::defaultBaseDir() + QDir::separator() + mPath ).exists();
   if ( ! mValid )
+  {
     QgsDebugMsg( "created invalid dir item, path = " + QgsCptCityArchive::defaultBaseDir()
                  + QDir::separator() + mPath );
+  }
 
   // parse DESC.xml to get mInfo
   mInfo = "";
   QString fileName = QgsCptCityArchive::defaultBaseDir() + QDir::separator() + \
                      mPath + QDir::separator() + "DESC.xml";
-  QMap< QString, QString > descMap = QgsCptCityArchive::description( fileName );
+  QgsStringMap descMap = QgsCptCityArchive::description( fileName );
   if ( descMap.contains( "name" ) )
     mInfo = descMap.value( "name" );
 
@@ -1136,7 +1149,9 @@ QgsCptCitySelectionItem::QgsCptCitySelectionItem( QgsCptCityDataItem* parent,
     : QgsCptCityCollectionItem( parent, name, path )
 {
   mType = Selection;
-  parseXML();
+  mValid = ! path.isNull();
+  if ( mValid )
+    parseXML();
 }
 
 QgsCptCitySelectionItem::~QgsCptCitySelectionItem()
@@ -1253,6 +1268,38 @@ bool QgsCptCitySelectionItem::equal( const QgsCptCityDataItem *other )
   return ( path() == other->path() );
 }
 
+//-----------------------------------------------------------------------
+QgsCptCityAllRampsItem::QgsCptCityAllRampsItem( QgsCptCityDataItem* parent,
+    QString name,  QVector items )
+    : QgsCptCityCollectionItem( parent, name, QString() ), mItems( items )
+{
+  mType = AllRamps;
+  mValid = true;
+  // populate();
+}
+
+QgsCptCityAllRampsItem::~QgsCptCityAllRampsItem()
+{
+}
+
+QVector QgsCptCityAllRampsItem::createChildren()
+{
+  if ( ! mValid )
+    return QVector();
+
+  QVector children;
+
+  // add children ramps of each item
+  foreach ( QgsCptCityDataItem* item, mItems )
+  {
+    QgsCptCityCollectionItem* colItem = dynamic_cast< QgsCptCityCollectionItem* >( item );
+    if ( colItem )
+      children += colItem->childrenRamps( true );
+  }
+
+  return children;
+}
+
 //-----------------------------------------------------------------------
 
 QgsCptCityBrowserModel::QgsCptCityBrowserModel( QObject *parent,
@@ -1339,12 +1386,11 @@ QVariant QgsCptCityBrowserModel::data( const QModelIndex &index, int role ) cons
     return item->icon( mIconSize );
   }
   else if ( role == Qt::FontRole &&
-            ( item->type() == QgsCptCityDataItem::Directory ||
-              item->type() == QgsCptCityDataItem::Selection ) )
+            ( dynamic_cast< QgsCptCityCollectionItem* >( item ) != 0 ) )
   {
     // collectionitems are larger and bold
     QFont font;
-    // font.setPointSize( font.pointSize() + 1 );
+    font.setPointSize( 11 ); //FIXME why is the font so small?
     font.setBold( true );
     return font;
   }
@@ -1414,7 +1460,11 @@ QModelIndex QgsCptCityBrowserModel::findPath( QString path )
   {
     foundChild = false; // assume that the next child item will not be found
 
-    for ( int i = 0; i < rowCount( theIndex ); i++ )
+    int i = 0;
+    // if root skip first item "All Ramps"
+    if ( itemPath.isEmpty() )
+      i = 1;
+    for ( ; i < rowCount( theIndex ); i++ )
     {
       QModelIndex idx = index( i, 0, theIndex );
       QgsCptCityDataItem *item = dataItem( idx );
@@ -1583,9 +1633,17 @@ bool QgsCptCityBrowserModel::canFetchMore( const QModelIndex & parent ) const
   QgsCptCityDataItem* item = dataItem( parent );
   // fetch all items initially so we know which items have children
   // (nicer looking and less confusing)
-  if ( item )
-    item->populate();
-  return ( item && ! item->isPopulated() );
+
+  if ( ! item )
+    return false;
+
+  // except for "All Ramps" - this is populated when clicked on
+  if ( item->type() == QgsCptCityDataItem::AllRamps )
+    return false;
+
+  item->populate();
+
+  return ( ! item->isPopulated() );
 }
 
 void QgsCptCityBrowserModel::fetchMore( const QModelIndex & parent )
diff --git a/src/core/symbology-ng/qgscptcityarchive.h b/src/core/symbology-ng/qgscptcityarchive.h
index c12ea8d7b8a1..85625cb6cb33 100644
--- a/src/core/symbology-ng/qgscptcityarchive.h
+++ b/src/core/symbology-ng/qgscptcityarchive.h
@@ -90,7 +90,8 @@ class CORE_EXPORT QgsCptCityDataItem : public QObject
       ColorRamp,
       Collection,
       Directory,
-      Selection
+      Selection,
+      AllRamps
     };
 
     QgsCptCityDataItem( QgsCptCityDataItem::Type type, QgsCptCityDataItem* parent,
@@ -277,6 +278,20 @@ class CORE_EXPORT QgsCptCitySelectionItem : public QgsCptCityCollectionItem
     QStringList mSelectionsList;
 };
 
+/** An "All ramps item", which contains all items in a flat hierarchy */
+class CORE_EXPORT QgsCptCityAllRampsItem : public QgsCptCityCollectionItem
+{
+    Q_OBJECT
+  public:
+    QgsCptCityAllRampsItem( QgsCptCityDataItem* parent, QString name,
+                            QVector items );
+    ~QgsCptCityAllRampsItem();
+
+    QVector createChildren();
+
+  protected:
+    QVector mItems;
+};
 
 
 class CORE_EXPORT QgsCptCityBrowserModel : public QAbstractItemModel
diff --git a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
index dd9d9609eccf..ddbcebe32495 100644
--- a/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsfillsymbollayerv2.cpp
@@ -309,13 +309,9 @@ QgsSVGFillSymbolLayer::~QgsSVGFillSymbolLayer()
 
 void QgsSVGFillSymbolLayer::setSvgFilePath( const QString& svgPath )
 {
-  QFile svgFile( svgPath );
-  if ( svgFile.open( QFile::ReadOnly ) )
-  {
-    mSvgData = svgFile.readAll();
+  mSvgData = QgsSvgCache::instance()->getImageData( svgPath );
+  storeViewBox();
 
-    storeViewBox();
-  }
   mSvgFilePath = svgPath;
   setDefaultSvgParams();
 }
@@ -334,7 +330,7 @@ QgsSymbolLayerV2* QgsSVGFillSymbolLayer::create( const QgsStringMap& properties
   if ( properties.contains( "svgFile" ) )
   {
     QString svgName = properties["svgFile"];
-    QString savePath = QgsSvgMarkerSymbolLayerV2::symbolNameToPath( svgName );
+    QString savePath = QgsSymbolLayerV2Utils::symbolNameToPath( svgName );
     svgFilePath = ( savePath.isEmpty() ? svgName : savePath );
   }
   if ( properties.contains( "angle" ) )
@@ -422,7 +418,7 @@ QgsStringMap QgsSVGFillSymbolLayer::properties() const
   QgsStringMap map;
   if ( !mSvgFilePath.isEmpty() )
   {
-    map.insert( "svgFile", QgsSvgMarkerSymbolLayerV2::symbolPathToName( mSvgFilePath ) );
+    map.insert( "svgFile", QgsSymbolLayerV2Utils::symbolPathToName( mSvgFilePath ) );
   }
   else
   {
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
index f7b8884432ef..ce0345fefd34 100644
--- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
+++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.cpp
@@ -30,6 +30,11 @@
 #include  // for pretty classification
 #include 
 
+QgsRendererRangeV2::QgsRendererRangeV2()
+    : mLowerValue( 0 ), mUpperValue( 0 ), mSymbol( 0 ), mLabel()
+{
+}
+
 QgsRendererRangeV2::QgsRendererRangeV2( double lowerValue, double upperValue, QgsSymbolV2* symbol, QString label )
     : mLowerValue( lowerValue )
     , mUpperValue( upperValue )
@@ -51,6 +56,19 @@ QgsRendererRangeV2::~QgsRendererRangeV2()
   delete mSymbol;
 }
 
+QgsRendererRangeV2& QgsRendererRangeV2::operator=( const QgsRendererRangeV2 & range )
+{
+  mLowerValue = range.mLowerValue;
+  mUpperValue = range.mUpperValue;
+  mLabel = range.mLabel;
+  mSymbol = 0;
+  if ( range.mSymbol )
+  {
+    mSymbol = range.mSymbol->clone();
+  }
+  return *this;
+}
+
 double QgsRendererRangeV2::lowerValue() const
 {
   return mLowerValue;
@@ -1117,3 +1135,60 @@ void QgsGraduatedSymbolRendererV2::deleteClass( int idx )
 {
   mRanges.removeAt( idx );
 }
+
+void QgsGraduatedSymbolRendererV2::deleteAllClasses()
+{
+  mRanges.clear();
+}
+
+void QgsGraduatedSymbolRendererV2::moveClass( int from, int to )
+{
+  if ( from < 0 || from >= mRanges.size() || to < 0 || to >= mRanges.size() ) return;
+  mRanges.move( from, to );
+}
+
+bool valueLessThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 )
+{
+  return r1.lowerValue() < r2.lowerValue();
+}
+
+bool valueGreaterThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 )
+{
+  return !valueLessThan( r1, r2 );
+}
+
+void QgsGraduatedSymbolRendererV2::sortByValue( Qt::SortOrder order )
+{
+  QgsDebugMsg( "Entered" );
+  if ( order == Qt::AscendingOrder )
+  {
+    qSort( mRanges.begin(), mRanges.end(), valueLessThan );
+  }
+  else
+  {
+    qSort( mRanges.begin(), mRanges.end(), valueGreaterThan );
+  }
+}
+
+bool labelLessThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 )
+{
+  return QString::localeAwareCompare( r1.label(), r2.label() ) < 0;
+}
+
+bool labelGreaterThan( const QgsRendererRangeV2 &r1, const QgsRendererRangeV2 &r2 )
+{
+  return !labelLessThan( r1, r2 );
+}
+
+void QgsGraduatedSymbolRendererV2::sortByLabel( Qt::SortOrder order )
+{
+  if ( order == Qt::AscendingOrder )
+  {
+    qSort( mRanges.begin(), mRanges.end(), labelLessThan );
+  }
+  else
+  {
+    qSort( mRanges.begin(), mRanges.end(), labelGreaterThan );
+  }
+}
+
diff --git a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
index 066d2d620b74..6b3c16ee061d 100644
--- a/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
+++ b/src/core/symbology-ng/qgsgraduatedsymbolrendererv2.h
@@ -21,11 +21,14 @@
 class CORE_EXPORT QgsRendererRangeV2
 {
   public:
+    QgsRendererRangeV2();
     QgsRendererRangeV2( double lowerValue, double upperValue, QgsSymbolV2* symbol, QString label );
     QgsRendererRangeV2( const QgsRendererRangeV2& range );
 
     ~QgsRendererRangeV2();
 
+    QgsRendererRangeV2& operator=( const QgsRendererRangeV2& range );
+
     double lowerValue() const;
     double upperValue() const;
 
@@ -76,7 +79,7 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
 
     //! returns bitwise OR-ed capabilities of the renderer
     //! \note added in 2.0
-    virtual int capabilities() { return SymbolLevels | RotationField; }
+    virtual int capabilities() { return SymbolLevels | RotationField | Filter; }
 
     virtual QgsSymbolV2List symbols();
 
@@ -92,6 +95,13 @@ class CORE_EXPORT QgsGraduatedSymbolRendererV2 : public QgsFeatureRendererV2
 
     void addClass( QgsSymbolV2* symbol );
     void deleteClass( int idx );
+    void deleteAllClasses();
+
+    //! Moves the category at index position from to index position to.
+    void moveClass( int from, int to );
+
+    void sortByValue( Qt::SortOrder order = Qt::AscendingOrder );
+    void sortByLabel( Qt::SortOrder order = Qt::AscendingOrder );
 
     enum Mode
     {
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
index 52616e283015..b431443f0962 100644
--- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
+++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp
@@ -17,9 +17,7 @@
 #include "qgssymbollayerv2utils.h"
 
 #include "qgsrendercontext.h"
-#include "qgsapplication.h"
 #include "qgslogger.h"
-#include "qgsproject.h"
 #include "qgssvgcache.h"
 
 #include 
@@ -536,7 +534,7 @@ void QgsSimpleMarkerSymbolLayerV2::drawMarker( QPainter* p, QgsSymbolV2RenderCon
 
 QgsSvgMarkerSymbolLayerV2::QgsSvgMarkerSymbolLayerV2( QString name, double size, double angle )
 {
-  mPath = symbolNameToPath( name );
+  mPath = QgsSymbolLayerV2Utils::symbolNameToPath( name );
   mSize = size;
   mAngle = angle;
   mOffset = QPointF( 0, 0 );
@@ -674,7 +672,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
   }
   else
   {
-    p->setOpacity( context.alpha( ) );
+    p->setOpacity( context.alpha() );
     const QPicture& pct = QgsSvgCache::instance()->svgAsPicture( mPath, size, mFillColor, mOutlineColor, mOutlineWidth,
                           context.renderContext().scaleFactor(), context.renderContext().rasterScaleFactor() );
     p->drawPicture( 0, 0, pct );
@@ -697,7 +695,7 @@ void QgsSvgMarkerSymbolLayerV2::renderPoint( const QPointF& point, QgsSymbolV2Re
 QgsStringMap QgsSvgMarkerSymbolLayerV2::properties() const
 {
   QgsStringMap map;
-  map["name"] = symbolPathToName( mPath );
+  map["name"] = QgsSymbolLayerV2Utils::symbolPathToName( mPath );
   map["size"] = QString::number( mSize );
   map["angle"] = QString::number( mAngle );
   map["offset"] = QgsSymbolLayerV2Utils::encodePoint( mOffset );
@@ -784,131 +782,6 @@ QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2::createFromSld( QDomElement &element
   return m;
 }
 
-
-QStringList QgsSvgMarkerSymbolLayerV2::listSvgFiles()
-{
-  // copied from QgsMarkerCatalogue - TODO: unify
-  QStringList list;
-  QStringList svgPaths = QgsApplication::svgPaths();
-
-  for ( int i = 0; i < svgPaths.size(); i++ )
-  {
-    QDir dir( svgPaths[i] );
-    foreach ( QString item, dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot ) )
-    {
-      svgPaths.insert( i + 1, dir.path() + "/" + item );
-    }
-
-    foreach ( QString item, dir.entryList( QStringList( "*.svg" ), QDir::Files ) )
-    {
-      // TODO test if it is correct SVG
-      list.append( dir.path() + "/" + item );
-    }
-  }
-  return list;
-}
-
-// Stripped down version of listSvgFiles() for specified directory
-QStringList QgsSvgMarkerSymbolLayerV2::listSvgFilesAt( QString directory )
-{
-  // TODO anything that applies for the listSvgFiles() applies this also
-
-  QStringList list;
-  QStringList svgPaths;
-  svgPaths.append( directory );
-
-  for ( int i = 0; i < svgPaths.size(); i++ )
-  {
-    QDir dir( svgPaths[i] );
-    foreach ( QString item, dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot ) )
-    {
-      svgPaths.insert( i + 1, dir.path() + "/" + item );
-    }
-
-    foreach ( QString item, dir.entryList( QStringList( "*.svg" ), QDir::Files ) )
-    {
-      list.append( dir.path() + "/" + item );
-    }
-  }
-  return list;
-
-}
-
-QString QgsSvgMarkerSymbolLayerV2::symbolNameToPath( QString name )
-{
-  // copied from QgsSymbol::setNamedPointSymbol - TODO: unify
-
-  // we might have a full path...
-  if ( QFile( name ).exists() )
-    return QFileInfo( name ).canonicalFilePath();
-
-  // SVG symbol not found - probably a relative path was used
-
-  QStringList svgPaths = QgsApplication::svgPaths();
-  for ( int i = 0; i < svgPaths.size(); i++ )
-  {
-    QgsDebugMsg( "SvgPath: " + svgPaths[i] );
-    QFileInfo myInfo( name );
-    QString myFileName = myInfo.fileName(); // foo.svg
-    QString myLowestDir = myInfo.dir().dirName();
-    QString myLocalPath = svgPaths[i] + "/" + myLowestDir + "/" + myFileName;
-
-    QgsDebugMsg( "Alternative svg path: " + myLocalPath );
-    if ( QFile( myLocalPath ).exists() )
-    {
-      QgsDebugMsg( "Svg found in alternative path" );
-      return QFileInfo( myLocalPath ).canonicalFilePath();
-    }
-    else if ( myInfo.isRelative() )
-    {
-      QFileInfo pfi( QgsProject::instance()->fileName() );
-      QString alternatePath = pfi.canonicalPath() + QDir::separator() + name;
-      if ( pfi.exists() && QFile( alternatePath ).exists() )
-      {
-        QgsDebugMsg( "Svg found in alternative path" );
-        return QFileInfo( alternatePath ).canonicalFilePath();
-      }
-      else
-      {
-        QgsDebugMsg( "Svg not found in project path" );
-      }
-    }
-    else
-    {
-      //couldnt find the file, no happy ending :-(
-      QgsDebugMsg( "Computed alternate path but no svg there either" );
-    }
-  }
-  return QString();
-}
-
-QString QgsSvgMarkerSymbolLayerV2::symbolPathToName( QString path )
-{
-  // copied from QgsSymbol::writeXML
-
-  QFileInfo fi( path );
-  if ( !fi.exists() )
-    return path;
-
-  path = fi.canonicalFilePath();
-
-  QStringList svgPaths = QgsApplication::svgPaths();
-
-  for ( int i = 0; i < svgPaths.size(); i++ )
-  {
-    QString dir = QFileInfo( svgPaths[i] ).canonicalFilePath();
-
-    if ( !dir.isEmpty() && path.startsWith( dir ) )
-    {
-      path = path.mid( dir.size() );
-      break;
-    }
-  }
-
-  return path;
-}
-
-
 //////////
 
 QgsFontMarkerSymbolLayerV2::QgsFontMarkerSymbolLayerV2( QString fontFamily, QChar chr, double pointSize, QColor color, double angle )
diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
index 0174a18f485b..f5f87542495e 100644
--- a/src/core/symbology-ng/qgsmarkersymbollayerv2.h
+++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.h
@@ -108,18 +108,6 @@ class CORE_EXPORT QgsSvgMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2
     static QgsSymbolLayerV2* create( const QgsStringMap& properties = QgsStringMap() );
     static QgsSymbolLayerV2* createFromSld( QDomElement &element );
 
-    //! Return a list of all available svg files
-    static QStringList listSvgFiles();
-
-    //! Return a list of svg files at the specified directory
-    static QStringList listSvgFilesAt( QString directory );
-
-    //! Get symbol's path from its name
-    static QString symbolNameToPath( QString name );
-
-    //! Get symbols's name from its path
-    static QString symbolPathToName( QString path );
-
     // implemented from base classes
 
     QString layerType() const;
diff --git a/src/core/symbology-ng/qgsrendererv2.h b/src/core/symbology-ng/qgsrendererv2.h
index 3005814b1e56..9b0f26acf6f7 100644
--- a/src/core/symbology-ng/qgsrendererv2.h
+++ b/src/core/symbology-ng/qgsrendererv2.h
@@ -75,7 +75,10 @@ class CORE_EXPORT QgsFeatureRendererV2
 
     QString type() const { return mType; }
 
-    // to be overridden
+    /** to be overridden
+     * @param feature feature
+     * @return returns pointer to symbol or 0 if symbol was not found
+     */
     virtual QgsSymbolV2* symbolForFeature( QgsFeature& feature ) = 0;
 
     virtual void startRender( QgsRenderContext& context, const QgsVectorLayer *vlayer ) = 0;
@@ -97,7 +100,9 @@ class CORE_EXPORT QgsFeatureRendererV2
     {
       SymbolLevels = 1,     // rendering with symbol levels (i.e. implements symbols(), symbolForFeature())
       RotationField = 1 <<  1,    // rotate symbols by attribute value
-      MoreSymbolsPerFeature = 1 << 2  // may use more than one symbol to render a feature: symbolsForFeature() will return them
+      MoreSymbolsPerFeature = 1 << 2,  // may use more than one symbol to render a feature: symbolsForFeature() will return them
+      Filter         = 1 << 3, // features may be filtered, i.e. some features may not be rendered (categorized, rule based ...)
+      ScaleDependent = 1 << 4 // dependends on scale if feature will be rendered (rule based )
     };
 
     //! returns bitwise OR-ed capabilities of the renderer
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
index 8a7fe5da50d1..574164d121ea 100644
--- a/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
+++ b/src/core/symbology-ng/qgsrulebasedrendererv2.cpp
@@ -140,6 +140,8 @@ bool QgsRuleBasedRendererV2::Rule::isFilterOK( QgsFeature& f ) const
 
 bool QgsRuleBasedRendererV2::Rule::isScaleOK( double scale ) const
 {
+  if ( scale == 0 ) // so that we can count features in classes without scale context
+    return true;
   if ( mScaleMinDenom == 0 && mScaleMaxDenom == 0 )
     return true;
   if ( mScaleMinDenom != 0 && mScaleMinDenom > scale )
@@ -413,6 +415,22 @@ QgsSymbolV2List QgsRuleBasedRendererV2::Rule::symbolsForFeature( QgsFeature& fea
   return lst;
 }
 
+QgsRuleBasedRendererV2::RuleList QgsRuleBasedRendererV2::Rule::rulesForFeature( QgsFeature& feat )
+{
+  RuleList lst;
+  if ( !isFilterOK( feat ) )
+    return lst;
+
+  if ( mSymbol )
+    lst.append( this );
+
+  for ( QList::iterator it = mActiveChildren.begin(); it != mActiveChildren.end(); ++it )
+  {
+    Rule* rule = *it;
+    lst += rule->rulesForFeature( feat );
+  }
+  return lst;
+}
 
 void QgsRuleBasedRendererV2::Rule::stopRender( QgsRenderContext& context )
 {
diff --git a/src/core/symbology-ng/qgsrulebasedrendererv2.h b/src/core/symbology-ng/qgsrulebasedrendererv2.h
index 5b77681fd804..5d5f2f58f486 100644
--- a/src/core/symbology-ng/qgsrulebasedrendererv2.h
+++ b/src/core/symbology-ng/qgsrulebasedrendererv2.h
@@ -140,11 +140,15 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
         //! @note added in 1.9
         QgsSymbolV2List symbolsForFeature( QgsFeature& feat );
 
+        //! tell which rules will be used to render the feature
+        RuleList rulesForFeature( QgsFeature& feat );
+
         void stopRender( QgsRenderContext& context );
 
         static Rule* create( QDomElement& ruleElem, QgsSymbolV2Map& symbolMap );
 
         RuleList& children() { return mChildren; }
+        RuleList descendants() const { RuleList l; foreach ( Rule *c, mChildren ) { l += c; l += c->children(); } return l; }
         Rule* parent() { return mParent; }
 
         //! add child rule, take ownership, sets this as parent
@@ -234,7 +238,7 @@ class CORE_EXPORT QgsRuleBasedRendererV2 : public QgsFeatureRendererV2
 
     //! returns bitwise OR-ed capabilities of the renderer
     //! \note added in 2.0
-    virtual int capabilities() { return MoreSymbolsPerFeature; }
+    virtual int capabilities() { return MoreSymbolsPerFeature | Filter | ScaleDependent; }
 
     /////
 
diff --git a/src/core/symbology-ng/qgsstylev2.cpp b/src/core/symbology-ng/qgsstylev2.cpp
index 9ae1f1e55fe5..e61a29a05791 100644
--- a/src/core/symbology-ng/qgsstylev2.cpp
+++ b/src/core/symbology-ng/qgsstylev2.cpp
@@ -881,7 +881,7 @@ bool QgsStyleV2::detagSymbol( StyleEntity type, QString symbol, QStringList tags
   sqlite3_stmt *ppStmt;
   int nErr = sqlite3_prepare_v2( mCurrentDB, query, -1, &ppStmt, NULL );
 
-  int symbolid;
+  int symbolid = 0;
   if ( nErr == SQLITE_OK && sqlite3_step( ppStmt ) == SQLITE_ROW )
   {
     symbolid = sqlite3_column_int( ppStmt, 0 );
diff --git a/src/core/symbology-ng/qgssvgcache.cpp b/src/core/symbology-ng/qgssvgcache.cpp
index b0903df5aeae..6c38a2024426 100644
--- a/src/core/symbology-ng/qgssvgcache.cpp
+++ b/src/core/symbology-ng/qgssvgcache.cpp
@@ -17,6 +17,11 @@
 
 #include "qgssvgcache.h"
 #include "qgslogger.h"
+#include "qgsnetworkaccessmanager.h"
+#include "qgsmessagelog.h"
+#include 
+#include 
+#include 
 #include 
 #include 
 #include 
@@ -24,6 +29,9 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+#include 
 
 QgsSvgCacheEntry::QgsSvgCacheEntry(): file( QString() ), size( 0 ), outlineWidth( 0 ), widthScaleFactor( 1.0 ), rasterScaleFactor( 1.0 ), fill( Qt::black ),
     outline( Qt::black ), image( 0 ), picture( 0 )
@@ -81,7 +89,11 @@ QgsSvgCache* QgsSvgCache::instance()
   return mInstance;
 }
 
-QgsSvgCache::QgsSvgCache(): mTotalSize( 0 ), mLeastRecentEntry( 0 ), mMostRecentEntry( 0 )
+QgsSvgCache::QgsSvgCache( QObject *parent )
+    : QObject( parent )
+    , mTotalSize( 0 )
+    , mLeastRecentEntry( 0 )
+    , mMostRecentEntry( 0 )
 {
 }
 
@@ -163,14 +175,8 @@ void QgsSvgCache::containsParams( const QString& path, bool& hasFillParam, QColo
   defaultOutlineColor = QColor( Qt::black );
   defaultOutlineWidth = 1.0;
 
-  QFile svgFile( path );
-  if ( !svgFile.open( QIODevice::ReadOnly ) )
-  {
-    return;
-  }
-
   QDomDocument svgDoc;
-  if ( !svgDoc.setContent( &svgFile ) )
+  if ( !svgDoc.setContent( getImageData( path ) ) )
   {
     return;
   }
@@ -186,14 +192,8 @@ void QgsSvgCache::replaceParamsAndCacheSvg( QgsSvgCacheEntry* entry )
     return;
   }
 
-  QFile svgFile( entry->file );
-  if ( !svgFile.open( QIODevice::ReadOnly ) )
-  {
-    return;
-  }
-
   QDomDocument svgDoc;
-  if ( !svgDoc.setContent( &svgFile ) )
+  if ( !svgDoc.setContent( getImageData( entry->file ) ) )
   {
     return;
   }
@@ -206,6 +206,116 @@ void QgsSvgCache::replaceParamsAndCacheSvg( QgsSvgCacheEntry* entry )
   mTotalSize += entry->svgContent.size();
 }
 
+QByteArray QgsSvgCache::getImageData( const QString &path ) const
+{
+  // is it a path to local file?
+  QFile svgFile( path );
+  if ( svgFile.exists() )
+  {
+    if ( svgFile.open( QIODevice::ReadOnly ) )
+    {
+      return svgFile.readAll();
+    }
+    else
+    {
+      return QByteArray();
+    }
+  }
+
+  // maybe it's a url...
+  QUrl svgUrl( path );
+  if ( !svgUrl.isValid() )
+  {
+    return QByteArray();
+  }
+
+  // check whether it's a url pointing to a local file
+  if ( svgUrl.scheme().compare( "file", Qt::CaseInsensitive ) == 0 )
+  {
+    svgFile.setFileName( svgUrl.toLocalFile() );
+    if ( svgFile.exists() )
+    {
+      if ( svgFile.open( QIODevice::ReadOnly ) )
+      {
+        return svgFile.readAll();
+      }
+    }
+
+    // not found...
+    return QByteArray();
+  }
+
+  // the url points to a remote resource, download it!
+  QNetworkReply *reply = 0;
+
+  // The following code blocks until the file is downloaded...
+  // TODO: use signals to get reply finished notification, in this moment
+  // it's executed while rendering.
+  while ( 1 )
+  {
+    QgsDebugMsg( QString( "get svg: %1" ).arg( svgUrl.toString() ) );
+    QNetworkRequest request( svgUrl );
+    request.setAttribute( QNetworkRequest::CacheLoadControlAttribute, QNetworkRequest::PreferCache );
+    request.setAttribute( QNetworkRequest::CacheSaveControlAttribute, true );
+
+    reply = QgsNetworkAccessManager::instance()->get( request );
+    connect( reply, SIGNAL( downloadProgress( qint64, qint64 ) ), this, SLOT( downloadProgress( qint64, qint64 ) ) );
+
+    //emit statusChanged( tr( "Downloading svg." ) );
+
+    // wait until the image download finished
+    // TODO: connect to the reply->finished() signal
+    while ( !reply->isFinished() )
+    {
+      QCoreApplication::processEvents( QEventLoop::ExcludeUserInputEvents, 500 );
+    }
+
+    if ( reply->error() != QNetworkReply::NoError )
+    {
+      QgsMessageLog::logMessage( tr( "SVG request failed [error: %1 - url: %2]" ).arg( reply->errorString() ).arg( reply->url().toString() ), tr( "SVG" ) );
+
+      reply->deleteLater();
+      return QByteArray();
+    }
+
+    QVariant redirect = reply->attribute( QNetworkRequest::RedirectionTargetAttribute );
+    if ( redirect.isNull() )
+    {
+      // neither network error nor redirection
+      // TODO: cache the image
+      break;
+    }
+
+    // do a new request to the redirect url
+    svgUrl = redirect.toUrl();
+    reply->deleteLater();
+  }
+
+  QVariant status = reply->attribute( QNetworkRequest::HttpStatusCodeAttribute );
+  if ( !status.isNull() && status.toInt() >= 400 )
+  {
+    QVariant phrase = reply->attribute( QNetworkRequest::HttpReasonPhraseAttribute );
+    QgsMessageLog::logMessage( tr( "SVG request error [status: %1 - reason phrase: %2]" ).arg( status.toInt() ).arg( phrase.toString() ), tr( "SVG" ) );
+
+    reply->deleteLater();
+    return QByteArray();
+  }
+
+  QString contentType = reply->header( QNetworkRequest::ContentTypeHeader ).toString();
+  QgsDebugMsg( "contentType: " + contentType );
+  if ( !contentType.startsWith( "image/svg+xml", Qt::CaseInsensitive ) )
+  {
+    reply->deleteLater();
+    return QByteArray();
+  }
+
+  // read the image data
+  QByteArray ba = reply->readAll();
+  reply->deleteLater();
+
+  return ba;
+}
+
 void QgsSvgCache::cacheImage( QgsSvgCacheEntry* entry )
 {
   if ( !entry )
@@ -553,3 +663,9 @@ void QgsSvgCache::takeEntryFromList( QgsSvgCacheEntry* entry )
   }
 }
 
+void QgsSvgCache::downloadProgress( qint64 bytesReceived, qint64 bytesTotal )
+{
+  QString msg = tr( "%1 of %2 bytes of svg image downloaded." ).arg( bytesReceived ).arg( bytesTotal < 0 ? QString( "unknown number of" ) : QString::number( bytesTotal ) );
+  QgsDebugMsg( msg );
+  emit statusChanged( msg );
+}
diff --git a/src/core/symbology-ng/qgssvgcache.h b/src/core/symbology-ng/qgssvgcache.h
index d5f4242315f9..82d0d7bb6e1c 100644
--- a/src/core/symbology-ng/qgssvgcache.h
+++ b/src/core/symbology-ng/qgssvgcache.h
@@ -22,6 +22,7 @@
 #include 
 #include 
 #include 
+#include 
 
 class QDomElement;
 class QImage;
@@ -59,8 +60,10 @@ class CORE_EXPORT QgsSvgCacheEntry
 /**A cache for images / pictures derived from svg files. This class supports parameter replacement in svg files
 according to the svg params specification (http://www.w3.org/TR/2009/WD-SVGParamPrimer-20090616/). Supported are
 the parameters 'fill-color', 'pen-color', 'outline-width', 'stroke-width'. E.g. & list, Qt::SortOrder order )
 {
   if ( order == Qt::AscendingOrder )
   {
-    qSort( list.begin(), list.end(), _QVariantLessThan );
+    //qSort( list.begin(), list.end(), _QVariantLessThan );
+    qSort( list.begin(), list.end(), qgsVariantLessThan );
   }
   else // Qt::DescendingOrder
   {
-    qSort( list.begin(), list.end(), _QVariantGreaterThan );
+    //qSort( list.begin(), list.end(), _QVariantGreaterThan );
+    qSort( list.begin(), list.end(), qgsVariantGreaterThan );
   }
 }
 
@@ -2580,3 +2598,153 @@ QPointF QgsSymbolLayerV2Utils::pointOnLineWithDistance( const QPointF& startPoin
   double scaleFactor = distance / length;
   return QPointF( startPoint.x() + dx * scaleFactor, startPoint.y() + dy * scaleFactor );
 }
+
+
+QStringList QgsSymbolLayerV2Utils::listSvgFiles()
+{
+  // copied from QgsMarkerCatalogue - TODO: unify
+  QStringList list;
+  QStringList svgPaths = QgsApplication::svgPaths();
+
+  for ( int i = 0; i < svgPaths.size(); i++ )
+  {
+    QDir dir( svgPaths[i] );
+    foreach ( QString item, dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot ) )
+    {
+      svgPaths.insert( i + 1, dir.path() + "/" + item );
+    }
+
+    foreach ( QString item, dir.entryList( QStringList( "*.svg" ), QDir::Files ) )
+    {
+      // TODO test if it is correct SVG
+      list.append( dir.path() + "/" + item );
+    }
+  }
+  return list;
+}
+
+// Stripped down version of listSvgFiles() for specified directory
+QStringList QgsSymbolLayerV2Utils::listSvgFilesAt( QString directory )
+{
+  // TODO anything that applies for the listSvgFiles() applies this also
+
+  QStringList list;
+  QStringList svgPaths;
+  svgPaths.append( directory );
+
+  for ( int i = 0; i < svgPaths.size(); i++ )
+  {
+    QDir dir( svgPaths[i] );
+    foreach ( QString item, dir.entryList( QDir::Dirs | QDir::NoDotAndDotDot ) )
+    {
+      svgPaths.insert( i + 1, dir.path() + "/" + item );
+    }
+
+    foreach ( QString item, dir.entryList( QStringList( "*.svg" ), QDir::Files ) )
+    {
+      list.append( dir.path() + "/" + item );
+    }
+  }
+  return list;
+
+}
+
+QString QgsSymbolLayerV2Utils::symbolNameToPath( QString name )
+{
+  // copied from QgsSymbol::setNamedPointSymbol - TODO: unify
+
+  // we might have a full path...
+  if ( QFile( name ).exists() )
+    return QFileInfo( name ).canonicalFilePath();
+
+  // or it might be an url...
+  QUrl url( name );
+  if ( url.isValid() && !url.scheme().isEmpty() )
+  {
+    if ( url.scheme().compare( "file", Qt::CaseInsensitive ) == 0 )
+    {
+      // it's a url to a local file
+      name = url.toLocalFile();
+      if ( QFile( name ).exists() )
+      {
+        return QFileInfo( name ).canonicalFilePath();
+      }
+    }
+    else
+    {
+      // it's a url pointing to a online resource
+      return name;
+    }
+  }
+
+  // SVG symbol not found - probably a relative path was used
+
+  QStringList svgPaths = QgsApplication::svgPaths();
+  for ( int i = 0; i < svgPaths.size(); i++ )
+  {
+    QgsDebugMsg( "SvgPath: " + svgPaths[i] );
+    QFileInfo myInfo( name );
+    QString myFileName = myInfo.fileName(); // foo.svg
+    QString myLowestDir = myInfo.dir().dirName();
+    QString myLocalPath = svgPaths[i] + "/" + myLowestDir + "/" + myFileName;
+
+    QgsDebugMsg( "Alternative svg path: " + myLocalPath );
+    if ( QFile( myLocalPath ).exists() )
+    {
+      QgsDebugMsg( "Svg found in alternative path" );
+      return QFileInfo( myLocalPath ).canonicalFilePath();
+    }
+    else if ( myInfo.isRelative() )
+    {
+      QFileInfo pfi( QgsProject::instance()->fileName() );
+      QString alternatePath = pfi.canonicalPath() + QDir::separator() + name;
+      if ( pfi.exists() && QFile( alternatePath ).exists() )
+      {
+        QgsDebugMsg( "Svg found in alternative path" );
+        return QFileInfo( alternatePath ).canonicalFilePath();
+      }
+      else
+      {
+        QgsDebugMsg( "Svg not found in project path" );
+      }
+    }
+    else
+    {
+      //couldnt find the file, no happy ending :-(
+      QgsDebugMsg( "Computed alternate path but no svg there either" );
+    }
+  }
+  return QString();
+}
+
+QString QgsSymbolLayerV2Utils::symbolPathToName( QString path )
+{
+  // copied from QgsSymbol::writeXML
+
+  QFileInfo fi( path );
+  if ( !fi.exists() )
+    return path;
+
+  path = fi.canonicalFilePath();
+
+  QStringList svgPaths = QgsApplication::svgPaths();
+
+  bool isInSvgPathes = false;
+  for ( int i = 0; i < svgPaths.size(); i++ )
+  {
+    QString dir = QFileInfo( svgPaths[i] ).canonicalFilePath();
+
+    if ( !dir.isEmpty() && path.startsWith( dir ) )
+    {
+      path = path.mid( dir.size() );
+      isInSvgPathes = true;
+      break;
+    }
+  }
+
+  if ( isInSvgPathes )
+    return path;
+
+  return QgsProject::instance()->writePath( path );
+}
+
diff --git a/src/core/symbology-ng/qgssymbollayerv2utils.h b/src/core/symbology-ng/qgssymbollayerv2utils.h
index 1b80f8e17840..ade884985f13 100644
--- a/src/core/symbology-ng/qgssymbollayerv2utils.h
+++ b/src/core/symbology-ng/qgssymbollayerv2utils.h
@@ -216,6 +216,18 @@ class CORE_EXPORT QgsSymbolLayerV2Utils
     static void sortVariantList( QList& list, Qt::SortOrder order );
     /**Returns a point on the line from startPoint to directionPoint that is a certain distance away from the starting point*/
     static QPointF pointOnLineWithDistance( const QPointF& startPoint, const QPointF& directionPoint, double distance );
+
+    //! Return a list of all available svg files
+    static QStringList listSvgFiles();
+
+    //! Return a list of svg files at the specified directory
+    static QStringList listSvgFilesAt( QString directory );
+
+    //! Get symbol's path from its name
+    static QString symbolNameToPath( QString name );
+
+    //! Get symbols's name from its path
+    static QString symbolPathToName( QString path );
 };
 
 class QPolygonF;
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
index 99c17fa6ae5c..10878d5a1183 100644
--- a/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
+++ b/src/core/symbology-ng/qgsvectorcolorrampv2.cpp
@@ -24,13 +24,29 @@
 #include  // for random()
 #include 
 
-QgsVectorGradientColorRampV2::QgsVectorGradientColorRampV2( QColor color1, QColor color2 )
-    : mColor1( color1 ), mColor2( color2 )
+//////////////
+
+static QColor _interpolate( QColor c1, QColor c2, double value )
+{
+  int r = ( int )( c1.red() + value * ( c2.red() - c1.red() ) );
+  int g = ( int )( c1.green() + value * ( c2.green() - c1.green() ) );
+  int b = ( int )( c1.blue() + value * ( c2.blue() - c1.blue() ) );
+  int a = ( int )( c1.alpha() + value * ( c2.alpha() - c1.alpha() ) );
+
+  return QColor::fromRgb( r, g, b, a );
+}
+
+//////////////
+
+QgsVectorGradientColorRampV2::QgsVectorGradientColorRampV2( QColor color1, QColor color2,
+    bool discrete, QgsGradientStopsList stops )
+    : mColor1( color1 ), mColor2( color2 ), mDiscrete( discrete ), mStops( stops )
 {
 }
 
 QgsVectorColorRampV2* QgsVectorGradientColorRampV2::create( const QgsStringMap& props )
 {
+  // color1 and color2
   QColor color1 = DEFAULT_GRADIENT_COLOR1;
   QColor color2 = DEFAULT_GRADIENT_COLOR2;
   if ( props.contains( "color1" ) )
@@ -38,7 +54,8 @@ QgsVectorColorRampV2* QgsVectorGradientColorRampV2::create( const QgsStringMap&
   if ( props.contains( "color2" ) )
     color2 = QgsSymbolLayerV2Utils::decodeColor( props["color2"] );
 
-  StopsMap stops;
+  //stops
+  QgsGradientStopsList stops;
   if ( props.contains( "stops" ) )
   {
     foreach ( QString stop, props["stops"].split( ':' ) )
@@ -48,48 +65,63 @@ QgsVectorColorRampV2* QgsVectorGradientColorRampV2::create( const QgsStringMap&
         continue;
 
       QColor c = QgsSymbolLayerV2Utils::decodeColor( stop.mid( i + 1 ) );
-      stops.insert( stop.left( i ).toDouble(), c );
+      stops.append( QgsGradientStop( stop.left( i ).toDouble(), c ) );
     }
   }
 
-  QgsVectorGradientColorRampV2* r = new QgsVectorGradientColorRampV2( color1, color2 );
-  r->setStops( stops );
-  return r;
-}
+  // discrete vs. continuous
+  bool discrete = false;
+  if ( props.contains( "discrete" ) )
+  {
+    if ( props["discrete"] == "1" )
+      discrete = true;
+  }
 
-static QColor _interpolate( QColor c1, QColor c2, double value )
-{
-  int r = ( int )( c1.red() + value * ( c2.red() - c1.red() ) );
-  int g = ( int )( c1.green() + value * ( c2.green() - c1.green() ) );
-  int b = ( int )( c1.blue() + value * ( c2.blue() - c1.blue() ) );
-  int a = ( int )( c1.alpha() + value * ( c2.alpha() - c1.alpha() ) );
+  // search for information keys starting with "info_"
+  QgsStringMap info;
+  for ( QgsStringMap::const_iterator it = props.constBegin();
+        it != props.constEnd(); ++it )
+  {
+    if ( it.key().startsWith( "info_" ) )
+      info[ it.key().mid( 5 )] = it.value();
+  }
 
-  return QColor::fromRgb( r, g, b, a );
+  QgsVectorGradientColorRampV2* r = new QgsVectorGradientColorRampV2( color1, color2, discrete, stops );
+  r->setInfo( info );
+  return r;
 }
 
 QColor QgsVectorGradientColorRampV2::color( double value ) const
 {
   if ( mStops.isEmpty() )
   {
+    if ( mDiscrete )
+      return mColor1;
     return _interpolate( mColor1, mColor2, value );
   }
   else
   {
-    double lower = 0, upper;
+    double lower = 0, upper = 0;
     QColor c1 = mColor1, c2;
-    for ( StopsMap::const_iterator it = mStops.begin(); it != mStops.end(); ++it )
+    for ( QgsGradientStopsList::const_iterator it = mStops.begin(); it != mStops.end(); ++it )
     {
-      if ( it.key() >= value )
+      if ( it->offset > value )
       {
-        upper = it.key();
-        c2 = it.value();
+        if ( mDiscrete )
+          return c1;
+
+        upper = it->offset;
+        c2 = it->color;
 
         return upper == lower ? c1 : _interpolate( c1, c2, ( value - lower ) / ( upper - lower ) );
       }
-      lower = it.key();
-      c1 = it.value();
+      lower = it->offset;
+      c1 = it->color;
     }
 
+    if ( mDiscrete )
+      return c1;
+
     upper = 1;
     c2 = mColor2;
     return upper == lower ? c1 : _interpolate( c1, c2, ( value - lower ) / ( upper - lower ) );
@@ -98,8 +130,9 @@ QColor QgsVectorGradientColorRampV2::color( double value ) const
 
 QgsVectorColorRampV2* QgsVectorGradientColorRampV2::clone() const
 {
-  QgsVectorGradientColorRampV2* r = new QgsVectorGradientColorRampV2( mColor1, mColor2 );
-  r->setStops( mStops );
+  QgsVectorGradientColorRampV2* r = new QgsVectorGradientColorRampV2( mColor1, mColor2,
+      mDiscrete, mStops );
+  r->setInfo( mInfo );
   return r;
 }
 
@@ -111,14 +144,64 @@ QgsStringMap QgsVectorGradientColorRampV2::properties() const
   if ( !mStops.isEmpty() )
   {
     QStringList lst;
-    for ( StopsMap::const_iterator it = mStops.begin(); it != mStops.end(); ++it )
+    for ( QgsGradientStopsList::const_iterator it = mStops.begin(); it != mStops.end(); ++it )
     {
-      lst.append( QString( "%1;%2" ).arg( it.key() ).arg( QgsSymbolLayerV2Utils::encodeColor( it.value() ) ) );
+      lst.append( QString( "%1;%2" ).arg( it->offset ).arg( QgsSymbolLayerV2Utils::encodeColor( it->color ) ) );
     }
     map["stops"] = lst.join( ":" );
   }
+
+  map["discrete"] = mDiscrete ? "1" : "0";
+
+  for ( QgsStringMap::const_iterator it = mInfo.constBegin();
+        it != mInfo.constEnd(); ++it )
+  {
+    map["info_" + it.key()] = it.value();
+  }
+
   return map;
 }
+void QgsVectorGradientColorRampV2::convertToDiscrete( bool discrete )
+{
+  if ( discrete == mDiscrete )
+    return;
+
+  // if going to/from Discrete, re-arrange stops
+  // this will only work when stops are equally-spaced
+  QgsGradientStopsList newStops;
+  if ( discrete )
+  {
+    // re-arrange stops offset
+    int numStops = mStops.count() + 2;
+    int i = 1;
+    for ( QgsGradientStopsList::const_iterator it = mStops.begin();
+          it != mStops.end(); ++it )
+    {
+      newStops.append( QgsGradientStop(( double ) i / numStops, it->color ) );
+      if ( i == numStops - 1 )
+        break;
+      i++;
+    }
+    // replicate last color
+    newStops.append( QgsGradientStop(( double ) i / numStops, mColor2 ) );
+  }
+  else
+  {
+    // re-arrange stops offset, remove duplicate last color
+    int numStops = mStops.count() + 2;
+    int i = 1;
+    for ( QgsGradientStopsList::const_iterator it = mStops.begin();
+          it != mStops.end(); ++it )
+    {
+      newStops.append( QgsGradientStop(( double ) i / ( numStops - 2 ), it->color ) );
+      if ( i == numStops - 3 )
+        break;
+      i++;
+    }
+  }
+  mStops = newStops;
+  mDiscrete = discrete;
+}
 
 //////////////
 
@@ -256,33 +339,12 @@ QgsStringMap QgsVectorColorBrewerColorRampV2::properties() const
 
 ////////////
 
-/*
-TODO
-- return a suitable name (scheme_variant) ??
-- re-organize and rename colorramp classes and widgets
- */
-
-/*
-TODO load schemes
-- don't show empty dirs? (e.g. jjg/hatch)
-
-- better grouping:
-  - cl/fs2????
-  - cw
-  - dca
-  - dirs with one scheme ( cl/ es/ ma/ occ/ wkp/
-      jjg/neo10/env/green-crystal jjg/neo10/face/eyes/blue )
-
-- fix rendering:
-  - ibcao
-
-*/
 
 QgsCptCityColorRampV2::QgsCptCityColorRampV2( QString schemeName, QString variantName,
     bool doLoadFile )
-    : mSchemeName( schemeName ), mVariantName( variantName ),
-    mVariantList( QStringList() ), mFileLoaded( false ),
-    mGradientType( Continuous )
+    : QgsVectorGradientColorRampV2(),
+    mSchemeName( schemeName ), mVariantName( variantName ),
+    mVariantList( QStringList() ), mFileLoaded( false ), mMultiStops( false )
 {
   // TODO replace this with hard-coded data in the default case
   // don't load file if variant is missing
@@ -292,9 +354,9 @@ QgsCptCityColorRampV2::QgsCptCityColorRampV2( QString schemeName, QString varian
 
 QgsCptCityColorRampV2::QgsCptCityColorRampV2( QString schemeName,  QStringList variantList,
     QString variantName, bool doLoadFile )
-    : mSchemeName( schemeName ), mVariantName( variantName ),
-    mVariantList( variantList ), mFileLoaded( false ),
-    mGradientType( Continuous )
+    : QgsVectorGradientColorRampV2(),
+    mSchemeName( schemeName ), mVariantName( variantName ),
+    mVariantList( variantList ), mFileLoaded( false ), mMultiStops( false )
 {
   mVariantList = variantList;
 
@@ -317,41 +379,6 @@ QgsVectorColorRampV2* QgsCptCityColorRampV2::create( const QgsStringMap& props )
   return new QgsCptCityColorRampV2( schemeName, variantName );
 }
 
-QColor QgsCptCityColorRampV2::color( double value ) const
-{
-  int numStops = mPalette.count();
-  if ( mPalette.isEmpty() || value < 0 || value > 1 || numStops < 2 )
-    return QColor( 255, 0, 0 ); // red color as a warning :)
-
-  double lower = 0, upper = 0;
-  QColor c1, c2;
-  c1 = mPalette[0].second;
-  for ( int i = 0; i < numStops; i++ )
-  {
-    if ( mPalette[i].first > value )
-    {
-      if ( mGradientType == Discrete )
-        return c1;
-
-      upper = mPalette[i].first;
-      c2 = mPalette[i].second;
-
-      return upper == lower ? c1 : _interpolate( c1, c2, ( value - lower ) / ( upper - lower ) );
-    }
-
-    lower = mPalette[i].first;
-    c1 = mPalette[i].second;
-  }
-
-  if ( mGradientType == Discrete )
-    return c1;
-
-  upper = 1;
-  c2 = mPalette[ numStops - 1 ].second;
-
-  return upper == lower ? c1 : _interpolate( c1, c2, ( value - lower ) / ( upper - lower ) );
-}
-
 QgsVectorColorRampV2* QgsCptCityColorRampV2::clone() const
 {
   QgsCptCityColorRampV2* ramp = new QgsCptCityColorRampV2( "", "", false );
@@ -363,17 +390,32 @@ void QgsCptCityColorRampV2::copy( const QgsCptCityColorRampV2* other )
 {
   if ( ! other )
     return;
+  mColor1 = other->color1();
+  mColor2 = other->color2();
+  mDiscrete = other->isDiscrete();
+  mStops = other->stops();
   mSchemeName = other->mSchemeName;
   mVariantName = other->mVariantName;
   mVariantList = other->mVariantList;
   mFileLoaded = other->mFileLoaded;
-  if ( other->mFileLoaded )
-  {
-    mGradientType = other->mGradientType;
-    mPalette = other->mPalette;
-  }
 }
 
+QgsVectorGradientColorRampV2* QgsCptCityColorRampV2::cloneGradientRamp() const
+{
+  QgsVectorGradientColorRampV2* ramp =
+    new QgsVectorGradientColorRampV2( mColor1, mColor2, mDiscrete, mStops );
+  // add author and copyright information
+  // TODO also add COPYING.xml file/link?
+  QgsStringMap info = copyingInfo();
+  info["cpt-city-gradient"] = "/" + mSchemeName + mVariantName + ".svg";
+  QString copyingFilename = copyingFileName();
+  copyingFilename.remove( QgsCptCityArchive::defaultBaseDir() );
+  info["cpt-city-license"] = "" + copyingFilename;
+  ramp->setInfo( info );
+  return ramp;
+}
+
+
 QgsStringMap QgsCptCityColorRampV2::properties() const
 {
   QgsStringMap map;
@@ -405,7 +447,7 @@ QString QgsCptCityColorRampV2::descFileName() const
                                           QgsCptCityArchive::defaultBaseDir() );
 }
 
-QMap< QString, QString > QgsCptCityColorRampV2::copyingInfo( ) const
+QgsStringMap QgsCptCityColorRampV2::copyingInfo( ) const
 {
   return QgsCptCityArchive::copyingInfo( copyingFileName() );
 }
@@ -434,12 +476,13 @@ bool QgsCptCityColorRampV2::loadFile()
 
   // add colors to palette
   mFileLoaded = false;
-  mPalette.clear();
+  mStops.clear();
   QMap >::const_iterator it, prev;
   // first detect if file is gradient is continuous or dicrete
   // discrete: stop contains 2 colors and first color is identical to previous second
   // multi: stop contains 2 colors and no relation with previous stop
-  mGradientType = Continuous;
+  mDiscrete = false;
+  mMultiStops = false;
   it = prev = colorMap.constBegin();
   while ( it != colorMap.constEnd() )
   {
@@ -448,12 +491,12 @@ bool QgsCptCityColorRampV2::loadFile()
     {
       if ( it.value().first == prev.value().second )
       {
-        mGradientType = Discrete;
+        mDiscrete = true;
         break;
       }
       else
       {
-        mGradientType = ContinuousMulti;
+        mMultiStops = true;
         break;
       }
     }
@@ -461,26 +504,35 @@ bool QgsCptCityColorRampV2::loadFile()
     ++it;
   }
 
+  // fill all stops
   it = prev = colorMap.constBegin();
   while ( it != colorMap.constEnd() )
   {
-    if ( mGradientType == Discrete )
+    if ( mDiscrete )
     {
-      mPalette << qMakePair( it.key(), it.value().second );
+      // mPalette << qMakePair( it.key(), it.value().second );
+      mStops.append( QgsGradientStop( it.key(), it.value().second ) );
     }
     else
     {
-      mPalette << qMakePair( it.key(), it.value().first );
-      if (( mGradientType == ContinuousMulti ) &&
+      // mPalette << qMakePair( it.key(), it.value().first );
+      mStops.append( QgsGradientStop( it.key(), it.value().first ) );
+      if (( mMultiStops ) &&
           ( it.key() != 0.0 && it.key() != 1.0 ) )
       {
-        mPalette << qMakePair( it.key(), it.value().second );
+        mStops.append( QgsGradientStop( it.key(), it.value().second ) );
       }
     }
     prev = it;
     ++it;
   }
 
+  // remove first and last items (mColor1 and mColor2)
+  if ( ! mStops.isEmpty() && mStops.first().offset == 0.0 )
+    mColor1 = mStops.takeFirst().color;
+  if ( ! mStops.isEmpty() && mStops.last().offset == 1.0 )
+    mColor2 = mStops.takeLast().color;
+
   mFileLoaded = true;
   return true;
 }
diff --git a/src/core/symbology-ng/qgsvectorcolorrampv2.h b/src/core/symbology-ng/qgsvectorcolorrampv2.h
index 9239d41427fc..d47823b3c442 100644
--- a/src/core/symbology-ng/qgsvectorcolorrampv2.h
+++ b/src/core/symbology-ng/qgsvectorcolorrampv2.h
@@ -36,6 +36,15 @@ class CORE_EXPORT QgsVectorColorRampV2
 
 };
 
+struct QgsGradientStop
+{
+  double offset;
+  QColor color;
+  QgsGradientStop( double o, const QColor& c ) : offset( o ), color( c ) { }
+};
+
+typedef QList QgsGradientStopsList;
+
 #define DEFAULT_GRADIENT_COLOR1 QColor(0,0,255)
 #define DEFAULT_GRADIENT_COLOR2 QColor(0,255,0)
 
@@ -43,7 +52,9 @@ class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2
 {
   public:
     QgsVectorGradientColorRampV2( QColor color1 = DEFAULT_GRADIENT_COLOR1,
-                                  QColor color2 = DEFAULT_GRADIENT_COLOR2 );
+                                  QColor color2 = DEFAULT_GRADIENT_COLOR2,
+                                  bool discrete = false,
+                                  QgsGradientStopsList stops = QgsGradientStopsList() );
 
     static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() );
 
@@ -57,18 +68,24 @@ class CORE_EXPORT QgsVectorGradientColorRampV2 : public QgsVectorColorRampV2
 
     QColor color1() const { return mColor1; }
     QColor color2() const { return mColor2; }
-
     void setColor1( QColor color ) { mColor1 = color; }
     void setColor2( QColor color ) { mColor2 = color; }
 
-    typedef QMap StopsMap;
+    bool isDiscrete() const { return mDiscrete; }
+    void setDiscrete( bool discrete ) { mDiscrete = discrete; }
+    void convertToDiscrete( bool discrete );
+
+    void setStops( const QgsGradientStopsList& stops ) { mStops = stops; }
+    const QgsGradientStopsList& stops() const { return mStops; }
 
-    void setStops( const StopsMap& stops ) { mStops = stops; }
-    const StopsMap& stops() const { return mStops; }
+    QgsStringMap info() const { return mInfo; }
+    void setInfo( const QgsStringMap& info ) { mInfo = info; }
 
   protected:
     QColor mColor1, mColor2;
-    StopsMap mStops;
+    bool mDiscrete;
+    QgsGradientStopsList mStops;
+    QgsStringMap mInfo;
 };
 
 #define DEFAULT_RANDOM_COUNT   10
@@ -163,7 +180,7 @@ class CORE_EXPORT QgsVectorColorBrewerColorRampV2 : public QgsVectorColorRampV2
 #define DEFAULT_CPTCITY_SCHEMENAME "cb/div/BrBG_" //change this
 #define DEFAULT_CPTCITY_VARIANTNAME "05"
 
-class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
+class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorGradientColorRampV2
 {
   public:
     QgsCptCityColorRampV2( QString schemeName = DEFAULT_CPTCITY_SCHEMENAME,
@@ -172,36 +189,19 @@ class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
     QgsCptCityColorRampV2( QString schemeName, QStringList variantList,
                            QString variantName = QString(), bool doLoadFile = true );
 
-
-    enum GradientType
-    {
-      Discrete, //discrete stops, e.g. Color Brewer
-      Continuous, //continuous, e.g. QgsVectorColorRampV2
-      ContinuousMulti //continuous with 2 values in intermediate stops
-    };
-    typedef QList< QPair < double, QColor > > GradientList;
-
-
     static QgsVectorColorRampV2* create( const QgsStringMap& properties = QgsStringMap() );
 
-    virtual QColor color( double value ) const;
-
     virtual QString type() const { return "cpt-city"; }
 
     virtual QgsVectorColorRampV2* clone() const;
     void copy( const QgsCptCityColorRampV2* other );
+    QgsVectorGradientColorRampV2* cloneGradientRamp() const;
 
     virtual QgsStringMap properties() const;
 
-    int count() const { return mPalette.count(); }
-
     QString schemeName() const { return mSchemeName; }
     QString variantName() const { return mVariantName; }
     QStringList variantList() const { return mVariantList; }
-    /* QgsCptCityCollection* collection() const { return mCollection; } */
-    /* QString collectionName() const { return mCollectionName; } */
-    /* QgsCptCityCollection* collection() const */
-    /* { return QgsCptCityCollection::collectionRegistry().value( mCollectionName ); } */
 
     /* lazy loading - have to call loadPalette() explicitly */
     void setSchemeName( QString schemeName ) { mSchemeName = schemeName; mFileLoaded = false; }
@@ -211,8 +211,8 @@ class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
     { mSchemeName = schemeName; mVariantName = variantName; mVariantList = variantList; mFileLoaded = false; }
 
     void loadPalette() { loadFile(); }
-    /* bool isContinuous() const { return mContinuous; } */
-    GradientType gradientType() const { return mGradientType; }
+    bool hasMultiStops() const { return mMultiStops; }
+    int count() const { return mStops.count() + 2; }
 
     QString fileName() const;
     bool loadFile();
@@ -220,7 +220,7 @@ class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
 
     QString copyingFileName() const;
     QString descFileName() const;
-    QMap< QString, QString > copyingInfo() const;
+    QgsStringMap copyingInfo() const;
 
   protected:
 
@@ -228,8 +228,7 @@ class CORE_EXPORT QgsCptCityColorRampV2 : public QgsVectorColorRampV2
     QString mVariantName;
     QStringList mVariantList;
     bool mFileLoaded;
-    GradientType mGradientType;
-    GradientList mPalette;
+    bool mMultiStops;
 };
 
 
diff --git a/src/designer/README.txt b/src/designer/README.txt
index 507decfa3648..85444c6979cc 100644
--- a/src/designer/README.txt
+++ b/src/designer/README.txt
@@ -7,13 +7,13 @@ Introduction:
 
 The purpose of the QGIS designer plugins is to enable all third
 party developers to create GIS enabled Qt4 based applications
-with minimal programming. The idea being that you use the 
+with minimal programming. The idea being that you use the
 standard Qt4 Designer GUI design tool to create your user
 interface and then add map canvas, legend, projection selector
 etc. type of widgets from the toolbox of widgets in designer
 - with QGIS having added its own group of custome widgets there.
 The QGIS custom widgets can then be graphically 'programmed' by
-setting widget properties and using interactive signal/slot 
+setting widget properties and using interactive signal/slot
 connectors.
 
 Plugin Paths:
@@ -22,25 +22,25 @@ There are two options for having Qt4 Designer find your
 plugins at startup:
 
 1) copy the plugin from {QGIS Install Prefix}/lib/qgis/designer
-   into the standard Qt4 designer plugin directory at 
+   into the standard Qt4 designer plugin directory at
    $QTDIR/plugins/designer/
 
 2) export the environment variable QT_PLUGIN_PATH with all the
    places designer should look for your plugins in. Separate
    each entry with a colon. So for example:
-   
+
    export QT_PLUGIN_PATH={QGIS Install Prefix}/lib/qgis
 
    Note that the 'designer' directory is omitted from the path.
 
-   Its probably a good idea to add the above export clause to 
-   your ~/.bash_profile or ~/.bashrc if you plan to use the 
+   Its probably a good idea to add the above export clause to
+   your ~/.bash_profile or ~/.bashrc if you plan to use the
    designer plugins frequently.
 
 
 Additional Notes:
 
-If you built Qt4 in debug mode then the designer plugins must also 
+If you built Qt4 in debug mode then the designer plugins must also
 be built in debug mode or they will be ignored. The converse is also
 true.
 
diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt
index 96e08064c555..9cf3830e4033 100644
--- a/src/gui/CMakeLists.txt
+++ b/src/gui/CMakeLists.txt
@@ -48,6 +48,7 @@ qgisinterface.cpp
 qgsannotationitem.cpp
 qgsattributeeditor.cpp
 qgslegendinterface.cpp
+qgscharacterselectdialog.cpp
 qgscolorbutton.cpp
 qgscomposerview.cpp
 qgscursors.cpp
@@ -56,6 +57,7 @@ qgsdetaileditemwidget.cpp
 qgsdetaileditemdata.cpp
 qgsdialog.cpp
 qgsencodingfiledialog.cpp
+qgserrordialog.cpp
 qgsfiledropedit.cpp
 qgsfieldvalidator.cpp
 qgsformannotationitem.cpp
@@ -88,6 +90,7 @@ qgsrasterformatsaveoptionswidget.cpp
 qgsrasterpyramidsoptionswidget.cpp
 qgsrubberband.cpp
 qgsscalecombobox.cpp
+qgssvgannotationitem.cpp
 qgstextannotationitem.cpp
 qgsvertexmarker.cpp
 qgsludialog.cpp
@@ -97,6 +100,7 @@ qgsexpressionbuilderdialog.cpp
 qgsexpressionhighlighter.cpp
 qgsquerybuilder.cpp
 qgscollapsiblegroupbox.cpp
+qgsfilterlineedit.cpp
 )
 
 IF (WITH_TOUCH)
@@ -148,6 +152,7 @@ attributetable/qgsattributetablememorymodel.h
 attributetable/qgsattributetabledelegate.h
 
 qgsattributeeditor.h
+qgscharacterselectdialog.h
 qgscomposerview.h
 qgsdetaileditemdelegate.h
 qgsdetaileditemwidget.h
@@ -155,6 +160,7 @@ qgsdialog.h
 qgslegendinterface.h
 qgisinterface.h
 qgsencodingfiledialog.h
+qgserrordialog.h
 qgsfieldvalidator.h
 qgsformannotationitem.h
 qgshtmlannotationitem.h
@@ -184,6 +190,7 @@ qgsexpressionbuilderwidget.h
 qgsexpressionhighlighter.h
 qgsquerybuilder.h
 qgscollapsiblegroupbox.h
+qgsfilterlineedit.h
 )
 
 QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
@@ -193,6 +200,7 @@ QT4_WRAP_CPP(QGIS_GUI_MOC_SRCS ${QGIS_GUI_MOC_HDRS})
 SET(QGIS_GUI_HDRS
 qgisgui.h
 qgisinterface.h
+qgscharacterselectdialog.h
 qgscolorbutton.h
 qgscursors.h
 qgsencodingfiledialog.h
@@ -223,6 +231,7 @@ qgsexpressionbuilderwidget.h
 qgsexpressionbuilderdialog.h
 qgsexpressionhighlighter.h
 qgscollapsiblegroupbox.h
+qgsfilterlineedit.h
 
 attributetable/qgsattributetablemodel.h
 attributetable/qgsattributetablememorymodel.h
diff --git a/src/gui/attributetable/qgsattributetablemodel.cpp b/src/gui/attributetable/qgsattributetablemodel.cpp
index 04f53eefbe1d..41bea00676fe 100644
--- a/src/gui/attributetable/qgsattributetablemodel.cpp
+++ b/src/gui/attributetable/qgsattributetablemodel.cpp
@@ -21,6 +21,7 @@
 #include "qgslogger.h"
 #include "qgsattributeaction.h"
 #include "qgsmapcanvas.h"
+#include "qgsrendererv2.h"
 
 #include 
 #include 
@@ -44,7 +45,9 @@ QgsAttributeTableModel::QgsAttributeTableModel( QgsMapCanvas *canvas, QgsVectorL
   connect( mLayer, SIGNAL( attributeAdded( int ) ), this, SLOT( attributeAdded( int ) ) );
   connect( mLayer, SIGNAL( attributeDeleted( int ) ), this, SLOT( attributeDeleted( int ) ) );
 
+  connect( mLayer, SIGNAL( repaintRequested() ), this, SLOT( layerRepaintRequested() ) );
   connect( mCanvas, SIGNAL( extentsChanged() ), this, SLOT( extentsChanged() ) );
+
   extentsChanged();
 }
 
@@ -282,19 +285,63 @@ void QgsAttributeTableModel::loadLayer()
   }
   else
   {
+    bool filter = false;
     QgsRectangle rect;
+    QgsAttributeList attributeList;
+    QgsRenderContext renderContext;
+    QgsFeatureRendererV2* renderer = mLayer->rendererV2();
     if ( behaviour == 2 )
     {
       // current canvas only
       rect = mCurrentExtent;
+
+      if ( !renderer )
+      {
+        QgsDebugMsg( "Cannot get renderer" );
+      }
+
+      if ( mLayer->hasScaleBasedVisibility() &&
+           ( mLayer->minimumScale() > mCanvas->mapRenderer()->scale() ||
+             mLayer->maximumScale() <= mCanvas->mapRenderer()->scale() ) )
+      {
+        QgsDebugMsg( "Out of scale limits" );
+      }
+      else
+      {
+        if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent )
+        {
+          // setup scale
+          // mapRenderer()->renderContext()->scale is not automaticaly updated when
+          // render extent changes (because it's scale is used to identify if changed
+          // since last render) -> use local context
+          renderContext.setExtent( mCanvas->mapRenderer()->rendererContext()->extent() );
+          renderContext.setMapToPixel( mCanvas->mapRenderer()->rendererContext()->mapToPixel() );
+          renderContext.setRendererScale( mCanvas->mapRenderer()->scale() );
+          renderer->startRender( renderContext, mLayer );
+        }
+
+        filter = renderer && renderer->capabilities() & QgsFeatureRendererV2::Filter;
+      }
+
+      if ( filter )
+      {
+        QList attributeNameList = renderer->usedAttributes();
+        foreach ( QString attributeName, attributeNameList )
+        {
+          attributeList.append( mLayer->fieldNameIndex( attributeName ) );
+        }
+      }
     }
 
-    mLayer->select( QgsAttributeList(), rect, false );
+    mLayer->select( attributeList, rect, false );
 
     QgsFeature f;
     for ( i = 0; mLayer->nextFeature( f ); ++i )
     {
-      featureAdded( f.id() );
+      if ( !filter || renderer->willRenderFeature( f ) )
+      {
+        featureAdded( f.id() );
+      }
 
       if ( t.elapsed() > 5000 )
       {
@@ -306,6 +353,12 @@ void QgsAttributeTableModel::loadLayer()
         t.restart();
       }
     }
+
+    if ( renderer && renderer->capabilities() & QgsFeatureRendererV2::ScaleDependent )
+    {
+      renderer->stopRender( renderContext );
+    }
+
     emit finished();
   }
 
@@ -612,5 +665,27 @@ QgsFeature QgsAttributeTableModel::feature( const QModelIndex &idx ) const
 
 void QgsAttributeTableModel::extentsChanged()
 {
+  QgsDebugMsg( "Entered" );
   mCurrentExtent = mCanvas->mapRenderer()->mapToLayerCoordinates( mLayer, mCanvas->extent() );
+
+  QSettings settings;
+  int behaviour = settings.value( "/qgis/attributeTableBehaviour", 0 ).toInt();
+  if ( behaviour == 2 ) // features in current canvas
+  {
+    loadLayer();
+  }
+}
+
+void QgsAttributeTableModel::layerRepaintRequested()
+{
+  QgsDebugMsg( "Entered" );
+  // Added to reload table if properties changed and so some features could become invisible
+  // TODO: in theory we need to reload table only if previous or new renderer
+  // capabilities are ScaleDependent or Filter
+  QSettings settings;
+  int behaviour = settings.value( "/qgis/attributeTableBehaviour", 0 ).toInt();
+  if ( behaviour == 2 ) // features in current canvas
+  {
+    loadLayer();
+  }
 }
diff --git a/src/gui/attributetable/qgsattributetablemodel.h b/src/gui/attributetable/qgsattributetablemodel.h
index e1e159e0a797..3ac578b2a4ae 100644
--- a/src/gui/attributetable/qgsattributetablemodel.h
+++ b/src/gui/attributetable/qgsattributetablemodel.h
@@ -154,6 +154,8 @@ class GUI_EXPORT QgsAttributeTableModel: public QAbstractTableModel
   public slots:
     void extentsChanged();
 
+    void layerRepaintRequested();
+
   private slots:
     /**
      * Launched when attribute has been added
diff --git a/src/gui/qgisinterface.h b/src/gui/qgisinterface.h
index 7dd36aaf380c..3328867a57a3 100644
--- a/src/gui/qgisinterface.h
+++ b/src/gui/qgisinterface.h
@@ -461,11 +461,21 @@ class GUI_EXPORT QgisInterface : public QObject
     Q_DECL_DEPRECATED
 #endif
     virtual QAction *actionLayerSeparator1() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionCopyLayerStyle() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionPasteLayerStyle() = 0;
     virtual QAction *actionOpenTable() = 0;
     virtual QAction *actionToggleEditing() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionSaveEdits() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionSaveAllEdits() = 0;
     virtual QAction *actionLayerSaveAs() = 0;
     virtual QAction *actionLayerSelectionSaveAs() = 0;
     virtual QAction *actionRemoveLayer() = 0;
+    /** @note added in 1.9 */
+    virtual QAction *actionDuplicateLayer() = 0;
     virtual QAction *actionLayerProperties() = 0;
 #ifndef Q_MOC_RUN
     Q_DECL_DEPRECATED
diff --git a/src/gui/qgsannotationitem.cpp b/src/gui/qgsannotationitem.cpp
index a3f51921f5e4..c7cd98d0b530 100644
--- a/src/gui/qgsannotationitem.cpp
+++ b/src/gui/qgsannotationitem.cpp
@@ -397,6 +397,7 @@ void QgsAnnotationItem::_writeXML( QDomDocument& doc, QDomElement& itemElem ) co
   annotationElem.setAttribute( "canvasPosY", QString::number( canvasPos.y() ) );
   annotationElem.setAttribute( "frameBorderWidth", QString::number( mFrameBorderWidth ) );
   annotationElem.setAttribute( "frameColor", mFrameColor.name() );
+  annotationElem.setAttribute( "frameColorAlpha", mFrameColor.alpha() );
   annotationElem.setAttribute( "frameBackgroundColor", mFrameBackgroundColor.name() );
   annotationElem.setAttribute( "frameBackgroundColorAlpha", mFrameBackgroundColor.alpha() );
   annotationElem.setAttribute( "visible", isVisible() );
@@ -428,6 +429,7 @@ void QgsAnnotationItem::_readXML( const QDomDocument& doc, const QDomElement& an
   mMapPosition = mapPos;
   mFrameBorderWidth = annotationElem.attribute( "frameBorderWidth", "0.5" ).toDouble();
   mFrameColor.setNamedColor( annotationElem.attribute( "frameColor", "#000000" ) );
+  mFrameColor.setAlpha( annotationElem.attribute( "frameColorAlpha", "255" ).toInt() );
   mFrameBackgroundColor.setNamedColor( annotationElem.attribute( "frameBackgroundColor" ) );
   mFrameBackgroundColor.setAlpha( annotationElem.attribute( "frameBackgroundColorAlpha", "255" ).toInt() );
   mFrameSize.setWidth( annotationElem.attribute( "frameWidth", "50" ).toDouble() );
diff --git a/src/gui/qgsattributeeditor.cpp b/src/gui/qgsattributeeditor.cpp
index 17efbf760644..8b74f947a805 100644
--- a/src/gui/qgsattributeeditor.cpp
+++ b/src/gui/qgsattributeeditor.cpp
@@ -43,6 +43,8 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
 void QgsAttributeEditor::selectFileName()
 {
@@ -124,6 +126,12 @@ QListWidget *QgsAttributeEditor::listWidget( QWidget *editor, QWidget *parent )
 }
 
 QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *editor, QgsVectorLayer *vl, int idx, const QVariant &value )
+{
+  QMap dummyProxyWidgets;
+  return createAttributeEditor( parent, editor, vl, idx, value, dummyProxyWidgets );
+}
+
+QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *editor, QgsVectorLayer *vl, int idx, const QVariant &value, QMap &proxyWidgets )
 {
   if ( !vl )
     return 0;
@@ -133,6 +141,8 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
   const QgsField &field = vl->pendingFields()[idx];
   QVariant::Type myFieldType = field.type();
 
+  bool synchronized = false;
+
   switch ( editType )
   {
     case QgsVectorLayer::UniqueValues:
@@ -429,12 +439,14 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
       QLineEdit *le = 0;
       QTextEdit *te = 0;
       QPlainTextEdit *pte = 0;
+      QComboBox * cb = 0;
 
       if ( editor )
       {
         le = qobject_cast( editor );
         te = qobject_cast( editor );
         pte = qobject_cast( editor );
+        cb = qobject_cast( editor );
       }
       else if ( editType == QgsVectorLayer::TextEdit )
       {
@@ -447,7 +459,6 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
 
       if ( le )
       {
-
         if ( editType == QgsVectorLayer::UniqueValuesEditable )
         {
           QList values;
@@ -468,6 +479,7 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
         }
 
         le->setValidator( new QgsFieldValidator( le, field ) );
+
         myWidget = le;
       }
 
@@ -482,9 +494,43 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
         myWidget = pte;
       }
 
+      if ( cb )
+      {
+        myWidget = cb;
+      }
+
       if ( myWidget )
       {
         myWidget->setDisabled( editType == QgsVectorLayer::Immutable );
+
+        QgsStringRelay* relay = NULL;
+
+        QMap::const_iterator it = proxyWidgets.find( idx );
+        if ( it != proxyWidgets.end() )
+        {
+          QObject* obj = qvariant_cast(( *it )->property( "QgisAttrEditProxy" ) );
+          relay = qobject_cast( obj );
+        }
+        else
+        {
+          relay = new QgsStringRelay( myWidget );
+        }
+
+        if ( cb && cb->isEditable() )
+        {
+          synchronized =  connect( relay, SIGNAL( textChanged( QString ) ), myWidget, SLOT( setEditText( QString ) ) );
+          synchronized &= connect( myWidget, SIGNAL( editTextChanged( QString ) ), relay, SLOT( changeText( QString ) ) );
+        }
+        else
+        {
+          synchronized =  connect( relay, SIGNAL( textChanged( QString ) ), myWidget, SLOT( setText( QString ) ) );
+          synchronized &= connect( myWidget, SIGNAL( textChanged( QString ) ), relay, SLOT( changeText( QString ) ) );
+        }
+
+        if ( !cb || cb->isEditable() )
+        {
+          myWidget->setProperty( "QgisAttrEditProxy", QVariant( QMetaType::QObjectStar, &relay ) );
+        }
       }
     }
     break;
@@ -535,6 +581,19 @@ QWidget *QgsAttributeEditor::createAttributeEditor( QWidget *parent, QWidget *ed
     break;
   }
 
+  QMap::const_iterator it = proxyWidgets.find( idx );
+  if ( it != proxyWidgets.end() )
+  {
+    if ( !synchronized )
+    {
+      myWidget->setEnabled( false );
+    }
+  }
+  else
+  {
+    proxyWidgets.insert( idx, myWidget );
+  }
+
   setValue( myWidget, vl, idx, value );
 
   return myWidget;
@@ -877,3 +936,78 @@ bool QgsAttributeEditor::setValue( QWidget *editor, QgsVectorLayer *vl, int idx,
 
   return true;
 }
+
+QWidget* QgsAttributeEditor::createWidgetFromDef( const QgsAttributeEditorElement* widgetDef, QWidget* parent, QgsVectorLayer* vl, QgsAttributeMap &attrs, QMap &proxyWidgets, bool createGroupBox )
+{
+  QWidget *newWidget = 0;
+
+  switch ( widgetDef->type() )
+  {
+    case QgsAttributeEditorElement::AeTypeField:
+    {
+      const QgsAttributeEditorField* fieldDef = dynamic_cast( widgetDef );
+      newWidget = createAttributeEditor( parent, 0, vl, fieldDef->idx(), attrs.value( fieldDef->idx(), QVariant() ), proxyWidgets );
+
+
+      if ( vl->editType( fieldDef->idx() ) != QgsVectorLayer::Immutable )
+      {
+        newWidget->setEnabled( newWidget->isEnabled() && vl->isEditable() );
+      }
+
+      break;
+    }
+
+    case QgsAttributeEditorElement::AeTypeContainer:
+    {
+      const QgsAttributeEditorContainer* container = dynamic_cast( widgetDef );
+      QWidget* myContainer;
+
+      if ( createGroupBox )
+      {
+        QGroupBox* groupBox = new QGroupBox( parent );
+        groupBox->setTitle( container->name() );
+        myContainer = groupBox;
+      }
+      else
+      {
+        myContainer = new QWidget( parent );
+      }
+
+      QGridLayout* gbLayout = new QGridLayout( myContainer );
+
+      int index = 0;
+
+      QListchildren = container->children();
+
+      for ( QList::const_iterator it = children.begin(); it != children.end(); ++it )
+      {
+        QgsAttributeEditorElement* childDef = *it;
+        QWidget* editor = createWidgetFromDef( childDef, myContainer, vl, attrs, proxyWidgets, true );
+
+        if ( childDef->type() == QgsAttributeEditorElement::AeTypeContainer )
+        {
+          gbLayout->addWidget( editor, index, 0, 1, 2 );
+        }
+        else
+        {
+          QLabel * mypLabel = new QLabel( myContainer );
+          gbLayout->addWidget( mypLabel, index, 0 );
+          mypLabel->setText( childDef->name() );
+          gbLayout->addWidget( editor, index, 1 );
+        }
+
+        ++index;
+      }
+      gbLayout->addItem( new QSpacerItem( 0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding ), index , 0 );
+
+      newWidget = myContainer;
+      break;
+    }
+
+    default:
+      QgsDebugMsg( "Unknown attribute editor widget type encountered..." );
+      break;
+  }
+
+  return newWidget;
+}
diff --git a/src/gui/qgsattributeeditor.h b/src/gui/qgsattributeeditor.h
index 48e7d8ae0895..b062ff2c13d9 100644
--- a/src/gui/qgsattributeeditor.h
+++ b/src/gui/qgsattributeeditor.h
@@ -18,12 +18,16 @@
 #define QGSATTRIBUTEEDITOR_H
 
 #include 
+#include 
+
+#include "qgsfeature.h"
 
 class QObject;
 class QWidget;
 class QgsVectorLayer;
 class QComboBox;
 class QListWidget;
+class QgsAttributeEditorElement;
 
 /* \brief create attribute widget for editing */
 class GUI_EXPORT QgsAttributeEditor : public QObject
@@ -32,7 +36,38 @@ class GUI_EXPORT QgsAttributeEditor : public QObject
 
   public:
     QgsAttributeEditor( QObject *parent ) : QObject( parent ) {};
+    /**
+     * Creates or prepares a attributre editor widget
+     * @param parent The parent object
+     * @param editor The widget to prepare. Set to null if it should be generated
+     * @param vl The vector layer to use as data source
+     * @param idx The field index this widget refers to
+     * @param value the value to initiate this widget with
+     * @param proxyWidgets an array of widgets, which will act as a value proxy if the same field is inserted multiple times
+     *
+     */
+    static QWidget *createAttributeEditor( QWidget *parent, QWidget *editor, QgsVectorLayer *vl, int idx, const QVariant &value, QMap &proxyWidgets );
+    /**
+     * Creates or prepares a attributre editor widget
+     * @param parent The parent object
+     * @param editor The widget to prepare. Set to null if it should be generated
+     * @param vl The vector layer to use as data source
+     * @param idx The field index this widget refers to
+     * @param value the value to initiate this widget with
+     *
+     */
     static QWidget *createAttributeEditor( QWidget *parent, QWidget *editor, QgsVectorLayer *vl, int idx, const QVariant &value );
+    /**
+     * Creates a widget form a QgsAttributeEditorElement definition. Will recursively generate containers and widgets.
+     * @param widgetDef The definition for the widget
+     * @param parent The parent object
+     * @param vl The vector layer to use as data source
+     * @param attrs Attributes for the current feature.
+     * @param proxyWidgets An array of widgets, which will act as a value proxy if the same field is inserted multiple times
+     * @param createGroupBox If the element is a container, should a GroupBox be created to hold the children?
+     *
+     */
+    static QWidget *createWidgetFromDef( const QgsAttributeEditorElement* widgetDef, QWidget* parent, QgsVectorLayer* vl, QgsAttributeMap &attrs, QMap &proxyWidgets, bool createGroupBox );
     static bool retrieveValue( QWidget *widget, QgsVectorLayer *vl, int idx, QVariant &value );
     static bool setValue( QWidget *widget, QgsVectorLayer *vl, int idx, const QVariant &value );
 
@@ -45,5 +80,23 @@ class GUI_EXPORT QgsAttributeEditor : public QObject
     void selectDate();
 };
 
+class QgsStringRelay : public QObject
+{
+    Q_OBJECT
+
+  public:
+
+    QgsStringRelay( QObject* parent = NULL )
+        : QObject( parent ) {}
+
+  public slots:
+    void changeText( QString str )
+    {
+      emit textChanged( str );
+    }
+
+  signals:
+    void textChanged( QString );
+};
 
 #endif
diff --git a/src/gui/qgscharacterselectdialog.cpp b/src/gui/qgscharacterselectdialog.cpp
new file mode 100644
index 000000000000..d4dafb597747
--- /dev/null
+++ b/src/gui/qgscharacterselectdialog.cpp
@@ -0,0 +1,59 @@
+/***************************************************************************
+    qgscharacterselectdialog.cpp - single font character selector dialog
+
+    ---------------------
+    begin                : November 2012
+    copyright            : (C) 2012 by Larry Shaffer
+    email                : larrys at dakcarto dot com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "characterwidget.h"
+#include "qgscharacterselectdialog.h"
+
+
+QgsCharacterSelectorDialog::QgsCharacterSelectorDialog( QWidget *parent, Qt::WFlags fl )
+    : QDialog( parent, fl ), mChar( QChar::Null )
+{
+  setupUi( this );
+  mCharWidget = new CharacterWidget( this );
+  mCharSelectScrollArea->setWidget( mCharWidget );
+  connect( mCharWidget, SIGNAL( characterSelected( const QChar & ) ), this, SLOT( setCharacter( const QChar & ) ) );
+}
+
+QgsCharacterSelectorDialog::~QgsCharacterSelectorDialog()
+{
+}
+
+const QChar& QgsCharacterSelectorDialog::selectCharacter( bool* gotChar, const QFont& font, const QString& style )
+{
+  mCharSelectLabelFont->setText( QString( "%1 %2" ).arg( font.family() ).arg( style ) );
+  mCharWidget->updateFont( font );
+  mCharWidget->updateStyle( style );
+  mCharWidget->updateSize( 22.0 );
+  mCharSelectScrollArea->viewport()->update();
+
+  QApplication::setOverrideCursor( Qt::ArrowCursor );
+  int res = exec();
+  QApplication::restoreOverrideCursor();
+
+  if ( res == QDialog::Accepted )
+  {
+    if ( !mChar.isNull() && gotChar )
+    {
+      *gotChar = true;
+    }
+  }
+  return mChar;
+}
+
+void QgsCharacterSelectorDialog::setCharacter( const QChar & chr )
+{
+  mChar = chr;
+}
diff --git a/src/gui/qgscharacterselectdialog.h b/src/gui/qgscharacterselectdialog.h
new file mode 100644
index 000000000000..e70f54c2b266
--- /dev/null
+++ b/src/gui/qgscharacterselectdialog.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+    qgscharacterselectdialog.h - single font character selector dialog
+
+    ---------------------
+    begin                : November 2012
+    copyright            : (C) 2012 by Larry Shaffer
+    email                : larrys at dakcarto dot com
+ ***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSCHARACTERSELECTDIALOG_H
+#define QGSCHARACTERSELECTDIALOG_H
+
+#include 
+#include 
+#include "qgisgui.h"
+#include "ui_qgscharacterselectdialogbase.h"
+
+class CharacterWidget;
+
+/** A dialog for selecting a single character from a single font
+  */
+
+class GUI_EXPORT QgsCharacterSelectorDialog : public QDialog, private Ui::QgsCharacterSelectorBase
+{
+    Q_OBJECT
+
+  public:
+    QgsCharacterSelectorDialog( QWidget* parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    ~QgsCharacterSelectorDialog();
+
+  public slots:
+    const QChar& selectCharacter( bool* gotChar, const QFont& font, const QString& style );
+
+  private slots:
+    void setCharacter( const QChar& chr );
+
+  protected:
+    QChar mChar;
+    CharacterWidget* mCharWidget;
+};
+
+#endif
diff --git a/src/gui/qgscomposerview.cpp b/src/gui/qgscomposerview.cpp
index 379443f73abb..42e47f23f07d 100644
--- a/src/gui/qgscomposerview.cpp
+++ b/src/gui/qgscomposerview.cpp
@@ -311,13 +311,13 @@ void QgsComposerView::mouseReleaseEvent( QMouseEvent* e )
       }
       if ( composition() )
       {
-	QgsComposerMap* composerMap = new QgsComposerMap( composition(), mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height() );
-	composition()->addComposerMap( composerMap );
-	scene()->removeItem( mRubberBandItem );
-	delete mRubberBandItem;
-	mRubberBandItem = 0;
-	emit actionFinished();
-	composition()->pushAddRemoveCommand( composerMap, tr( "Map added" ) );
+        QgsComposerMap* composerMap = new QgsComposerMap( composition(), mRubberBandItem->transform().dx(), mRubberBandItem->transform().dy(), mRubberBandItem->rect().width(), mRubberBandItem->rect().height() );
+        composition()->addComposerMap( composerMap );
+        scene()->removeItem( mRubberBandItem );
+        delete mRubberBandItem;
+        mRubberBandItem = 0;
+        emit actionFinished();
+        composition()->pushAddRemoveCommand( composerMap, tr( "Map added" ) );
       }
       break;
 
diff --git a/src/gui/qgserrordialog.cpp b/src/gui/qgserrordialog.cpp
new file mode 100644
index 000000000000..00d31baa20b2
--- /dev/null
+++ b/src/gui/qgserrordialog.cpp
@@ -0,0 +1,79 @@
+/***************************************************************************
+                         qgserrordialog.cpp  -  error description
+                             -------------------
+    begin                : October 2012
+    copyright            : (C) October 2012 Radim Blazek
+    email                : radim dot blazek at gmail dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#include "qgserrordialog.h"
+
+#include 
+#include 
+
+QgsErrorDialog::QgsErrorDialog( const QgsError & theError, const QString & theTitle, QWidget *parent, Qt::WFlags fl )
+    : QDialog( parent, fl )
+    , mError( theError )
+{
+  setupUi( this );
+  QString title = theTitle;
+  if ( title.isEmpty() ) title = tr( "Error" );
+  setWindowTitle( title );
+
+  // QMessageBox has static standardIcon( Icon icon ), but it is marked as obsolete
+  QMessageBox messageBox( QMessageBox::Critical, "", "" );
+  mIconLabel->setPixmap( messageBox.iconPixmap() );
+  mSummaryTextBrowser->setOpenExternalLinks( true );
+  mDetailTextBrowser->setOpenExternalLinks( true );
+  mDetailTextBrowser->hide();
+
+  QPalette p = palette();
+  p.setColor( QPalette::Base, Qt::transparent );
+  mSummaryTextBrowser->setPalette( p );
+
+  mDetailCheckBox->hide();
+
+  mSummaryTextBrowser->setText( mError.summary() );
+  mDetailTextBrowser->setText( mError.message( QgsErrorMessage::Html ) );
+
+  resize( width(), 150 );
+
+  QSettings settings;
+  Qt::CheckState state = ( Qt::CheckState ) settings.value( "/Error/dialog/detail", 0 ).toInt();
+  mDetailCheckBox->setCheckState( state );
+  if ( state == Qt::Checked ) on_mDetailPushButton_clicked();
+}
+
+QgsErrorDialog::~QgsErrorDialog()
+{
+}
+
+void QgsErrorDialog::show( const QgsError & theError, const QString & theTitle, QWidget *parent, Qt::WFlags fl )
+{
+  QgsErrorDialog d( theError, theTitle, parent, fl );
+  d.exec();
+}
+
+void QgsErrorDialog::on_mDetailPushButton_clicked()
+{
+  mSummaryTextBrowser->hide();
+  mDetailTextBrowser->show();
+  mDetailCheckBox->show();
+  mDetailPushButton->hide();
+  resize( width(), 400 );
+}
+
+void QgsErrorDialog::on_mDetailCheckBox_stateChanged( int state )
+{
+  QSettings settings;
+  settings.setValue( "/Error/dialog/detail", state );
+}
+
diff --git a/src/gui/qgserrordialog.h b/src/gui/qgserrordialog.h
new file mode 100644
index 000000000000..efe2df14a866
--- /dev/null
+++ b/src/gui/qgserrordialog.h
@@ -0,0 +1,49 @@
+/***************************************************************************
+                         qgserrordialog.h  -  error dialog
+                             -------------------
+    begin                : October 2012
+    copyright            : (C) October 2012 Radim Blazek
+    email                : radim dot blazek at gmail dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+#ifndef QGSERRORDIALOG_H
+#define QGSERRORDIALOG_H
+
+#include 
+
+#include "ui_qgserrordialogbase.h"
+#include "qgisgui.h"
+#include "qgserror.h"
+
+class GUI_EXPORT QgsErrorDialog: public QDialog, private Ui::QgsErrorDialogBase
+{
+    Q_OBJECT
+  public:
+    QgsErrorDialog( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+    ~QgsErrorDialog();
+
+    /** Show dialog with error
+     * @param theError error
+     * @param theTitle title
+     * @param parent parent object
+     * @param fl widget flags
+     */
+    static void show( const QgsError & theError, const QString & theTitle, QWidget *parent = 0, Qt::WFlags fl = QgisGui::ModalDialogFlags );
+
+  public slots:
+    void on_mDetailPushButton_clicked();
+    void on_mDetailCheckBox_stateChanged( int state );
+
+  private:
+    QgsError mError;
+};
+
+#endif
diff --git a/src/gui/qgsexpressionbuilderdialog.cpp b/src/gui/qgsexpressionbuilderdialog.cpp
index 479d31acf693..aac1fbefbaff 100644
--- a/src/gui/qgsexpressionbuilderdialog.cpp
+++ b/src/gui/qgsexpressionbuilderdialog.cpp
@@ -55,3 +55,9 @@ void QgsExpressionBuilderDialog::closeEvent( QCloseEvent *event )
   QSettings settings;
   settings.setValue( "/Windows/ExpressionBuilderDialog/geometry", saveGeometry() );
 }
+
+void QgsExpressionBuilderDialog::setGeomCalculator( const QgsDistanceArea & da )
+{
+  // Store in child widget only.
+  builder->setGeomCalculator( da );
+}
diff --git a/src/gui/qgsexpressionbuilderdialog.h b/src/gui/qgsexpressionbuilderdialog.h
index 04088eb35ec9..dae9d9ff8d5b 100644
--- a/src/gui/qgsexpressionbuilderdialog.h
+++ b/src/gui/qgsexpressionbuilderdialog.h
@@ -17,6 +17,7 @@
 #define QGSEXPRESSIONBUILDERDIALOG_H
 
 #include 
+#include "qgsdistancearea.h"
 #include "ui_qgsexpressionbuilderdialogbase.h"
 
 /** A generic dialog for building expression strings
@@ -34,6 +35,11 @@ class GUI_EXPORT QgsExpressionBuilderDialog : public QDialog, private Ui::QgsExp
 
     QString expressionText();
 
+    /** Sets geometry calculator used in distance/area calculations.
+      * @note added in version 2.0
+      */
+    void setGeomCalculator( const QgsDistanceArea & da );
+
   protected:
     /**
      * Handle closing of the window
diff --git a/src/gui/qgsexpressionbuilderwidget.cpp b/src/gui/qgsexpressionbuilderwidget.cpp
index 727e57eadddd..45b1c1477c07 100644
--- a/src/gui/qgsexpressionbuilderwidget.cpp
+++ b/src/gui/qgsexpressionbuilderwidget.cpp
@@ -88,20 +88,20 @@ QgsExpressionBuilderWidget::QgsExpressionBuilderWidget( QWidget *parent )
   int count = QgsExpression::functionCount();
   for ( int i = 0; i < count; i++ )
   {
-    QgsExpression::FunctionDef func = QgsExpression::BuiltinFunctions()[i];
-    QString name = func.mName;
+    QgsExpression::Function* func = QgsExpression::Functions()[i];
+    QString name = func->name();
     if ( name.startsWith( "_" ) ) // do not display private functions
       continue;
-    if ( func.mParams >= 1 )
+    if ( func->params() >= 1 )
       name += "(";
-    registerItem( func.mGroup, func.mName, " " + name + " " );
+    registerItem( func->group(), func->name(), " " + name + " ", func->helptext() );
   }
 
-  QList specials = QgsExpression::specialColumns();
+  QList specials = QgsExpression::specialColumns();
   for ( int i = 0; i < specials.size(); ++i )
   {
-    QString name = specials[i].mName;
-    registerItem( specials[i].mGroup, name, " " + name + " " );
+    QString name = specials[i]->name();
+    registerItem( specials[i]->group(), name, " " + name + " " );
   }
 
 #if QT_VERSION >= 0x040700
@@ -240,6 +240,11 @@ bool QgsExpressionBuilderWidget::isExpressionValid()
   return mExpressionValid;
 }
 
+void QgsExpressionBuilderWidget::setGeomCalculator( const QgsDistanceArea & da )
+{
+  mDa = da;
+}
+
 QString QgsExpressionBuilderWidget::expressionText()
 {
   return txtExpressionString->toPlainText();
@@ -266,10 +271,15 @@ void QgsExpressionBuilderWidget::on_txtExpressionString_textChanged()
     return;
   }
 
+
+
   QgsExpression exp( text );
 
   if ( mLayer )
   {
+    // Only set calculator if we have layer, else use default.
+    exp.setGeomCalculator( mDa );
+
     if ( !mFeature.isValid() )
     {
       mLayer->select( mLayer->pendingAllAttributesList(), QgsRectangle(), mLayer->geometryType() != QGis::NoGeometry && exp.needsGeometry() );
@@ -405,6 +415,14 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* express
   if ( expressionItem == NULL )
     return "";
 
+  QString helpContents;
+  // Return the function help that is set for the function if there is one.
+  if ( !expressionItem->getHelpText().isEmpty() )
+  {
+    QString myStyle = QgsApplication::reportStyleSheet();
+    helpContents = "" + expressionItem->getHelpText() + "";
+    return helpContents;
+  }
   // set up the path to the help file
   QString helpFilesPath = QgsApplication::pkgDataPath() + "/resources/function_help/";
   /*
@@ -412,7 +430,6 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* express
    * the context id
    */
   QString lang = QLocale::system().name();
-
   QSettings settings;
   if ( settings.value( "locale/overrideFlag", false ).toBool() )
   {
@@ -437,7 +454,7 @@ QString QgsExpressionBuilderWidget::loadFunctionHelp( QgsExpressionItem* express
 
   QString fullHelpPath = helpFilesPath + name + "-" + lang;
   // get the help content and title from the localized file
-  QString helpContents;
+
   QFile file( fullHelpPath );
 
   QString missingError = tr( "
        Oops! QGIS can't find help for this function.
        "
diff --git a/src/gui/qgsexpressionbuilderwidget.h b/src/gui/qgsexpressionbuilderwidget.h
index 7cab7681c766..a7c2e1e649cc 100644
--- a/src/gui/qgsexpressionbuilderwidget.h
+++ b/src/gui/qgsexpressionbuilderwidget.h
@@ -20,6 +20,7 @@
 #include "ui_qgsexpressionbuilder.h"
 #include "qgsvectorlayer.h"
 #include "qgsexpressionhighlighter.h"
+#include "qgsdistancearea.h"
 
 #include "QStandardItemModel"
 #include "QStandardItem"
@@ -122,6 +123,11 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
 
     void loadFieldNames( QgsFieldMap fields );
 
+    /** Sets geometry calculator used in distance/area calculations.
+      * @note added in version 2.0
+      */
+    void setGeomCalculator( const QgsDistanceArea & da );
+
     /** Gets the expression string that has been set in the expression area.
       * @returns The expression as a string. */
     QString expressionText();
@@ -176,6 +182,7 @@ class GUI_EXPORT QgsExpressionBuilderWidget : public QWidget, private Ui::QgsExp
     QgsFeature mFeature;
     QgsExpressionHighlighter* highlighter;
     bool mExpressionValid;
+    QgsDistanceArea mDa;
 };
 
 #endif // QGSEXPRESSIONBUILDER_H
diff --git a/src/gui/qgsfilterlineedit.cpp b/src/gui/qgsfilterlineedit.cpp
new file mode 100644
index 000000000000..d7f97d852f42
--- /dev/null
+++ b/src/gui/qgsfilterlineedit.cpp
@@ -0,0 +1,57 @@
+/***************************************************************************
+                              qgsfilterlineedit.cpp
+                              ------------------------
+  begin                : October 27, 2012
+  copyright            : (C) 2012 by Alexander Bruy
+  email                : alexander dot bruy at gmail dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsfilterlineedit.h"
+#include "qgsapplication.h"
+
+#include 
+#include 
+
+QgsFilterLineEdit::QgsFilterLineEdit( QWidget* parent ) : QLineEdit( parent )
+{
+  btnClear = new QToolButton( this );
+  btnClear->setIcon( QgsApplication::getThemeIcon( "/mIconClear.png" ) );
+  btnClear->setCursor( Qt::ArrowCursor );
+  btnClear->setStyleSheet( "QToolButton { border: none; padding: 0px; }" );
+  btnClear->hide();
+
+  connect( btnClear, SIGNAL( clicked() ), this, SLOT( clear() ) );
+  connect( btnClear, SIGNAL( clicked() ), this, SIGNAL( cleared() ) );
+  connect( this, SIGNAL( textChanged( const QString& ) ), this,
+           SLOT( toggleClearButton( const QString& ) ) );
+
+  int frameWidth = style()->pixelMetric( QStyle::PM_DefaultFrameWidth );
+  setStyleSheet( QString( "QLineEdit { padding-right: %1px; } " )
+                 .arg( btnClear->sizeHint().width() + frameWidth + 1 ) );
+
+  QSize msz = minimumSizeHint();
+  setMinimumSize( qMax( msz.width(), btnClear->sizeHint().height() + frameWidth * 2 + 2 ),
+                  qMax( msz.height(), btnClear->sizeHint().height() + frameWidth * 2 + 2 ) );
+}
+
+void QgsFilterLineEdit::resizeEvent( QResizeEvent * )
+{
+  QSize sz = btnClear->sizeHint();
+  int frameWidth = style()->pixelMetric( QStyle::PM_DefaultFrameWidth );
+  btnClear->move( rect().right() - frameWidth - sz.width(),
+                  ( rect().bottom() + 1 - sz.height() ) / 2 );
+}
+
+void QgsFilterLineEdit::toggleClearButton( const QString &text )
+{
+  btnClear->setVisible( !text.isEmpty() );
+}
diff --git a/src/gui/qgsfilterlineedit.h b/src/gui/qgsfilterlineedit.h
new file mode 100644
index 000000000000..6bdbbd305320
--- /dev/null
+++ b/src/gui/qgsfilterlineedit.h
@@ -0,0 +1,47 @@
+/***************************************************************************
+                              qgsfilterlineedit.h
+                              ------------------------
+  begin                : October 27, 2012
+  copyright            : (C) 2012 by Alexander Bruy
+  email                : alexander dot bruy at gmail dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSFILTERLINEEDIT_H
+#define QGSFILTERLINEEDIT_H
+
+#include 
+
+class QToolButton;
+
+/** \ingroup gui
+ * Lineedit with builtin clear button
+ **/
+class GUI_EXPORT QgsFilterLineEdit : public QLineEdit
+{
+    Q_OBJECT
+  public:
+    QgsFilterLineEdit( QWidget* parent = 0 );
+
+  signals:
+    void cleared();
+
+  protected:
+    void resizeEvent( QResizeEvent * );
+
+  private slots:
+    void toggleClearButton( const QString &text );
+
+  private:
+    QToolButton *btnClear;
+};
+
+#endif // QGSFILTERLINEEDIT_H
diff --git a/src/gui/qgslegendinterface.h b/src/gui/qgslegendinterface.h
index 1679bc342690..177489f0b222 100644
--- a/src/gui/qgslegendinterface.h
+++ b/src/gui/qgslegendinterface.h
@@ -54,7 +54,12 @@ class GUI_EXPORT QgsLegendInterface : public QObject
     //! Return the relationship between groups and layers in the legend
     virtual QList< GroupLayerInfo > groupLayerRelationship() { return QList< GroupLayerInfo >(); }
 
-    //! Return all layers in the project in legend order
+    //! Returns the currently selected layers of QgsLegendLayers.
+    //! @param inDrawOrder return layers in drawing order (added in 1.9)
+    //! @returns list of layers, else an empty list
+    virtual QList selectedLayers( bool inDrawOrder = false ) const = 0;
+
+    //! Return all layers in the project in drawing order
     //! @note added in 1.5
     virtual QList< QgsMapLayer * > layers() const = 0;
 
diff --git a/src/gui/qgsmapcanvas.cpp b/src/gui/qgsmapcanvas.cpp
index 43cfea6bc2b8..3c46302ec5e9 100644
--- a/src/gui/qgsmapcanvas.cpp
+++ b/src/gui/qgsmapcanvas.cpp
@@ -265,45 +265,48 @@ void QgsMapCanvas::setLayerSet( QList &layers )
   bool layerSetChanged = layerSetOld != layerSet;
 
   // update only if needed
-  if ( !layerSetChanged )
-    return;
-
-  QgsDebugMsg( "Layer changed to: " + layerSet.join( ", " ) );
-
-  for ( i = 0; i < layerCount(); i++ )
+  if ( layerSetChanged )
   {
-    // Add check if vector layer when disconnecting from selectionChanged slot
-    // Ticket #811 - racicot
-    QgsMapLayer *currentLayer = layer( i );
-    disconnect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );
-    disconnect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );
-    QgsVectorLayer *isVectLyr = qobject_cast( currentLayer );
-    if ( isVectLyr )
+    QgsDebugMsg( "Layers changed to: " + layerSet.join( ", " ) );
+
+    for ( i = 0; i < layerCount(); i++ )
     {
-      disconnect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );
+      // Add check if vector layer when disconnecting from selectionChanged slot
+      // Ticket #811 - racicot
+      QgsMapLayer *currentLayer = layer( i );
+      disconnect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );
+      disconnect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );
+      QgsVectorLayer *isVectLyr = qobject_cast( currentLayer );
+      if ( isVectLyr )
+      {
+        disconnect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );
+      }
     }
-  }
 
-  mMapRenderer->setLayerSet( layerSet );
+    mMapRenderer->setLayerSet( layerSet );
 
-  for ( i = 0; i < layerCount(); i++ )
-  {
-    // Add check if vector layer when connecting to selectionChanged slot
-    // Ticket #811 - racicot
-    QgsMapLayer *currentLayer = layer( i );
-    connect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );
-    connect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );
-    QgsVectorLayer *isVectLyr = qobject_cast( currentLayer );
-    if ( isVectLyr )
+    for ( i = 0; i < layerCount(); i++ )
     {
-      connect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );
+      // Add check if vector layer when connecting to selectionChanged slot
+      // Ticket #811 - racicot
+      QgsMapLayer *currentLayer = layer( i );
+      connect( currentLayer, SIGNAL( repaintRequested() ), this, SLOT( refresh() ) );
+      connect( currentLayer, SIGNAL( screenUpdateRequested() ), this, SLOT( updateMap() ) );
+      QgsVectorLayer *isVectLyr = qobject_cast( currentLayer );
+      if ( isVectLyr )
+      {
+        connect( currentLayer, SIGNAL( selectionChanged() ), this, SLOT( selectionChangedSlot() ) );
+      }
     }
+
+    QgsDebugMsg( "Layers have changed, refreshing" );
+    emit layersChanged();
+
+    refresh();
   }
 
   if ( mMapOverview )
   {
-    mMapOverview->updateFullExtent( fullExtent() );
-
     QStringList& layerSetOvOld = mMapOverview->layerSet();
     if ( layerSetOvOld != layerSetOverview )
     {
@@ -314,12 +317,6 @@ void QgsMapCanvas::setLayerSet( QList &layers )
     // because full extent might have changed
     updateOverview();
   }
-
-  QgsDebugMsg( "Layers have changed, refreshing" );
-  emit layersChanged();
-
-  refresh();
-
 } // setLayerSet
 
 void QgsMapCanvas::enableOverviewMode( QgsMapOverviewCanvas* overview )
@@ -514,11 +511,6 @@ void QgsMapCanvas::updateFullExtent()
   QgsDebugMsg( "updating full extent" );
 
   mMapRenderer->updateFullExtent();
-  if ( mMapOverview )
-  {
-    mMapOverview->updateFullExtent( fullExtent() );
-    updateOverview();
-  }
   refresh();
 }
 
diff --git a/src/gui/qgsmapoverviewcanvas.cpp b/src/gui/qgsmapoverviewcanvas.cpp
index 338b2700e04d..773a717b4027 100644
--- a/src/gui/qgsmapoverviewcanvas.cpp
+++ b/src/gui/qgsmapoverviewcanvas.cpp
@@ -95,6 +95,7 @@ void QgsMapOverviewCanvas::paintEvent( QPaintEvent* pe )
   {
     mPixmap = QPixmap( mNewSize );
     mMapRenderer->setOutputSize( mNewSize, mPixmap.logicalDpiX() );
+    updateFullExtent();
     mNewSize = QSize();
     refresh();
   }
@@ -106,10 +107,12 @@ void QgsMapOverviewCanvas::paintEvent( QPaintEvent* pe )
 
 void QgsMapOverviewCanvas::drawExtentRect()
 {
+  if ( !mMapCanvas || !mMapRenderer ) return;
+
   const QgsRectangle& extent = mMapCanvas->extent();
 
   // show only when valid extent is set
-  if ( extent.isEmpty() )
+  if ( extent.isEmpty() || mMapRenderer->extent().isEmpty() )
   {
     mPanningWidget->hide();
     return;
@@ -290,11 +293,23 @@ void QgsMapOverviewCanvas::setBackgroundColor( const QColor& color )
 
 void QgsMapOverviewCanvas::setLayerSet( const QStringList& layerSet )
 {
+  QgsDebugMsg( "layerSet: " + layerSet.join( ", " ) );
+  if ( !mMapRenderer ) return;
   mMapRenderer->setLayerSet( layerSet );
+  mMapRenderer->updateFullExtent();
+  updateFullExtent();
 }
 
-void QgsMapOverviewCanvas::updateFullExtent( const QgsRectangle& rect )
+void QgsMapOverviewCanvas::updateFullExtent()
 {
+  if ( !mMapRenderer ) return;
+  QgsRectangle rect;
+  if ( !mMapRenderer->layerSet().isEmpty() )
+  {
+    rect = mMapRenderer->fullExtent();
+    // expand a bit to keep features on margin
+    rect.scale( 1.1 );
+  }
   mMapRenderer->setExtent( rect );
   drawExtentRect();
 }
diff --git a/src/gui/qgsmapoverviewcanvas.h b/src/gui/qgsmapoverviewcanvas.h
index ee3963f167e3..5b159fe4f2ae 100644
--- a/src/gui/qgsmapoverviewcanvas.h
+++ b/src/gui/qgsmapoverviewcanvas.h
@@ -59,7 +59,7 @@ class GUI_EXPORT QgsMapOverviewCanvas : public QWidget
 
     void enableAntiAliasing( bool flag ) { mAntiAliasing = flag; }
 
-    void updateFullExtent( const QgsRectangle& rect );
+    void updateFullExtent();
 
   public slots:
 
diff --git a/src/gui/qgsmaptoolzoom.cpp b/src/gui/qgsmaptoolzoom.cpp
index 787a464b6f78..bf871fe343b0 100644
--- a/src/gui/qgsmaptoolzoom.cpp
+++ b/src/gui/qgsmaptoolzoom.cpp
@@ -49,7 +49,7 @@ void QgsMapToolZoom::canvasMoveEvent( QMouseEvent * e )
   {
     mDragging = true;
     delete mRubberBand;
-    mRubberBand = new QgsRubberBand( mCanvas, true );
+    mRubberBand = new QgsRubberBand( mCanvas, QGis::Polygon );
     mZoomRect.setTopLeft( e->pos() );
   }
   mZoomRect.setBottomRight( e->pos() );
diff --git a/src/gui/qgsmessagebar.cpp b/src/gui/qgsmessagebar.cpp
index b1a30e44972c..ba2ad31e343e 100644
--- a/src/gui/qgsmessagebar.cpp
+++ b/src/gui/qgsmessagebar.cpp
@@ -24,6 +24,7 @@
 #include 
 #include 
 #include 
+#include 
 
 
 QgsMessageBar::QgsMessageBar( QWidget *parent )
@@ -40,16 +41,34 @@ QgsMessageBar::QgsMessageBar( QWidget *parent )
   mLayout->setContentsMargins( 9, 1, 9, 1 );
   setLayout( mLayout );
 
-  mLayout->addItem( new QSpacerItem( 20, 20, QSizePolicy::Expanding ), 0, 1, 1, 1 );
+  mItemCount = new QLabel( this );
+  mItemCount->setObjectName( "mItemCount" );
+  mItemCount->setToolTip( tr( "Remaining messages" ) );
+  mItemCount->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );
+  mLayout->addWidget( mItemCount, 0, 1, 1, 1 );
+
+  mCloseMenu = new QMenu( this );
+  mCloseMenu->setObjectName( "mCloseMenu" );
+  mActionCloseAll = new QAction( tr( "Close all" ), this );
+  mCloseMenu->addAction( mActionCloseAll );
+  connect( mActionCloseAll, SIGNAL( triggered() ), this, SLOT( clearWidgets() ) );
 
   mCloseBtn = new QToolButton( this );
   mCloseBtn->setToolTip( tr( "Close" ) );
-  mCloseBtn->setStyleSheet( "background-color: rgba(255, 255, 255, 0);" );
+  mCloseBtn->setMinimumWidth( 36 );
+  mCloseBtn->setStyleSheet(
+    "QToolButton { background-color: rgba(255, 255, 255, 0); } "
+    "QToolButton::menu-indicator { subcontrol-position: right bottom; subcontrol-origin: padding; bottom: 6px; }" );
   mCloseBtn->setCursor( Qt::PointingHandCursor );
   mCloseBtn->setIcon( QgsApplication::getThemeIcon( "/mIconClose.png" ) );
+  mCloseBtn->setSizePolicy( QSizePolicy::Maximum, QSizePolicy::Preferred );
+  mCloseBtn->setMenu( mCloseMenu );
   connect( mCloseBtn, SIGNAL( clicked() ), this, SLOT( popWidget() ) );
   mLayout->addWidget( mCloseBtn, 0, 2, 1, 1 );
 
+  connect( this, SIGNAL( widgetAdded( QWidget* ) ), this, SLOT( updateItemCount() ) );
+  connect( this, SIGNAL( widgetRemoved( QWidget* ) ), this, SLOT( updateItemCount() ) );
+
   // start hidden
   setVisible( false );
 }
@@ -127,6 +146,20 @@ bool QgsMessageBar::popWidget()
   return true;
 }
 
+bool QgsMessageBar::clearWidgets()
+{
+  if ( !mCurrentItem && mList.empty() )
+    return true;
+
+  while ( mList.count() > 0 )
+  {
+    popWidget();
+  }
+  popWidget();
+
+  return !mCurrentItem && mList.empty();
+}
+
 void QgsMessageBar::pushItem( QgsMessageBarItem *item )
 {
   Q_ASSERT( item );
@@ -150,6 +183,8 @@ void QgsMessageBar::pushItem( QgsMessageBarItem *item )
 
   setStyleSheet( item->styleSheet() );
   show();
+
+  emit widgetAdded( item->widget() );
 }
 
 void QgsMessageBar::pushWidget( QWidget *widget, int level )
@@ -157,16 +192,21 @@ void QgsMessageBar::pushWidget( QWidget *widget, int level )
   QString stylesheet;
   if ( level >= 2 )
   {
-    stylesheet = "QgsMessageBar { background-color: #d65253; border: 1px solid #9b3d3d; } QLabel { color: white; }";
+    stylesheet = "QgsMessageBar { background-color: #d65253; border: 1px solid #9b3d3d; } "
+                 "QLabel { color: white; } ";
   }
   else if ( level == 1 )
   {
-    stylesheet = "QgsMessageBar { background-color: #ffc800; border: 1px solid #e0aa00; } QLabel { color: black; }";
+    stylesheet = "QgsMessageBar { background-color: #ffc800; border: 1px solid #e0aa00; } "
+                 "QLabel { color: black; } ";
   }
   else if ( level <= 0 )
   {
-    stylesheet = "QgsMessageBar { background-color: #e7f5fe; border: 1px solid #b9cfe4; } QLabel { color: #2554a1; }";
+    stylesheet = "QgsMessageBar { background-color: #e7f5fe; border: 1px solid #b9cfe4; } "
+                 "QLabel { color: #2554a1; } ";
   }
+  stylesheet += "QLabel#mMsgTitle { font-weight: bold; } "
+                "QLabel#mItemCount { font-style: italic; }";
   pushWidget( widget, stylesheet );
 }
 
@@ -198,14 +238,20 @@ QWidget* QgsMessageBar::createMessage( const QString &title, const QString &text
   if ( !title.isEmpty() )
   {
     QLabel *lblTitle = new QLabel( title, widget );
-    QFont font = lblTitle->font();
-    font.setBold( true );
-    lblTitle->setFont( font );
+    lblTitle->setObjectName( "mMsgTitle" );
     layout->addWidget( lblTitle );
   }
 
   QLabel *lblText = new QLabel( text, widget );
+  lblText->setObjectName( "mMsgText" );
+  lblText->setSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Preferred );
+  lblText->setWordWrap( true );
   layout->addWidget( lblText );
 
   return widget;
 }
+
+void QgsMessageBar::updateItemCount()
+{
+  mItemCount->setText( mList.count() > 0 ? QString::number( mList.count() ) + QString( " " ) + tr( "more" ) : QString( "" ) );
+}
diff --git a/src/gui/qgsmessagebar.h b/src/gui/qgsmessagebar.h
index 670682cc5a14..bc9a0c9661f9 100644
--- a/src/gui/qgsmessagebar.h
+++ b/src/gui/qgsmessagebar.h
@@ -27,7 +27,10 @@
 
 class QWidget;
 class QGridLayout;
+class QMenu;
 class QToolButton;
+class QLabel;
+class QAction;
 
 /** \ingroup gui
  * A bar for displaying non-blocking messages to the user.
@@ -65,7 +68,10 @@ class GUI_EXPORT QgsMessageBar: public QFrame
     static QWidget* createMessage( const QString &title, const QString &text, const QIcon &icon, QWidget *parent = 0 );
 
   signals:
-    //! emitted when a widget was removed from the bar
+    //! emitted when a message widget is added to the bar
+    void widgetAdded( QWidget *widget );
+
+    //! emitted when a message widget was removed from the bar
     void widgetRemoved( QWidget *widget );
 
   public slots:
@@ -75,6 +81,11 @@ class GUI_EXPORT QgsMessageBar: public QFrame
      */
     bool popWidget();
 
+    /*! remove all items from the bar's widget list
+     *  @return true if all items were removed, false otherwise
+     */
+    bool clearWidgets();
+
   private:
     class QgsMessageBarItem
     {
@@ -99,8 +110,15 @@ class GUI_EXPORT QgsMessageBar: public QFrame
 
     QgsMessageBarItem *mCurrentItem;
     QList mList;
+    QMenu *mCloseMenu;
     QToolButton *mCloseBtn;
     QGridLayout *mLayout;
+    QLabel *mItemCount;
+    QAction *mActionCloseAll;
+
+  private slots:
+    //! updates count of items in widget list
+    void updateItemCount();
 };
 
 #endif
diff --git a/src/gui/qgsrubberband.cpp b/src/gui/qgsrubberband.cpp
index 723af14050c0..3be4e4c8808f 100644
--- a/src/gui/qgsrubberband.cpp
+++ b/src/gui/qgsrubberband.cpp
@@ -27,16 +27,22 @@
   \brief The QgsRubberBand class provides a transparent overlay widget
   for tracking the mouse while drawing polylines or polygons.
 */
-QgsRubberBand::QgsRubberBand( QgsMapCanvas* mapCanvas, bool isPolygon )
+QgsRubberBand::QgsRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geometryType )
     : QgsMapCanvasItem( mapCanvas )
-    , mIsPolygon( isPolygon )
+    , mGeometryType( geometryType )
     , mTranslationOffsetX( 0.0 )
     , mTranslationOffsetY( 0.0 )
 {
-  reset( isPolygon );
+  reset( geometryType );
   setColor( QColor( Qt::lightGray ) );
 }
 
+QgsRubberBand::QgsRubberBand( QgsMapCanvas* mapCanvas, bool isPolygon )
+    : QgsMapCanvasItem( mapCanvas )
+{
+  QgsRubberBand( mapCanvas, isPolygon ? QGis::Polygon : QGis::Line );
+}
+
 QgsRubberBand::QgsRubberBand(): QgsMapCanvasItem( 0 )
 {
 }
@@ -61,16 +67,24 @@ void QgsRubberBand::setColor( const QColor & color )
   */
 void QgsRubberBand::setWidth( int width )
 {
-  mPen.setWidth( width );
+  mWidth = width;
 }
 
 /*!
   Remove all points from the shape being created.
   */
+void QgsRubberBand::reset( QGis::GeometryType geometryType )
+{
+  mPoints.clear();
+  mGeometryType = geometryType;
+  updateRect();
+  update();
+}
+
 void QgsRubberBand::reset( bool isPolygon )
 {
   mPoints.clear();
-  mIsPolygon = isPolygon;
+  mGeometryType = isPolygon ? QGis::Polygon : QGis::Line;
   updateRect();
   update();
 }
@@ -170,7 +184,7 @@ void QgsRubberBand::movePoint( int index, const QgsPoint& p, int geometryIndex )
 
 void QgsRubberBand::setToGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
 {
-  reset( mIsPolygon );
+  reset( mGeometryType );
   addGeometry( geom, layer );
 }
 
@@ -196,7 +210,6 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBPoint:
     case QGis::WKBPoint25D:
     {
-      mIsPolygon = true;
       double d = mMapCanvas->extent().width() * 0.005;
       QgsPoint pt;
       if ( layer )
@@ -217,7 +230,6 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBMultiPoint:
     case QGis::WKBMultiPoint25D:
     {
-      mIsPolygon = true;
       double d = mMapCanvas->extent().width() * 0.005;
       QgsMultiPoint mpt = geom->asMultiPoint();
       for ( int i = 0; i < mpt.size(); ++i, ++idx )
@@ -244,7 +256,6 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBLineString:
     case QGis::WKBLineString25D:
     {
-      mIsPolygon = false;
       QgsPolyline line = geom->asPolyline();
       for ( int i = 0; i < line.count(); i++ )
       {
@@ -263,13 +274,18 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBMultiLineString:
     case QGis::WKBMultiLineString25D:
     {
-      mIsPolygon = false;
       mPoints.clear();
 
       QgsMultiPolyline mline = geom->asMultiPolyline();
       for ( int i = 0; i < mline.size(); ++i, ++idx )
       {
         QgsPolyline line = mline[i];
+
+        if ( line.size() == 0 )
+        {
+          --idx;
+        }
+
         for ( int j = 0; j < line.size(); ++j )
         {
           if ( layer )
@@ -288,7 +304,6 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBPolygon:
     case QGis::WKBPolygon25D:
     {
-      mIsPolygon = true;
       QgsPolygon poly = geom->asPolygon();
       QgsPolyline line = poly[0];
       for ( int i = 0; i < line.count(); i++ )
@@ -308,7 +323,6 @@ void QgsRubberBand::addGeometry( QgsGeometry* geom, QgsVectorLayer* layer )
     case QGis::WKBMultiPolygon:
     case QGis::WKBMultiPolygon25D:
     {
-      mIsPolygon = true;
       mPoints.clear();
 
       QgsMultiPolygon multipoly = geom->asMultiPolygon();
@@ -351,7 +365,7 @@ void QgsRubberBand::setToCanvasRectangle( const QRect& rect )
   QgsPoint ll = transform->toMapCoordinates( rect.left(), rect.bottom() );
   QgsPoint ur = transform->toMapCoordinates( rect.right(), rect.top() );
 
-  reset( true );
+  reset( QGis::Polygon );
   addPoint( ll, false );
   addPoint( QgsPoint( ur.x(), ll.y() ), false );
   addPoint( ur, false );
@@ -366,25 +380,47 @@ void QgsRubberBand::paint( QPainter* p )
   QList currentList;
   if ( mPoints.size() > 0 )
   {
-    p->setPen( mPen );
     p->setBrush( mBrush );
 
     for ( int i = 0; i < mPoints.size(); ++i )
     {
-      QPolygonF pts;
+      QVector pts;
       QList::const_iterator it = mPoints.at( i ).constBegin();
       for ( ; it != mPoints.at( i ).constEnd(); ++it )
       {
         pts.append( toCanvasCoordinates( QgsPoint( it->x() + mTranslationOffsetX, it->y() + mTranslationOffsetY ) ) - pos() );
       }
 
-      if ( mIsPolygon )
+      switch ( mGeometryType )
       {
-        p->drawPolygon( pts );
-      }
-      else
-      {
-        p->drawPolyline( pts );
+        case QGis::Polygon:
+        {
+          mPen.setWidth( mWidth );
+          p->setPen( mPen );
+          p->drawPolygon( pts );
+        }
+        break;
+
+        case QGis::Point:
+        {
+          mPen.setWidth( 1 );
+          p->setPen( mPen );
+          QVector::const_iterator ptIt = pts.constBegin();
+          for( ; ptIt != pts.constEnd(); ++ptIt )
+          {
+            p->drawEllipse( (*ptIt).x() - mWidth/2, (*ptIt).y() - mWidth/2, mWidth, mWidth );
+          }
+        }
+        break;
+
+        case QGis::Line:
+        default:
+        {
+          mPen.setWidth( mWidth );
+          p->setPen( mPen );
+          p->drawPolyline( pts );
+        }
+        break;
       }
     }
   }
@@ -458,34 +494,55 @@ const QgsPoint *QgsRubberBand::getPoint( int i, int j ) const
 QgsGeometry *QgsRubberBand::asGeometry()
 {
   QgsGeometry *geom = NULL;
-  if ( mIsPolygon )
+
+  switch( mGeometryType )
   {
-    QgsPolygon polygon;
-    QList< QList >::const_iterator it = mPoints.constBegin();
-    for ( ; it != mPoints.constEnd(); ++it )
+    case QGis::Polygon:
     {
-      polygon.append( getPolyline( *it ) );
+      QgsPolygon polygon;
+      QList< QList >::const_iterator it = mPoints.constBegin();
+      for ( ; it != mPoints.constEnd(); ++it )
+      {
+        polygon.append( getPolyline( *it ) );
+      }
+      geom = QgsGeometry::fromPolygon( polygon );
+      break;
     }
-    geom = QgsGeometry::fromPolygon( polygon );
-  }
-  else
-  {
-    if ( mPoints.size() > 0 )
+
+    case QGis::Point:
     {
-      if ( mPoints.size() > 1 )
+      QgsMultiPoint multiPoint;
+
+      QList< QList >::const_iterator it = mPoints.constBegin();
+      for ( ; it != mPoints.constEnd(); ++it )
       {
-        QgsMultiPolyline multiPolyline;
-        QList< QList >::const_iterator it = mPoints.constBegin();
-        for ( ; it != mPoints.constEnd(); ++it )
-        {
-          multiPolyline.append( getPolyline( *it ) );
-        }
-        geom = QgsGeometry::fromMultiPolyline( multiPolyline );
+        multiPoint += getPolyline( *it );
       }
-      else
+      geom = QgsGeometry::fromMultiPoint( multiPoint );
+      break;
+    }
+
+    case QGis::Line:
+    default:
+    {
+      if ( mPoints.size() > 0 )
       {
-        geom = QgsGeometry::fromPolyline( getPolyline( mPoints[0] ) );
+        if ( mPoints.size() > 1 )
+        {
+          QgsMultiPolyline multiPolyline;
+          QList< QList >::const_iterator it = mPoints.constBegin();
+          for ( ; it != mPoints.constEnd(); ++it )
+          {
+            multiPolyline.append( getPolyline( *it ) );
+          }
+          geom = QgsGeometry::fromMultiPolyline( multiPolyline );
+        }
+        else
+        {
+          geom = QgsGeometry::fromPolyline( getPolyline( mPoints[0] ) );
+        }
       }
+      break;
     }
   }
   return geom;
diff --git a/src/gui/qgsrubberband.h b/src/gui/qgsrubberband.h
index dd63bbdb554a..4ef7ed067053 100644
--- a/src/gui/qgsrubberband.h
+++ b/src/gui/qgsrubberband.h
@@ -31,13 +31,39 @@ class QPaintEvent;
 class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
 {
   public:
-    QgsRubberBand( QgsMapCanvas* mapCanvas, bool isPolygon = false );
+    /**
+     * Creates a new RubberBand.
+     * @param mapCanvas The map canvas to draw onto. It's CRS will be used map points onto screen coordinates.
+     * @param geometryType Defines how the data should be drawn onto the screen. (Use QGis::Line, QGis::Polygon or QGis::Point)
+     * Added in 1.9.
+     */
+    QgsRubberBand( QgsMapCanvas* mapCanvas, QGis::GeometryType geometryType = QGis::Line );
+    /**
+     * Creates a new RubberBand.
+     * @deprecated
+     * @param mapCanvas The map canvas to draw onto. It's CRS will be used map points onto screen coordinates.
+     * @param isPolygon true: draw as (multi-)polygon, false draw as (multi-)linestring
+     */
+    QgsRubberBand( QgsMapCanvas* mapCanvas, bool isPolygon );
     ~QgsRubberBand();
 
     void setColor( const QColor & color );
     void setWidth( int width );
 
-    void reset( bool isPolygon = false );
+    /**
+     * Clears all the geometries in this rubberband.
+     * Sets the representation type according to geometryType.
+     * @param geometryType Defines how the data should be drawn onto the screen. (Use QGis::Line, QGis::Polygon or QGis::Point)
+     * Added in 1.9.
+     */
+    void reset( QGis::GeometryType geometryType = QGis::Line );
+    /**
+     * @deprecated
+     * Clears all the geometries in this rubberband.
+     * Sets the representation type according to isPolygon.
+     * @param isPolygon true: draw as (multi-)polygon, false draw as (multi-)linestring
+     */
+    void reset( bool isPolygon );
 
     //! Add point to rubberband and update canvas
     //! If adding more points consider using update=false for better performance
@@ -101,9 +127,11 @@ class GUI_EXPORT QgsRubberBand: public QgsMapCanvasItem
     QBrush mBrush;
     QPen mPen;
 
+    int mWidth;
+
     /**Nested lists used for multitypes*/
     QList< QList  > mPoints;
-    bool mIsPolygon;
+    QGis::GeometryType mGeometryType;
     double mTranslationOffsetX;
     double mTranslationOffsetY;
 
diff --git a/src/gui/qgssvgannotationitem.cpp b/src/gui/qgssvgannotationitem.cpp
new file mode 100644
index 000000000000..b65cc44f907d
--- /dev/null
+++ b/src/gui/qgssvgannotationitem.cpp
@@ -0,0 +1,104 @@
+/***************************************************************************
+                              qgssvgannotationitem.cpp
+                              ------------------------
+  begin                : November, 2012
+  copyright            : (C) 2012 by Marco Hugentobler
+  email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgssvgannotationitem.h"
+#include "qgsproject.h"
+#include 
+#include 
+
+
+QgsSvgAnnotationItem::QgsSvgAnnotationItem( QgsMapCanvas* canvas ): QgsAnnotationItem( canvas )
+{
+
+}
+
+QgsSvgAnnotationItem::~QgsSvgAnnotationItem()
+{
+
+}
+
+void QgsSvgAnnotationItem::writeXML( QDomDocument& doc ) const
+{
+  QDomElement documentElem = doc.documentElement();
+  if ( documentElem.isNull() )
+  {
+    return;
+  }
+
+  QDomElement svgAnnotationElem = doc.createElement( "SVGAnnotationItem" );
+  svgAnnotationElem.setAttribute( "file", QgsProject::instance()->writePath( mFilePath ) );
+  _writeXML( doc, svgAnnotationElem );
+  documentElem.appendChild( svgAnnotationElem );
+}
+
+void QgsSvgAnnotationItem::readXML( const QDomDocument& doc, const QDomElement& itemElem )
+{
+  QString filePath = QgsProject::instance()->readPath( itemElem.attribute( "file" ) );
+  setFilePath( filePath );
+  QDomElement annotationElem = itemElem.firstChildElement( "AnnotationItem" );
+  if ( !annotationElem.isNull() )
+  {
+    _readXML( doc, annotationElem );
+  }
+}
+
+void QgsSvgAnnotationItem::paint( QPainter* painter )
+{
+  if ( !painter )
+  {
+    return;
+  }
+
+  drawFrame( painter );
+  if ( mMapPositionFixed )
+  {
+    drawMarkerSymbol( painter );
+  }
+
+  //keep width/height ratio of svg
+  QRect viewBox = mSvgRenderer.viewBox();
+  if ( viewBox.isValid() )
+  {
+    double widthRatio = mFrameSize.width() / viewBox.width();
+    double heightRatio = mFrameSize.height() / viewBox.height();
+    double renderWidth = 0;
+    double renderHeight = 0;
+    if ( widthRatio <= heightRatio )
+    {
+      renderWidth = mFrameSize.width();
+      renderHeight = viewBox.height() * mFrameSize.width() / viewBox.width() ;
+    }
+    else
+    {
+      renderHeight = mFrameSize.height();
+      renderWidth = viewBox.width() * mFrameSize.height() / viewBox.height() ;
+    }
+
+    mSvgRenderer.render( painter, QRectF( mOffsetFromReferencePoint.x(), mOffsetFromReferencePoint.y(), renderWidth,
+                                          renderHeight ) );
+  }
+  if ( isSelected() )
+  {
+    drawSelectionBoxes( painter );
+  }
+}
+
+void QgsSvgAnnotationItem::setFilePath( const QString& file )
+{
+  mFilePath = file;
+  mSvgRenderer.load( mFilePath );
+}
diff --git a/src/gui/qgssvgannotationitem.h b/src/gui/qgssvgannotationitem.h
new file mode 100644
index 000000000000..54286ec49980
--- /dev/null
+++ b/src/gui/qgssvgannotationitem.h
@@ -0,0 +1,44 @@
+/***************************************************************************
+                              qgssvgannotationitem.h
+                              ------------------------
+  begin                : November, 2012
+  copyright            : (C) 2012 by Marco Hugentobler
+  email                : marco dot hugentobler at sourcepole dot ch
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSSVGANNOTATIONITEM_H
+#define QGSSVGANNOTATIONITEM_H
+
+#include "qgsannotationitem.h"
+#include 
+
+class GUI_EXPORT QgsSvgAnnotationItem: public QgsAnnotationItem
+{
+  public:
+
+    QgsSvgAnnotationItem( QgsMapCanvas* canvas );
+    ~QgsSvgAnnotationItem();
+
+    void writeXML( QDomDocument& doc ) const;
+    void readXML( const QDomDocument& doc, const QDomElement& itemElem );
+
+    void paint( QPainter* painter );
+
+    void setFilePath( const QString& file );
+    QString filePath() const { return mFilePath; }
+
+  private:
+    QSvgRenderer mSvgRenderer;
+    QString mFilePath;
+};
+
+#endif // QGSSVGANNOTATIONITEM_H
diff --git a/src/gui/raster/qgssinglebandgrayrendererwidget.cpp b/src/gui/raster/qgssinglebandgrayrendererwidget.cpp
index ef091cc23459..e806e4c9c2b7 100644
--- a/src/gui/raster/qgssinglebandgrayrendererwidget.cpp
+++ b/src/gui/raster/qgssinglebandgrayrendererwidget.cpp
@@ -23,6 +23,9 @@ QgsSingleBandGrayRendererWidget::QgsSingleBandGrayRendererWidget( QgsRasterLayer
 {
   setupUi( this );
 
+  mGradientComboBox->insertItem( 0, tr( "Black to white" ), QgsSingleBandGrayRenderer::BlackToWhite );
+  mGradientComboBox->insertItem( 1, tr( "White to black" ), QgsSingleBandGrayRenderer::WhiteToBlack );
+
   mMinLineEdit->setValidator( new QDoubleValidator( mMinLineEdit ) );
   mMaxLineEdit->setValidator( new QDoubleValidator( mMaxLineEdit ) );
 
@@ -36,7 +39,12 @@ QgsSingleBandGrayRendererWidget::QgsSingleBandGrayRendererWidget( QgsRasterLayer
 
     mMinMaxWidget = new QgsRasterMinMaxWidget( layer, this );
     mMinMaxWidget->setExtent( extent );
-    layout()->addWidget( mMinMaxWidget );
+
+    QHBoxLayout *layout = new QHBoxLayout();
+    layout->setContentsMargins( 0, 0, 0, 0 );
+    mMinMaxContainerWidget->setLayout( layout );
+    layout->addWidget( mMinMaxWidget );
+
     connect( mMinMaxWidget, SIGNAL( load( int, double, double, int ) ),
              this, SLOT( loadMinMax( int, double, double, int ) ) );
 
@@ -84,6 +92,9 @@ QgsRasterRenderer* QgsSingleBandGrayRendererWidget::renderer()
 
   QgsSingleBandGrayRenderer* renderer = new QgsSingleBandGrayRenderer( provider, band );
   renderer->setContrastEnhancement( e );
+
+  renderer->setGradient(( QgsSingleBandGrayRenderer::Gradient ) mGradientComboBox->itemData( mGradientComboBox->currentIndex() ).toInt() );
+
   return renderer;
 }
 
@@ -127,6 +138,8 @@ void QgsSingleBandGrayRendererWidget::setFromRenderer( const QgsRasterRenderer*
     //band
     mGrayBandComboBox->setCurrentIndex( mGrayBandComboBox->findData( gr->grayBand() ) );
     const QgsContrastEnhancement* ce = gr->contrastEnhancement();
+
+    mGradientComboBox->setCurrentIndex( mGradientComboBox->findData( gr->gradient() ) );
     //minmax
     mMinLineEdit->setText( QString::number( ce->minimumValue() ) );
     mMaxLineEdit->setText( QString::number( ce->maximumValue() ) );
diff --git a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
index 12a8ddf8ddf2..1838237ed11e 100644
--- a/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
+++ b/src/gui/raster/qgssinglebandpseudocolorrendererwidget.cpp
@@ -278,7 +278,8 @@ void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked()
     for ( int i = 0; i < numberOfEntries; ++i )
     {
       QColor currentColor;
-      currentColor.setRgb( colorDiff*i, 0, 255 - colorDiff * i );
+      int idx = mInvertCheckBox->isChecked() ? numberOfEntries - i - 1 : i;
+      currentColor.setRgb( colorDiff*idx, 0, 255 - colorDiff * idx );
       entryColors.push_back( currentColor );
     }
   }
@@ -286,7 +287,8 @@ void QgsSingleBandPseudoColorRendererWidget::on_mClassifyButton_clicked()
   {
     for ( int i = 0; i < numberOfEntries; ++i )
     {
-      entryColors.push_back( colorRamp->color((( double ) i ) / numberOfEntries ) );
+      int idx = mInvertCheckBox->isChecked() ? numberOfEntries - i - 1 : i;
+      entryColors.push_back( colorRamp->color((( double ) idx ) / numberOfEntries ) );
     }
   }
 
diff --git a/src/gui/symbology-ng/characterwidget.cpp b/src/gui/symbology-ng/characterwidget.cpp
index 3fcc7794248a..7a0a998b5c2c 100644
--- a/src/gui/symbology-ng/characterwidget.cpp
+++ b/src/gui/symbology-ng/characterwidget.cpp
@@ -95,6 +95,15 @@ void CharacterWidget::updateFontMerging( bool enable )
   update();
 }
 
+void CharacterWidget::updateColumns( int cols )
+{
+  if ( columns == cols || cols < 1 )
+    return;
+  columns = cols;
+  adjustSize();
+  update();
+}
+
 //! [3]
 QSize CharacterWidget::sizeHint() const
 {
@@ -108,7 +117,7 @@ void CharacterWidget::mouseMoveEvent( QMouseEvent *event )
   QPoint widgetPosition = mapFromGlobal( event->globalPos() );
   uint key = ( widgetPosition.y() / squareSize ) * columns + widgetPosition.x() / squareSize;
 
-  QString text = tr( "
        Character: 
        Value: 0x%3\">" )
+  QString text = tr( "
        Character: %2
        Value: 0x%3" )
                  .arg( displayFont.family() )
                  .arg( QChar( key ) )
                  .arg( key, 16 );
diff --git a/src/gui/symbology-ng/characterwidget.h b/src/gui/symbology-ng/characterwidget.h
index fbfd6f9f222a..cee8447da1d3 100644
--- a/src/gui/symbology-ng/characterwidget.h
+++ b/src/gui/symbology-ng/characterwidget.h
@@ -62,11 +62,15 @@ class CharacterWidget : public QWidget
     CharacterWidget( QWidget *parent = 0 );
     QSize sizeHint() const;
 
+    int getColumns() const { return columns; }
+    int getSquareSize() const { return squareSize; }
+
   public slots:
     void updateFont( const QFont &font );
     void updateSize( double fontSize );
     void updateStyle( const QString &fontStyle );
     void updateFontMerging( bool enable );
+    void updateColumns( int cols );
 
   signals:
     void characterSelected( const QChar &character );
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
index 63ef40356caa..6de7a0a71616 100644
--- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.cpp
@@ -12,6 +12,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+
 #include "qgscategorizedsymbolrendererv2widget.h"
 
 #include "qgscategorizedsymbolrendererv2.h"
@@ -31,8 +32,292 @@
 #include 
 #include 
 #include 
+#include 
+#include 
+
+QgsCategorizedSymbolRendererV2Model::QgsCategorizedSymbolRendererV2Model( QObject * parent ) : QAbstractItemModel( parent )
+    , mRenderer( 0 )
+    , mMimeFormat( "application/x-qgscategorizedsymbolrendererv2model" )
+{
+}
+
+void QgsCategorizedSymbolRendererV2Model::setRenderer( QgsCategorizedSymbolRendererV2* renderer )
+{
+  if ( mRenderer )
+  {
+    beginRemoveRows( QModelIndex(), 0, mRenderer->categories().size() - 1 );
+    mRenderer = 0;
+    endRemoveRows();
+  }
+  if ( renderer )
+  {
+    beginInsertRows( QModelIndex(), 0, renderer->categories().size() - 1 );
+    mRenderer = renderer;
+    endInsertRows();
+  }
+}
+
+void QgsCategorizedSymbolRendererV2Model::addCategory( const QgsRendererCategoryV2 &cat )
+{
+  if ( !mRenderer ) return;
+  int idx = mRenderer->categories().size();
+  beginInsertRows( QModelIndex(), idx, idx );
+  mRenderer->addCategory( cat );
+  endInsertRows();
+}
+
+
+Qt::ItemFlags QgsCategorizedSymbolRendererV2Model::flags( const QModelIndex & index ) const
+{
+  Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+  if ( index.column() == 1 || index.column() == 2 )
+  {
+    flags |= Qt::ItemIsEditable;
+  }
+  return flags;
+}
+
+Qt::DropActions QgsCategorizedSymbolRendererV2Model::supportedDropActions() const
+{
+  return Qt::MoveAction;
+}
+
+QVariant QgsCategorizedSymbolRendererV2Model::data( const QModelIndex &index, int role ) const
+{
+  if ( !index.isValid() || !mRenderer ) return QVariant();
+
+  const QgsRendererCategoryV2 category = mRenderer->categories().value( index.row() );
+
+  if ( role == Qt::DisplayRole || role == Qt::ToolTipRole )
+  {
+    switch ( index.column() )
+    {
+      case 1: return category.value().toString();
+      case 2: return category.label();
+      default: return QVariant();
+    }
+  }
+  else if ( role == Qt::DecorationRole && index.column() == 0 && category.symbol() )
+  {
+    return QgsSymbolLayerV2Utils::symbolPreviewIcon( category.symbol(), QSize( 16, 16 ) );
+  }
+  else if ( role == Qt::TextAlignmentRole )
+  {
+    return ( index.column() == 0 ) ? Qt::AlignHCenter : Qt::AlignLeft;
+  }
+  else if ( role == Qt::EditRole )
+  {
+    switch ( index.column() )
+    {
+      case 1: return category.value();
+      case 2: return category.label();
+      default: return QVariant();
+    }
+  }
+
+  return QVariant();
+}
+
+bool QgsCategorizedSymbolRendererV2Model::setData( const QModelIndex & index, const QVariant & value, int role )
+{
+  if ( !index.isValid() || role != Qt::EditRole )
+    return false;
+
+  switch ( index.column() )
+  {
+    case 1: // value
+    {
+      // try to preserve variant type for this value
+      QVariant val;
+      switch ( mRenderer->categories().value( index.row() ).value().type() )
+      {
+        case QVariant::Int:
+          val = value.toInt();
+          break;
+        case QVariant::Double:
+          val = value.toDouble();
+          break;
+        default:
+          val = value.toString();
+          break;
+      }
+      mRenderer->updateCategoryValue( index.row(), val );
+      break;
+    }
+    case 2: // label
+      mRenderer->updateCategoryLabel( index.row(), value.toString() );
+      break;
+    default:
+      return false;
+  }
+
+  emit dataChanged( index, index );
+  return true;
+}
+
+QVariant QgsCategorizedSymbolRendererV2Model::headerData( int section, Qt::Orientation orientation, int role ) const
+{
+  if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 3 )
+  {
+    QStringList lst; lst << tr( "Symbol" ) << tr( "Value" ) << tr( "Label" );
+    return lst.value( section );
+  }
+  return QVariant();
+}
+
+int QgsCategorizedSymbolRendererV2Model::rowCount( const QModelIndex &parent ) const
+{
+  if ( parent.column() > 0 || !mRenderer ) return 0;
+  return mRenderer->categories().size();
+}
+
+int QgsCategorizedSymbolRendererV2Model::columnCount( const QModelIndex & index ) const
+{
+  Q_UNUSED( index );
+  return 3;
+}
+
+QModelIndex QgsCategorizedSymbolRendererV2Model::index( int row, int column, const QModelIndex &parent ) const
+{
+  if ( hasIndex( row, column, parent ) )
+  {
+    return createIndex( row, column, 0 );
+  }
+  return QModelIndex();
+}
+
+QModelIndex QgsCategorizedSymbolRendererV2Model::parent( const QModelIndex &index ) const
+{
+  Q_UNUSED( index );
+  return QModelIndex();
+}
+
+QStringList QgsCategorizedSymbolRendererV2Model::mimeTypes() const
+{
+  QStringList types;
+  types << mMimeFormat;
+  return types;
+}
+
+QMimeData *QgsCategorizedSymbolRendererV2Model::mimeData( const QModelIndexList &indexes ) const
+{
+  QMimeData *mimeData = new QMimeData();
+  QByteArray encodedData;
+
+  QDataStream stream( &encodedData, QIODevice::WriteOnly );
+
+  // Create list of rows
+  foreach ( const QModelIndex &index, indexes )
+  {
+    if ( !index.isValid() || index.column() != 0 )
+      continue;
+
+    stream << index.row();
+  }
+  mimeData->setData( mMimeFormat, encodedData );
+  return mimeData;
+}
+
+bool QgsCategorizedSymbolRendererV2Model::dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent )
+{
+  Q_UNUSED( row );
+  Q_UNUSED( column );
+  if ( action != Qt::MoveAction ) return true;
+
+  if ( !data->hasFormat( mMimeFormat ) ) return false;
+
+  QByteArray encodedData = data->data( mMimeFormat );
+  QDataStream stream( &encodedData, QIODevice::ReadOnly );
+
+  QVector rows;
+  while ( !stream.atEnd() )
+  {
+    int r;
+    stream >> r;
+    rows.append( r );
+  }
+
+  int to = parent.row();
+  // to is -1 if dragged outside items, i.e. below any item,
+  // then move to the last position
+  if ( to == -1 ) to = mRenderer->categories().size(); // out of rang ok, will be decreased
+  for ( int i = rows.size() - 1; i >= 0; i-- )
+  {
+    QgsDebugMsg( QString( "move %1 to %2" ).arg( rows[i] ).arg( to ) );
+    int t = to;
+    // moveCategory first removes and then inserts
+    if ( rows[i] < to ) t--;
+    mRenderer->moveCategory( rows[i], t );
+    // current moved under another, shift its index up
+    for ( int j = 0; j < i; j++ )
+    {
+      if ( to < rows[j] && rows[i] > rows[j] ) rows[j] += 1;
+    }
+    // removed under 'to' so the target shifted down
+    if ( rows[i] < to ) to--;
+  }
+  emit dataChanged( createIndex( 0, 0, 0 ), createIndex( mRenderer->categories().size(), 0 ) );
+  emit rowsMoved();
+  return false;
+}
 
+void QgsCategorizedSymbolRendererV2Model::removeRows( QList rows )
+{
+  for ( int i = rows.size() - 1; i >= 0; i-- )
+  {
+    beginRemoveRows( QModelIndex(), rows[i], rows[i] );
+    mRenderer->deleteCategory( rows[i] );
+    endRemoveRows();
+  }
+}
 
+void QgsCategorizedSymbolRendererV2Model::removeAllRows( )
+{
+  beginRemoveRows( QModelIndex(), 0, mRenderer->categories().size() - 1 );
+  mRenderer->deleteAllCategories();
+  endRemoveRows();
+}
+
+void QgsCategorizedSymbolRendererV2Model::sort( int column, Qt::SortOrder order )
+{
+  QgsDebugMsg( "Entered" );
+  if ( column == 0 )
+  {
+    return;
+  }
+  if ( column == 1 )
+  {
+    mRenderer->sortByValue( order );
+  }
+  else if ( column == 2 )
+  {
+    mRenderer->sortByLabel( order );
+  }
+  emit dataChanged( createIndex( 0, 0, 0 ), createIndex( mRenderer->categories().size(), 0 ) );
+  QgsDebugMsg( "Done" );
+}
+
+// ------------------------------ View style --------------------------------
+QgsCategorizedSymbolRendererV2ViewStyle::QgsCategorizedSymbolRendererV2ViewStyle( QStyle* style )
+    : QProxyStyle( style )
+{}
+
+void QgsCategorizedSymbolRendererV2ViewStyle::drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const
+{
+  if ( element == QStyle::PE_IndicatorItemViewItemDrop && !option->rect.isNull() )
+  {
+    QStyleOption opt( *option );
+    opt.rect.setLeft( 0 );
+    // draw always as line above, because we move item to that index
+    opt.rect.setHeight( 0 );
+    if ( widget ) opt.rect.setRight( widget->width() );
+    QProxyStyle::drawPrimitive( element, &opt, painter, widget );
+    return;
+  }
+  QProxyStyle::drawPrimitive( element, option, painter, widget );
+}
+
+// ------------------------------ Widget ------------------------------------
 QgsRendererV2Widget* QgsCategorizedSymbolRendererV2Widget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
 {
   return new QgsCategorizedSymbolRendererV2Widget( layer, style, renderer );
@@ -40,6 +325,8 @@ QgsRendererV2Widget* QgsCategorizedSymbolRendererV2Widget::create( QgsVectorLaye
 
 QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
     : QgsRendererV2Widget( layer, style )
+    , mRenderer( 0 )
+    , mModel( 0 )
 {
 
   // try to recognize the previous renderer
@@ -75,14 +362,19 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV
       cboCategorizedColorRamp->setCurrentIndex( index );
   }
 
-  QStandardItemModel* m = new QStandardItemModel( this );
-  QStringList labels;
-  labels << tr( "Symbol" ) << tr( "Value" ) << tr( "Label" );
-  m->setHorizontalHeaderLabels( labels );
-  viewCategories->setModel( m );
+  mModel = new QgsCategorizedSymbolRendererV2Model( this );
+  mModel->setRenderer( mRenderer );
+  viewCategories->setModel( mModel );
+  viewCategories->resizeColumnToContents( 0 );
+  viewCategories->resizeColumnToContents( 1 );
+  viewCategories->resizeColumnToContents( 2 );
+
+  viewCategories->setStyle( new QgsCategorizedSymbolRendererV2ViewStyle( viewCategories->style() ) );
 
   mCategorizedSymbol = QgsSymbolV2::defaultSymbol( mLayer->geometryType() );
 
+  connect( mModel, SIGNAL( rowsMoved() ), this, SLOT( rowsMoved() ) );
+
   connect( cboCategorizedColumn, SIGNAL( currentIndexChanged( int ) ), this, SLOT( categoryColumnChanged() ) );
 
   connect( viewCategories, SIGNAL( doubleClicked( const QModelIndex & ) ), this, SLOT( categoriesDoubleClicked( const QModelIndex & ) ) );
@@ -90,10 +382,9 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV
 
   connect( btnChangeCategorizedSymbol, SIGNAL( clicked() ), this, SLOT( changeCategorizedSymbol() ) );
   connect( btnAddCategories, SIGNAL( clicked() ), this, SLOT( addCategories() ) );
-  connect( btnDeleteCategory, SIGNAL( clicked() ), this, SLOT( deleteCategory() ) );
+  connect( btnDeleteCategories, SIGNAL( clicked() ), this, SLOT( deleteCategories() ) );
   connect( btnDeleteAllCategories, SIGNAL( clicked() ), this, SLOT( deleteAllCategories() ) );
   connect( btnAddCategory, SIGNAL( clicked() ), this, SLOT( addCategory() ) );
-  connect( m, SIGNAL( itemChanged( QStandardItem * ) ), this, SLOT( changeCurrentValue( QStandardItem * ) ) );
 
   // update GUI from renderer
   updateUiFromRenderer();
@@ -113,14 +404,15 @@ QgsCategorizedSymbolRendererV2Widget::QgsCategorizedSymbolRendererV2Widget( QgsV
 
 QgsCategorizedSymbolRendererV2Widget::~QgsCategorizedSymbolRendererV2Widget()
 {
-  delete mRenderer;
+  if ( mRenderer ) delete mRenderer;
+  if ( mModel ) delete mModel;
 }
 
 void QgsCategorizedSymbolRendererV2Widget::updateUiFromRenderer()
 {
-
   updateCategorizedSymbolIcon();
-  populateCategories();
+
+  //mModel->setRenderer ( mRenderer ); // necessary?
 
   // set column
   disconnect( cboCategorizedColumn, SIGNAL( currentIndexChanged( int ) ), this, SLOT( categoryColumnChanged() ) );
@@ -166,9 +458,9 @@ void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols()
       return;
     }
 
-    foreach( QModelIndex idx, selectedIndexes )
+    foreach ( QModelIndex idx, selectedIndexes )
     {
-      if( idx.isValid() )
+      if ( idx.isValid() )
       {
         int catIdx = mRenderer->categoryIndexForValue( idx.data( Qt::UserRole + 1 ) );
         QgsSymbolV2* newCatSymbol = newSymbol->clone();
@@ -177,8 +469,6 @@ void QgsCategorizedSymbolRendererV2Widget::changeSelectedSymbols()
       }
     }
   }
-
-  populateCategories();
 }
 
 void QgsCategorizedSymbolRendererV2Widget::changeCategorizedSymbol()
@@ -207,7 +497,6 @@ void QgsCategorizedSymbolRendererV2Widget::changeCategorizedSymbol()
   updateCategorizedSymbolIcon();
 
   mRenderer->updateSymbols( mCategorizedSymbol );
-  populateCategories();
 }
 
 void QgsCategorizedSymbolRendererV2Widget::updateCategorizedSymbolIcon()
@@ -218,26 +507,7 @@ void QgsCategorizedSymbolRendererV2Widget::updateCategorizedSymbolIcon()
 
 void QgsCategorizedSymbolRendererV2Widget::populateCategories()
 {
-  QStandardItemModel* m = qobject_cast( viewCategories->model() );
-  m->clear();
-
-  QStringList labels;
-  labels << tr( "Symbol" ) << tr( "Value" ) << tr( "Label" );
-  m->setHorizontalHeaderLabels( labels );
-
-  int i, count = mRenderer->categories().count();
 
-  // TODO: sort?? utils.sortVariantList(keys);
-
-  for ( i = 0; i < count; i++ )
-  {
-    const QgsRendererCategoryV2 &cat = mRenderer->categories()[i];
-    addCategory( cat );
-  }
-
-  viewCategories->resizeColumnToContents( 0 );
-  viewCategories->resizeColumnToContents( 1 );
-  viewCategories->resizeColumnToContents( 2 );
 }
 
 void QgsCategorizedSymbolRendererV2Widget::populateColumns()
@@ -251,23 +521,6 @@ void QgsCategorizedSymbolRendererV2Widget::populateColumns()
   }
 }
 
-
-void QgsCategorizedSymbolRendererV2Widget::addCategory( const QgsRendererCategoryV2 &cat )
-{
-  QSize iconSize( 16, 16 );
-
-  QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( cat.symbol(), iconSize );
-  QStandardItem *symbolItem = new QStandardItem( icon, "" );
-  symbolItem->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-
-  QStandardItem *valueItem = new QStandardItem( cat.value().toString() );
-  valueItem->setData( cat.value() ); // set attribute value as user role
-
-  QList list;
-  list << symbolItem << valueItem << new QStandardItem( cat.label() );
-  qobject_cast( viewCategories->model() )->appendRow( list );
-}
-
 void QgsCategorizedSymbolRendererV2Widget::categoryColumnChanged()
 {
   mRenderer->setClassAttribute( cboCategorizedColumn->currentText() );
@@ -281,29 +534,32 @@ void QgsCategorizedSymbolRendererV2Widget::categoriesDoubleClicked( const QModel
 
 void QgsCategorizedSymbolRendererV2Widget::changeCategorySymbol()
 {
-  QVariant k = currentCategory();
-  if ( !k.isValid() )
-    return;
+  int catIdx = currentCategoryRow();
+  QgsRendererCategoryV2 category = mRenderer->categories().value( currentCategoryRow() );
 
-  int catIdx = mRenderer->categoryIndexForValue( k );
-  QgsSymbolV2* newSymbol = mRenderer->categories()[catIdx].symbol()->clone();
+  QgsSymbolV2 *symbol = category.symbol();
+  if ( symbol )
+  {
+    symbol = symbol->clone();
+  }
+  else
+  {
+    symbol = QgsSymbolV2::defaultSymbol( mLayer->geometryType() );
+  }
 
-  QgsSymbolV2SelectorDialog dlg( newSymbol, mStyle, mLayer, this );
+  QgsSymbolV2SelectorDialog dlg( symbol, mStyle, mLayer, this );
   if ( !dlg.exec() )
   {
-    delete newSymbol;
+    delete symbol;
     return;
   }
 
-  mRenderer->updateCategorySymbol( catIdx, newSymbol );
-
-  populateCategories();
+  mRenderer->updateCategorySymbol( catIdx, symbol );
 }
 
 static void _createCategories( QgsCategoryList& cats, QList& values, QgsSymbolV2* symbol, QgsVectorColorRampV2* ramp )
 {
   // sort the categories first
-  //TODO: make the order configurable?
   QgsSymbolLayerV2Utils::sortVariantList( values, Qt::AscendingOrder );
 
   int num = values.count();
@@ -340,6 +596,19 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories()
   QList unique_vals;
   mLayer->uniqueValues( idx, unique_vals );
 
+  // ask to abort if too many classes
+  if ( unique_vals.size() >= 1000 )
+  {
+    int res = QMessageBox::warning( 0, tr( "High number of classes!" ),
+                                    tr( "Classification would yield %1 entries which might not be expected. Continue?" ).arg( unique_vals.size() ),
+                                    QMessageBox::Ok | QMessageBox::Cancel,
+                                    QMessageBox::Cancel );
+    if ( res == QMessageBox::Cancel )
+    {
+      return;
+    }
+  }
+
   //DlgAddCategories dlg(mStyle, createDefaultSymbol(), unique_vals, this);
   //if (!dlg.exec())
   //  return;
@@ -423,10 +692,13 @@ void QgsCategorizedSymbolRendererV2Widget::addCategories()
   r->setScaleMethod( mRenderer->scaleMethod() );
   r->setSizeScaleField( mRenderer->sizeScaleField() );
   r->setRotationField( mRenderer->rotationField() );
+
+  if ( mModel )
+  {
+    mModel->setRenderer( r );
+  }
   delete mRenderer;
   mRenderer = r;
-
-  populateCategories();
 }
 
 int QgsCategorizedSymbolRendererV2Widget::currentCategoryRow()
@@ -437,87 +709,38 @@ int QgsCategorizedSymbolRendererV2Widget::currentCategoryRow()
   return idx.row();
 }
 
-QVariant QgsCategorizedSymbolRendererV2Widget::currentCategory()
-{
-  int row = currentCategoryRow();
-  if ( row == -1 )
-    return QVariant();
-  QStandardItemModel* m = qobject_cast( viewCategories->model() );
-  return m->item( row, 1 )->data();
-}
-
-QList QgsCategorizedSymbolRendererV2Widget::selectedCategories()
+QList QgsCategorizedSymbolRendererV2Widget::selectedCategories()
 {
-  QList categories;
-  QModelIndexList rows = viewCategories->selectionModel()->selectedRows();
-  QStandardItemModel* m = qobject_cast( viewCategories->model() );
+  QList rows;
+  QModelIndexList selectedRows = viewCategories->selectionModel()->selectedRows();
 
-  foreach( QModelIndex r, rows )
+  foreach ( QModelIndex r, selectedRows )
   {
-    if( r.isValid() )
+    if ( r.isValid() )
     {
-      categories.append( m->item( r.row(), 1 )->data() );
+      rows.append( r.row() );
     }
   }
-
-  return categories;
+  return rows;
 }
 
-void QgsCategorizedSymbolRendererV2Widget::deleteCategory()
+void QgsCategorizedSymbolRendererV2Widget::deleteCategories()
 {
-  QList categories = selectedCategories();
-
-  if ( !categories.size() )
-    return;
-
-  foreach( const QVariant k, categories )
-  {
-    if ( k.isValid() )
-    {
-      int idx = mRenderer->categoryIndexForValue( k );
-      if ( idx >= 0 )
-      {
-        mRenderer->deleteCategory( idx );
-      }
-    }
-  }
-  populateCategories();
+  QList categoryIndexes = selectedCategories();
+  mModel->removeRows( categoryIndexes );
 }
 
 void QgsCategorizedSymbolRendererV2Widget::deleteAllCategories()
 {
-  mRenderer->deleteAllCategories();
-  populateCategories();
-}
-
-void QgsCategorizedSymbolRendererV2Widget::changeCurrentValue( QStandardItem * item )
-{
-  int idx = item->row();
-  QString newtext = item->text();
-  if ( item->column() == 1 )
-  {
-    QVariant value = newtext;
-    // try to preserve variant type for this value
-    QVariant::Type t = item->data().type();
-    if ( t == QVariant::Int )
-      value = newtext.toInt();
-    else if ( t == QVariant::Double )
-      value = newtext.toDouble();
-    mRenderer->updateCategoryValue( idx, value );
-    item->setData( value );
-  }
-  else if ( item->column() == 2 )
-  {
-    mRenderer->updateCategoryLabel( idx, newtext );
-  }
+  mModel->removeAllRows();
 }
 
 void QgsCategorizedSymbolRendererV2Widget::addCategory()
 {
+  if ( !mModel ) return;
   QgsSymbolV2 *symbol = QgsSymbolV2::defaultSymbol( mLayer->geometryType() );
   QgsRendererCategoryV2 cat( QString(), symbol, QString() );
-  addCategory( cat );
-  mRenderer->addCategory( cat );
+  mModel->addCategory( cat );
 }
 
 void QgsCategorizedSymbolRendererV2Widget::rotationFieldChanged( QString fldName )
@@ -548,14 +771,11 @@ QList QgsCategorizedSymbolRendererV2Widget::selectedSymbols()
     QModelIndexList::const_iterator indexIt = selectedIndexes.constBegin();
     for ( ; indexIt != selectedIndexes.constEnd(); ++indexIt )
     {
-      QStandardItem* currentItem = qobject_cast( m->model() )->itemFromIndex( *indexIt );
-      if ( currentItem )
+      int row = ( *indexIt ).row();
+      QgsSymbolV2* s = categories[row].symbol();
+      if ( s )
       {
-        QgsSymbolV2* s = categories[mRenderer->categoryIndexForValue( currentItem->data() )].symbol();
-        if ( s )
-        {
-          selectedSymbols.append( s );
-        }
+        selectedSymbols.append( s );
       }
     }
   }
@@ -566,3 +786,8 @@ void QgsCategorizedSymbolRendererV2Widget::showSymbolLevels()
 {
   showSymbolLevelsDialog( mRenderer );
 }
+
+void QgsCategorizedSymbolRendererV2Widget::rowsMoved()
+{
+  viewCategories->selectionModel()->clear();
+}
diff --git a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
index 1fdefff33742..b1d48475d9b2 100644
--- a/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
+++ b/src/gui/symbology-ng/qgscategorizedsymbolrendererv2widget.h
@@ -18,12 +18,55 @@
 #include "qgscategorizedsymbolrendererv2.h"
 #include "qgsrendererv2widget.h"
 #include 
+#include 
 
 class QgsCategorizedSymbolRendererV2;
 class QgsRendererCategoryV2;
 
 #include "ui_qgscategorizedsymbolrendererv2widget.h"
 
+class GUI_EXPORT QgsCategorizedSymbolRendererV2Model : public QAbstractItemModel
+{
+    Q_OBJECT
+  public:
+    QgsCategorizedSymbolRendererV2Model( QObject * parent = 0 );
+    Qt::ItemFlags flags( const QModelIndex & index ) const;
+    Qt::DropActions supportedDropActions() const;
+    QVariant data( const QModelIndex &index, int role ) const;
+    bool setData( const QModelIndex & index, const QVariant & value, int role );
+    QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
+    int rowCount( const QModelIndex &parent = QModelIndex() ) const;
+    int columnCount( const QModelIndex & = QModelIndex() ) const;
+    QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const;
+    QModelIndex parent( const QModelIndex &index ) const;
+    QStringList mimeTypes() const;
+    QMimeData *mimeData( const QModelIndexList &indexes ) const;
+    bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent );
+
+    void setRenderer( QgsCategorizedSymbolRendererV2* renderer );
+
+    void addCategory( const QgsRendererCategoryV2 &cat );
+    void removeRows( QList rows );
+    void removeAllRows( );
+    void sort( int column, Qt::SortOrder order = Qt::AscendingOrder );
+
+  signals:
+    void rowsMoved();
+
+  private:
+    QgsCategorizedSymbolRendererV2* mRenderer;
+    QString mMimeFormat;
+};
+
+// View style which shows drop indicator line between items
+class QgsCategorizedSymbolRendererV2ViewStyle: public QProxyStyle
+{
+  public:
+    QgsCategorizedSymbolRendererV2ViewStyle( QStyle* style = 0 );
+
+    void drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = 0 ) const;
+};
+
 class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widget, private Ui::QgsCategorizedSymbolRendererV2Widget
 {
     Q_OBJECT
@@ -39,10 +82,10 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg
     void changeCategorizedSymbol();
     void categoryColumnChanged();
     void categoriesDoubleClicked( const QModelIndex & idx );
+    void addCategory();
     void addCategories();
-    void deleteCategory();
+    void deleteCategories();
     void deleteAllCategories();
-    void changeCurrentValue( QStandardItem * item );
 
     void rotationFieldChanged( QString fldName );
     void sizeScaleFieldChanged( QString fldName );
@@ -50,28 +93,25 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg
 
     void showSymbolLevels();
 
+    void rowsMoved();
+
   protected:
 
     void updateUiFromRenderer();
 
     void updateCategorizedSymbolIcon();
 
-    //! populate categories view
+    // Called by virtual refreshSymbolView()
     void populateCategories();
 
     //! populate column combo
     void populateColumns();
 
-    void addCategory( const QgsRendererCategoryV2& cat );
-
     //! return row index for the currently selected category (-1 if on no selection)
     int currentCategoryRow();
 
-    //! return key for the currently selected category
-    QVariant currentCategory();
-
-    //! return a list of keys for the categories unders selection
-    QList selectedCategories();
+    //! return a list of indexes for the categories unders selection
+    QList selectedCategories();
 
     //! change the selected symbols alone for the change button, if there is a selection
     void changeSelectedSymbols();
@@ -81,9 +121,6 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg
     QList selectedSymbols();
     void refreshSymbolView() { populateCategories(); }
 
-  protected slots:
-    void addCategory();
-
   protected:
     QgsCategorizedSymbolRendererV2* mRenderer;
 
@@ -91,10 +128,10 @@ class GUI_EXPORT QgsCategorizedSymbolRendererV2Widget : public QgsRendererV2Widg
 
     QgsRendererV2DataDefinedMenus* mDataDefinedMenus;
 
+    QgsCategorizedSymbolRendererV2Model* mModel;
+
   private:
     QString mOldClassificationAttribute;
 };
 
-
-
 #endif // QGSCATEGORIZEDSYMBOLRENDERERV2WIDGET_H
diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
index 3cb8169eea07..84dedf74f56d 100644
--- a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.cpp
@@ -58,6 +58,8 @@ QgsCptCityColorRampV2Dialog::QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2*
 {
   setupUi( this );
 
+  buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
+
   QSettings settings;
   restoreGeometry( settings.value( "/Windows/CptCityColorRampV2Dialog/geometry" ).toByteArray() );
   mSplitter->setSizes( QList() << 250 << 550 );
@@ -93,7 +95,6 @@ QgsCptCityColorRampV2Dialog::QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2*
     mStackedWidget->addWidget( edit );
     mStackedWidget->setCurrentIndex( 1 );
     tabBar->setVisible( false );
-    buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
     // dlg.layout()->addWidget( edit );
     // dlg.resize(500,400);
     // dlg.exec();
@@ -154,6 +155,8 @@ QgsCptCityColorRampV2Dialog::QgsCptCityColorRampV2Dialog( QgsCptCityColorRampV2*
         setTreeModel( mSelectionsModel );
       }
     }
+    if ( found )
+      buttonBox->button( QDialogButtonBox::Ok )->setEnabled( true );
   }
 
   tabBar->blockSignals( false );
@@ -261,6 +264,8 @@ void QgsCptCityColorRampV2Dialog::on_mTreeView_clicked( const QModelIndex &index
   QgsCptCityDataItem *item = mModel->dataItem( sourceIndex );
   if ( ! item )
     return;
+  QgsDebugMsg( QString( "item %1 clicked" ).arg( item->name() ) );
+  buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
   updateTreeView( item );
 }
 
@@ -293,6 +298,14 @@ void QgsCptCityColorRampV2Dialog::updateTreeView( QgsCptCityDataItem *item, bool
     clearCopyingInfo( );
     updateListWidget( item );
   }
+  else if ( item->type() == QgsCptCityDataItem::AllRamps )
+  {
+    lblSchemePath->setText( "" );
+    // lblCollectionName->setText( item->path() );
+    clearCopyingInfo( );
+    updateListWidget( item );
+    lblCollectionInfo->setText( tr( "All Ramps (%1)" ).arg( item->rowCount() ) );
+  }
   else
   {
     QgsDebugMsg( QString( "item %1 has invalid type %2" ).arg( item->path() ).arg(( int )item->type() ) );
@@ -304,6 +317,7 @@ void QgsCptCityColorRampV2Dialog::on_mListWidget_itemClicked( QListWidgetItem *
   QgsCptCityColorRampItem *rampItem = mListRamps.at( item->data( Qt::UserRole ).toInt() );
   if ( rampItem )
   {
+    buttonBox->button( QDialogButtonBox::Ok )->setEnabled( true );
     lblSchemeName->setText( QFileInfo( rampItem->name() ).fileName() );
     mRamp->copy( &rampItem->ramp() );
     QgsDebugMsg( QString( "variant= %1 - %2 variants" ).arg( mRamp->variantName() ).arg( mRamp->variantList().count() ) );
@@ -479,11 +493,19 @@ void QgsCptCityColorRampV2Dialog::on_cboVariantName_currentIndexChanged( int ind
 
 void QgsCptCityColorRampV2Dialog::onFinished()
 {
+  // save settings
   QSettings settings;
   settings.setValue( "/Windows/CptCityColorRampV2Dialog/geometry", saveGeometry() );
   settings.setValue( "/Windows/CptCityColorRampV2Dialog/splitter", mSplitter->saveState() );
 }
 
+bool QgsCptCityColorRampV2Dialog::saveAsGradientRamp() const
+{
+  QgsDebugMsg( QString( "result: %1 checked: %2" ).arg( result() ).arg( cboConvertStandard->isChecked() ) );
+  // if "save as standard gradient" is checked, convert to QgsVectorGradientColorRampV2
+  return ( result() == Accepted && cboConvertStandard->isChecked() );
+}
+
 void QgsCptCityColorRampV2Dialog::updateListWidget( QgsCptCityDataItem *item )
 {
   QgsCptCityCollectionItem* colItem = dynamic_cast( item );
@@ -552,8 +574,11 @@ bool QgsCptCityColorRampV2Dialog::updateRamp()
   mListWidget->clear();
   mListRamps.clear();
   cboVariantName->clear();
-  updatePreview( true );
   clearCopyingInfo( );
+  lblCollectionInfo->clear();
+
+  buttonBox->button( QDialogButtonBox::Ok )->setEnabled( false );
+  updatePreview( true );
 
   QgsDebugMsg( "schemeName= " + mRamp->schemeName() );
   if ( mRamp->schemeName() == "" )
@@ -598,6 +623,7 @@ bool QgsCptCityColorRampV2Dialog::updateRamp()
       populateVariants();
       mListWidget->scrollToItem( listItem, QAbstractItemView::EnsureVisible );
       // mListView->selectionModel()->select( childIndex, QItemSelectionModel::Select );
+      buttonBox->button( QDialogButtonBox::Ok )->setEnabled( true );
       return true;
     }
   }
diff --git a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
index c25c21b3fd9c..920a2903289b 100644
--- a/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
+++ b/src/gui/symbology-ng/qgscptcitycolorrampv2dialog.h
@@ -41,6 +41,8 @@ class GUI_EXPORT QgsCptCityColorRampV2Dialog : public QDialog, private Ui::QgsCp
     QString selectedName() const
     { return mRamp ? QFileInfo( mRamp->schemeName() ).baseName() + mRamp->variantName() : QString(); }
 
+    bool saveAsGradientRamp() const;
+
   public slots:
     void populateVariants();
 
@@ -50,7 +52,6 @@ class GUI_EXPORT QgsCptCityColorRampV2Dialog : public QDialog, private Ui::QgsCp
     void on_pbtnLicenseDetails_pressed();
     void on_cboVariantName_currentIndexChanged( int index );
     void onFinished();
-
     /* void refresh(); */
 
   protected:
diff --git a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
index 59476eda8da2..82c4b66deecf 100644
--- a/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
+++ b/src/gui/symbology-ng/qgsellipsesymbollayerv2widget.cpp
@@ -191,7 +191,7 @@ void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorBorder_clicked()
 {
   if ( mLayer )
   {
-    QColor newColor = QColorDialog::getColor( mLayer->outlineColor() );
+    QColor newColor = QColorDialog::getColor( mLayer->outlineColor(), this, "", QColorDialog::ShowAlphaChannel );
     if ( newColor.isValid() )
     {
       mLayer->setOutlineColor( newColor );
@@ -205,7 +205,7 @@ void QgsEllipseSymbolLayerV2Widget::on_btnChangeColorFill_clicked()
 {
   if ( mLayer )
   {
-    QColor newColor = QColorDialog::getColor( mLayer->fillColor() );
+    QColor newColor = QColorDialog::getColor( mLayer->fillColor(), this, "", QColorDialog::ShowAlphaChannel );
     if ( newColor.isValid() )
     {
       mLayer->setFillColor( newColor );
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
index 9723363c9fb7..3772a8aa82e1 100644
--- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.cpp
@@ -31,7 +31,280 @@
 #include 
 #include 
 #include 
+#include 
+#include 
 
+// ------------------------------ Model ------------------------------------
+
+QgsGraduatedSymbolRendererV2Model::QgsGraduatedSymbolRendererV2Model( QObject * parent ) : QAbstractItemModel( parent )
+    , mRenderer( 0 )
+    , mMimeFormat( "application/x-qgsgraduatedsymbolrendererv2model" )
+{
+}
+
+void QgsGraduatedSymbolRendererV2Model::setRenderer( QgsGraduatedSymbolRendererV2* renderer )
+{
+  if ( mRenderer )
+  {
+    beginRemoveRows( QModelIndex(), 0, mRenderer->ranges().size() - 1 );
+    mRenderer = 0;
+    endRemoveRows();
+  }
+  if ( renderer )
+  {
+    beginInsertRows( QModelIndex(), 0, renderer->ranges().size() - 1 );
+    mRenderer = renderer;
+    endInsertRows();
+  }
+}
+
+void QgsGraduatedSymbolRendererV2Model::addClass( QgsSymbolV2* symbol )
+{
+  if ( !mRenderer ) return;
+  int idx = mRenderer->ranges().size();
+  beginInsertRows( QModelIndex(), idx, idx );
+  mRenderer->addClass( symbol );
+  endInsertRows();
+}
+
+Qt::ItemFlags QgsGraduatedSymbolRendererV2Model::flags( const QModelIndex & index ) const
+{
+  Qt::ItemFlags flags = Qt::ItemIsSelectable | Qt::ItemIsEnabled | Qt::ItemIsDragEnabled | Qt::ItemIsDropEnabled;
+
+  if ( index.column() == 2 )
+  {
+    flags |= Qt::ItemIsEditable;
+  }
+
+  return flags;
+}
+
+Qt::DropActions QgsGraduatedSymbolRendererV2Model::supportedDropActions() const
+{
+  return Qt::MoveAction;
+}
+
+QVariant QgsGraduatedSymbolRendererV2Model::data( const QModelIndex &index, int role ) const
+{
+  if ( !index.isValid() || !mRenderer ) return QVariant();
+
+  const QgsRendererRangeV2 range = mRenderer->ranges().value( index.row() );
+  QString rangeStr = QString::number( range.lowerValue(), 'f', 4 ) + " - " + QString::number( range.upperValue(), 'f', 4 );
+
+  if ( role == Qt::DisplayRole || role == Qt::ToolTipRole )
+  {
+    switch ( index.column() )
+    {
+      case 1: return rangeStr;
+      case 2: return range.label();
+      default: return QVariant();
+    }
+  }
+  else if ( role == Qt::DecorationRole && index.column() == 0 && range.symbol() )
+  {
+    return QgsSymbolLayerV2Utils::symbolPreviewIcon( range.symbol(), QSize( 16, 16 ) );
+  }
+  else if ( role == Qt::TextAlignmentRole )
+  {
+    return ( index.column() == 0 ) ? Qt::AlignHCenter : Qt::AlignLeft;
+  }
+  else if ( role == Qt::EditRole )
+  {
+    switch ( index.column() )
+    {
+      case 1: return rangeStr;
+      case 2: return range.label();
+      default: return QVariant();
+    }
+  }
+
+  return QVariant();
+}
+
+bool QgsGraduatedSymbolRendererV2Model::setData( const QModelIndex & index, const QVariant & value, int role )
+{
+  if ( !index.isValid() || role != Qt::EditRole )
+    return false;
+
+  switch ( index.column() )
+  {
+    case 1: // range
+      return false; // range is edited in popup dialog
+      break;
+    case 2: // label
+      mRenderer->updateRangeLabel( index.row(), value.toString() );
+      break;
+    default:
+      return false;
+  }
+
+  emit dataChanged( index, index );
+  return true;
+}
+
+QVariant QgsGraduatedSymbolRendererV2Model::headerData( int section, Qt::Orientation orientation, int role ) const
+{
+  if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 3 )
+  {
+    QStringList lst; lst << tr( "Symbol" ) << tr( "Value" ) << tr( "Label" );
+    return lst.value( section );
+  }
+  return QVariant();
+}
+
+int QgsGraduatedSymbolRendererV2Model::rowCount( const QModelIndex &parent ) const
+{
+  if ( parent.column() > 0 || !mRenderer ) return 0;
+  return mRenderer->ranges().size();
+}
+
+int QgsGraduatedSymbolRendererV2Model::columnCount( const QModelIndex & index ) const
+{
+  Q_UNUSED( index );
+  return 3;
+}
+
+QModelIndex QgsGraduatedSymbolRendererV2Model::index( int row, int column, const QModelIndex &parent ) const
+{
+  if ( hasIndex( row, column, parent ) )
+  {
+    return createIndex( row, column, 0 );
+  }
+  return QModelIndex();
+}
+
+QModelIndex QgsGraduatedSymbolRendererV2Model::parent( const QModelIndex &index ) const
+{
+  Q_UNUSED( index );
+  return QModelIndex();
+}
+
+QStringList QgsGraduatedSymbolRendererV2Model::mimeTypes() const
+{
+  QStringList types;
+  types << mMimeFormat;
+  return types;
+}
+
+QMimeData *QgsGraduatedSymbolRendererV2Model::mimeData( const QModelIndexList &indexes ) const
+{
+  QMimeData *mimeData = new QMimeData();
+  QByteArray encodedData;
+
+  QDataStream stream( &encodedData, QIODevice::WriteOnly );
+
+  // Create list of rows
+  foreach ( const QModelIndex &index, indexes )
+  {
+    if ( !index.isValid() || index.column() != 0 )
+      continue;
+
+    stream << index.row();
+  }
+  mimeData->setData( mMimeFormat, encodedData );
+  return mimeData;
+}
+
+bool QgsGraduatedSymbolRendererV2Model::dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent )
+{
+  Q_UNUSED( row );
+  Q_UNUSED( column );
+  if ( action != Qt::MoveAction ) return true;
+
+  if ( !data->hasFormat( mMimeFormat ) ) return false;
+
+  QByteArray encodedData = data->data( mMimeFormat );
+  QDataStream stream( &encodedData, QIODevice::ReadOnly );
+
+  QVector rows;
+  while ( !stream.atEnd() )
+  {
+    int r;
+    stream >> r;
+    rows.append( r );
+  }
+
+  int to = parent.row();
+  // to is -1 if dragged outside items, i.e. below any item,
+  // then move to the last position
+  if ( to == -1 ) to = mRenderer->ranges().size(); // out of rang ok, will be decreased
+  for ( int i = rows.size() - 1; i >= 0; i-- )
+  {
+    QgsDebugMsg( QString( "move %1 to %2" ).arg( rows[i] ).arg( to ) );
+    int t = to;
+    // moveCategory first removes and then inserts
+    if ( rows[i] < to ) t--;
+    mRenderer->moveClass( rows[i], t );
+    // current moved under another, shift its index up
+    for ( int j = 0; j < i; j++ )
+    {
+      if ( to < rows[j] && rows[i] > rows[j] ) rows[j] += 1;
+    }
+    // removed under 'to' so the target shifted down
+    if ( rows[i] < to ) to--;
+  }
+  emit dataChanged( createIndex( 0, 0, 0 ), createIndex( mRenderer->ranges().size(), 0 ) );
+  emit rowsMoved();
+  return false;
+}
+
+void QgsGraduatedSymbolRendererV2Model::removeRows( QList rows )
+{
+  for ( int i = rows.size() - 1; i >= 0; i-- )
+  {
+    beginRemoveRows( QModelIndex(), rows[i], rows[i] );
+    mRenderer->deleteClass( rows[i] );
+    endRemoveRows();
+  }
+}
+
+void QgsGraduatedSymbolRendererV2Model::removeAllRows( )
+{
+  beginRemoveRows( QModelIndex(), 0, mRenderer->ranges().size() - 1 );
+  mRenderer->deleteAllClasses();
+  endRemoveRows();
+}
+
+void QgsGraduatedSymbolRendererV2Model::sort( int column, Qt::SortOrder order )
+{
+  QgsDebugMsg( "Entered" );
+  if ( column == 0 )
+  {
+    return;
+  }
+  if ( column == 1 )
+  {
+    mRenderer->sortByValue( order );
+  }
+  else if ( column == 2 )
+  {
+    mRenderer->sortByLabel( order );
+  }
+  emit dataChanged( createIndex( 0, 0, 0 ), createIndex( mRenderer->ranges().size(), 0 ) );
+  QgsDebugMsg( "Done" );
+}
+
+// ------------------------------ View style --------------------------------
+QgsGraduatedSymbolRendererV2ViewStyle::QgsGraduatedSymbolRendererV2ViewStyle( QStyle* style )
+    : QProxyStyle( style )
+{}
+
+void QgsGraduatedSymbolRendererV2ViewStyle::drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget ) const
+{
+  if ( element == QStyle::PE_IndicatorItemViewItemDrop && !option->rect.isNull() )
+  {
+    QStyleOption opt( *option );
+    opt.rect.setLeft( 0 );
+    // draw always as line above, because we move item to that index
+    opt.rect.setHeight( 0 );
+    if ( widget ) opt.rect.setRight( widget->width() );
+    QProxyStyle::drawPrimitive( element, &opt, painter, widget );
+    return;
+  }
+  QProxyStyle::drawPrimitive( element, option, painter, widget );
+}
+
+// ------------------------------ Widget ------------------------------------
 
 QgsRendererV2Widget* QgsGraduatedSymbolRendererV2Widget::create( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
 {
@@ -40,6 +313,8 @@ QgsRendererV2Widget* QgsGraduatedSymbolRendererV2Widget::create( QgsVectorLayer*
 
 QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVectorLayer* layer, QgsStyleV2* style, QgsFeatureRendererV2* renderer )
     : QgsRendererV2Widget( layer, style )
+    , mRenderer( 0 )
+    , mModel( 0 )
 {
 
   // try to recognize the previous renderer
@@ -72,11 +347,14 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
       cboGraduatedColorRamp->setCurrentIndex( index );
   }
 
-  QStandardItemModel* mg = new QStandardItemModel( this );
-  QStringList labels;
-  labels << tr( "Range" ) << tr( "Label" );
-  mg->setHorizontalHeaderLabels( labels );
-  viewGraduated->setModel( mg );
+  mModel = new QgsGraduatedSymbolRendererV2Model( this );
+  mModel->setRenderer( mRenderer );
+  viewGraduated->setModel( mModel );
+  viewGraduated->resizeColumnToContents( 0 );
+  viewGraduated->resizeColumnToContents( 1 );
+  viewGraduated->resizeColumnToContents( 2 );
+
+  viewGraduated->setStyle( new QgsGraduatedSymbolRendererV2ViewStyle( viewGraduated->style() ) );
 
   mGraduatedSymbol = QgsSymbolV2::defaultSymbol( mLayer->geometryType() );
 
@@ -84,10 +362,13 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
   connect( viewGraduated, SIGNAL( doubleClicked( const QModelIndex & ) ), this, SLOT( rangesDoubleClicked( const QModelIndex & ) ) );
   connect( viewGraduated, SIGNAL( clicked( const QModelIndex & ) ), this, SLOT( rangesClicked( const QModelIndex & ) ) );
   connect( viewGraduated, SIGNAL( customContextMenuRequested( const QPoint& ) ),  this, SLOT( contextMenuViewCategories( const QPoint& ) ) );
-  connect( mg, SIGNAL( itemChanged( QStandardItem * ) ), this, SLOT( changeCurrentValue( QStandardItem * ) ) );
+
+  connect( mModel, SIGNAL( rowsMoved() ), this, SLOT( rowsMoved() ) );
+
   connect( btnGraduatedClassify, SIGNAL( clicked() ), this, SLOT( classifyGraduated() ) );
   connect( btnChangeGraduatedSymbol, SIGNAL( clicked() ), this, SLOT( changeGraduatedSymbol() ) );
-  connect( btnGraduatedDelete, SIGNAL( clicked() ), this, SLOT( deleteCurrentClass() ) );
+  connect( btnGraduatedDelete, SIGNAL( clicked() ), this, SLOT( deleteClasses() ) );
+  connect( btnDeleteAllClasses, SIGNAL( clicked() ), this, SLOT( deleteAllClasses() ) );
   connect( btnGraduatedAdd, SIGNAL( clicked() ), this, SLOT( addClass() ) );
 
   // initialize from previously set renderer
@@ -113,6 +394,7 @@ QgsGraduatedSymbolRendererV2Widget::QgsGraduatedSymbolRendererV2Widget( QgsVecto
 QgsGraduatedSymbolRendererV2Widget::~QgsGraduatedSymbolRendererV2Widget()
 {
   delete mRenderer;
+  delete mModel;
 }
 
 QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2Widget::renderer()
@@ -123,9 +405,7 @@ QgsFeatureRendererV2* QgsGraduatedSymbolRendererV2Widget::renderer()
 
 void QgsGraduatedSymbolRendererV2Widget::updateUiFromRenderer()
 {
-
   updateGraduatedSymbolIcon();
-  populateRanges();
 
   // update UI from the graduated renderer (update combo boxes, view)
   if ( mRenderer->mode() < cboGraduatedMode->count() )
@@ -153,11 +433,8 @@ void QgsGraduatedSymbolRendererV2Widget::updateUiFromRenderer()
   {
     cboGraduatedColorRamp->setSourceColorRamp( mRenderer->sourceColorRamp() );
   }
-
 }
 
-
-
 void QgsGraduatedSymbolRendererV2Widget::populateColumns()
 {
   cboGraduatedColumn->clear();
@@ -221,10 +498,12 @@ void QgsGraduatedSymbolRendererV2Widget::classifyGraduated()
   r->setRotationField( mRenderer->rotationField() );
   r->setScaleMethod( mRenderer->scaleMethod() );
 
+  if ( mModel )
+  {
+    mModel->setRenderer( r );
+  }
   delete mRenderer;
   mRenderer = r;
-
-  populateRanges();
 }
 
 void QgsGraduatedSymbolRendererV2Widget::reapplyColorRamp()
@@ -271,46 +550,6 @@ void QgsGraduatedSymbolRendererV2Widget::updateGraduatedSymbolIcon()
   btnChangeGraduatedSymbol->setIcon( icon );
 }
 
-
-void QgsGraduatedSymbolRendererV2Widget::populateRanges()
-{
-
-  QStandardItemModel* m = qobject_cast( viewGraduated->model() );
-  m->clear();
-  mRowSelected = -1;
-
-  QStringList labels;
-  labels << tr( "Symbol" ) << tr( "Range" ) << tr( "Label" );
-  m->setHorizontalHeaderLabels( labels );
-
-  QSize iconSize( 16, 16 );
-
-  int i, count = mRenderer->ranges().count();
-
-  for ( i = 0; i < count; i++ )
-  {
-    const QgsRendererRangeV2& range = mRenderer->ranges()[i];
-    QString rangeStr = QString::number( range.lowerValue(), 'f', 4 ) + " - " + QString::number( range.upperValue(), 'f', 4 );
-
-    QIcon icon = QgsSymbolLayerV2Utils::symbolPreviewIcon( range.symbol(), iconSize );
-    QStandardItem* item = new QStandardItem( icon, "" );
-    //item->setData(k); // set attribute value as user role
-    item->setFlags( Qt::ItemIsSelectable | Qt::ItemIsEnabled );
-
-    QStandardItem* item2 = new QStandardItem( rangeStr );
-    item2->setEditable( 0 );
-
-    QList list;
-    list << item << item2 << new QStandardItem( range.label() );
-
-    m->appendRow( list );
-  }
-
-  // make sure that the "range" column has visible context
-  viewGraduated->resizeColumnToContents( 0 );
-}
-
-
 #if 0
 int QgsRendererV2PropertiesDialog::currentRangeRow()
 {
@@ -321,6 +560,21 @@ int QgsRendererV2PropertiesDialog::currentRangeRow()
 }
 #endif
 
+QList QgsGraduatedSymbolRendererV2Widget::selectedClasses()
+{
+  QList rows;
+  QModelIndexList selectedRows = viewGraduated->selectionModel()->selectedRows();
+
+  foreach ( QModelIndex r, selectedRows )
+  {
+    if ( r.isValid() )
+    {
+      rows.append( r.row() );
+    }
+  }
+  return rows;
+}
+
 void QgsGraduatedSymbolRendererV2Widget::rangesDoubleClicked( const QModelIndex & idx )
 {
   if ( idx.isValid() && idx.column() == 0 )
@@ -351,9 +605,9 @@ void QgsGraduatedSymbolRendererV2Widget::changeSelectedSymbols()
       return;
     }
 
-    foreach( QModelIndex idx, selectedIndexes )
+    foreach ( QModelIndex idx, selectedIndexes )
     {
-      if( idx.isValid() )
+      if ( idx.isValid() )
       {
         int rangeIdx = idx.row();
         QgsSymbolV2* newRangeSymbol = newSymbol->clone();
@@ -377,8 +631,6 @@ void QgsGraduatedSymbolRendererV2Widget::changeRangeSymbol( int rangeIdx )
   }
 
   mRenderer->updateRangeSymbol( rangeIdx, newSymbol );
-
-  populateRanges();
 }
 
 void QgsGraduatedSymbolRendererV2Widget::changeRange( int rangeIdx )
@@ -395,22 +647,23 @@ void QgsGraduatedSymbolRendererV2Widget::changeRange( int rangeIdx )
     double upperValue = dialog.upperValue().toDouble();
     mRenderer->updateRangeUpperValue( rangeIdx, upperValue );
     mRenderer->updateRangeLowerValue( rangeIdx, lowerValue );
-    populateRanges();
-
   }
 }
 
 void QgsGraduatedSymbolRendererV2Widget::addClass()
 {
   mRenderer->addClass( mGraduatedSymbol );
-  populateRanges();
 }
 
-void QgsGraduatedSymbolRendererV2Widget::deleteCurrentClass()
+void QgsGraduatedSymbolRendererV2Widget::deleteClasses()
 {
+  QList classIndexes = selectedClasses();
+  mModel->removeRows( classIndexes );
+}
 
-  mRenderer->deleteClass( mRowSelected );
-  populateRanges();
+void QgsGraduatedSymbolRendererV2Widget::deleteAllClasses()
+{
+  mModel->removeAllRows();
 }
 
 void QgsGraduatedSymbolRendererV2Widget::changeCurrentValue( QStandardItem * item )
@@ -450,22 +703,18 @@ QList QgsGraduatedSymbolRendererV2Widget::selectedSymbols()
     QModelIndexList::const_iterator indexIt = selectedIndexes.constBegin();
     for ( ; indexIt != selectedIndexes.constEnd(); ++indexIt )
     {
-      QStandardItem* currentItem = qobject_cast( m->model() )->itemFromIndex( *indexIt );
-      if ( currentItem )
+      QStringList list = m->model()->data( *indexIt ).toString().split( " " );
+      if ( list.size() < 3 )
+      {
+        continue;
+      }
+
+      double lowerBound = list.at( 0 ).toDouble();
+      double upperBound = list.at( 2 ).toDouble();
+      QgsSymbolV2* s = findSymbolForRange( lowerBound, upperBound, ranges );
+      if ( s )
       {
-        QStringList list = currentItem->data( 0 ).toString().split( " " );
-        if ( list.size() < 3 )
-        {
-          continue;
-        }
-
-        double lowerBound = list.at( 0 ).toDouble();
-        double upperBound = list.at( 2 ).toDouble();
-        QgsSymbolV2* s = findSymbolForRange( lowerBound, upperBound, ranges );
-        if ( s )
-        {
-          selectedSymbols.append( s );
-        }
+        selectedSymbols.append( s );
       }
     }
   }
@@ -487,10 +736,14 @@ QgsSymbolV2* QgsGraduatedSymbolRendererV2Widget::findSymbolForRange( double lowe
 
 void QgsGraduatedSymbolRendererV2Widget::refreshSymbolView()
 {
-  populateRanges();
 }
 
 void QgsGraduatedSymbolRendererV2Widget::showSymbolLevels()
 {
   showSymbolLevelsDialog( mRenderer );
 }
+
+void QgsGraduatedSymbolRendererV2Widget::rowsMoved()
+{
+  viewGraduated->selectionModel()->clear();
+}
diff --git a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
index 596130e83099..387e222fca55 100644
--- a/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
+++ b/src/gui/symbology-ng/qgsgraduatedsymbolrendererv2widget.h
@@ -19,9 +19,52 @@
 #include "qgsgraduatedsymbolrendererv2.h"
 #include "qgsrendererv2widget.h"
 #include 
+#include 
 
 #include "ui_qgsgraduatedsymbolrendererv2widget.h"
 
+class GUI_EXPORT QgsGraduatedSymbolRendererV2Model : public QAbstractItemModel
+{
+    Q_OBJECT
+  public:
+    QgsGraduatedSymbolRendererV2Model( QObject * parent = 0 );
+    Qt::ItemFlags flags( const QModelIndex & index ) const;
+    Qt::DropActions supportedDropActions() const;
+    QVariant data( const QModelIndex &index, int role ) const;
+    bool setData( const QModelIndex & index, const QVariant & value, int role );
+    QVariant headerData( int section, Qt::Orientation orientation, int role ) const;
+    int rowCount( const QModelIndex &parent = QModelIndex() ) const;
+    int columnCount( const QModelIndex & = QModelIndex() ) const;
+    QModelIndex index( int row, int column, const QModelIndex &parent = QModelIndex() ) const;
+    QModelIndex parent( const QModelIndex &index ) const;
+    QStringList mimeTypes() const;
+    QMimeData *mimeData( const QModelIndexList &indexes ) const;
+    bool dropMimeData( const QMimeData *data, Qt::DropAction action, int row, int column, const QModelIndex &parent );
+
+    void setRenderer( QgsGraduatedSymbolRendererV2* renderer );
+
+    void addClass( QgsSymbolV2* symbol );
+    void removeRows( QList rows );
+    void removeAllRows( );
+    void sort( int column, Qt::SortOrder order = Qt::AscendingOrder );
+
+  signals:
+    void rowsMoved();
+
+  private:
+    QgsGraduatedSymbolRendererV2* mRenderer;
+    QString mMimeFormat;
+};
+
+// View style which shows drop indicator line between items
+class QgsGraduatedSymbolRendererV2ViewStyle: public QProxyStyle
+{
+  public:
+    QgsGraduatedSymbolRendererV2ViewStyle( QStyle* style = 0 );
+
+    void drawPrimitive( PrimitiveElement element, const QStyleOption * option, QPainter * painter, const QWidget * widget = 0 ) const;
+};
+
 class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget, private Ui::QgsGraduatedSymbolRendererV2Widget
 {
     Q_OBJECT
@@ -45,8 +88,10 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget
 
     /**Adds a class manually to the classification*/
     void addClass();
-    /**Removes a class from the classification*/
-    void deleteCurrentClass();
+    /**Removes currently selected classes */
+    void deleteClasses();
+    /**Removes all classes from the classification*/
+    void deleteAllClasses();
 
     void rotationFieldChanged( QString fldName );
     void sizeScaleFieldChanged( QString fldName );
@@ -54,17 +99,19 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget
 
     void showSymbolLevels();
 
+    void rowsMoved();
+
   protected:
     void updateUiFromRenderer();
 
     void updateGraduatedSymbolIcon();
 
+    //! return a list of indexes for the classes under selection
+    QList selectedClasses();
+
     //! populate column combos in categorized and graduated page
     void populateColumns();
 
-    //! populate ranges of graduated symbol renderer
-    void populateRanges();
-
     void changeRangeSymbol( int rangeIdx );
     void changeRange( int rangeIdx );
 
@@ -84,6 +131,8 @@ class GUI_EXPORT QgsGraduatedSymbolRendererV2Widget : public QgsRendererV2Widget
 
     QgsRendererV2DataDefinedMenus* mDataDefinedMenus;
 
+    QgsGraduatedSymbolRendererV2Model* mModel;
+
 };
 
 
diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
index f2dec61d9207..625f0c1781c2 100644
--- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
+++ b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.cpp
@@ -26,6 +26,7 @@
 #include "qstring.h"
 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -86,6 +87,7 @@ QgsRuleBasedRendererV2Widget::QgsRuleBasedRendererV2Widget( QgsVectorLayer* laye
   connect( btnAddRule, SIGNAL( clicked() ), this, SLOT( addRule() ) );
   connect( btnEditRule, SIGNAL( clicked() ), this, SLOT( editRule() ) );
   connect( btnRemoveRule, SIGNAL( clicked() ), this, SLOT( removeRule() ) );
+  connect( btnCountFeatures, SIGNAL( clicked() ), this, SLOT( countFeatures() ) );
 
   connect( btnRenderingOrder, SIGNAL( clicked() ), this, SLOT( setRenderingOrder() ) );
 
@@ -129,6 +131,7 @@ void QgsRuleBasedRendererV2Widget::addRule()
       int rows = mModel->rowCount();
       mModel->insertRule( QModelIndex(), rows, newrule );
     }
+    mModel->clearFeatureCounts();
   }
   else
   {
@@ -161,6 +164,7 @@ void QgsRuleBasedRendererV2Widget::editRule( const QModelIndex& index )
   {
     // model should know about the change and emit dataChanged signal for the view
     mModel->updateRule( index.parent(), index.row() );
+    mModel->clearFeatureCounts();
   }
 }
 
@@ -176,6 +180,7 @@ void QgsRuleBasedRendererV2Widget::removeRule()
   }
   // make sure that the selection is gone
   viewRules->selectionModel()->clear();
+  mModel->clearFeatureCounts();
 }
 
 void QgsRuleBasedRendererV2Widget::currentRuleChanged( const QModelIndex& current, const QModelIndex& previous )
@@ -378,7 +383,7 @@ void QgsRuleBasedRendererV2Widget::saveSectionWidth( int section, int oldSize, i
 {
   Q_UNUSED( oldSize );
   // skip last section, as it stretches
-  if ( section == 3 )
+  if ( section == 5 )
     return;
   QSettings settings;
   QString path = "/Windows/RuleBasedTree/sectionWidth/" + QString::number( section );
@@ -390,11 +395,86 @@ void QgsRuleBasedRendererV2Widget::restoreSectionWidths()
   QSettings settings;
   QString path = "/Windows/RuleBasedTree/sectionWidth/";
   QHeaderView* head = viewRules->header();
-  head->resizeSection( 0, settings.value( path + QString::number( 0 ), 200 ).toInt() );
-  head->resizeSection( 1, settings.value( path + QString::number( 1 ), 200 ).toInt() );
-  head->resizeSection( 2, settings.value( path + QString::number( 2 ), 100 ).toInt() );
+  head->resizeSection( 0, settings.value( path + QString::number( 0 ), 150 ).toInt() );
+  head->resizeSection( 1, settings.value( path + QString::number( 1 ), 150 ).toInt() );
+  head->resizeSection( 2, settings.value( path + QString::number( 2 ), 80 ).toInt() );
+  head->resizeSection( 3, settings.value( path + QString::number( 3 ), 80 ).toInt() );
+  head->resizeSection( 4, settings.value( path + QString::number( 4 ), 50 ).toInt() );
+  head->resizeSection( 5, settings.value( path + QString::number( 5 ), 50 ).toInt() );
 }
 
+void QgsRuleBasedRendererV2Widget::countFeatures()
+{
+  if ( !mLayer || !mRenderer || !mRenderer->rootRule() )
+  {
+    return;
+  }
+  QMap countMap;
+
+  QgsRuleBasedRendererV2::RuleList ruleList = mRenderer->rootRule()->descendants();
+  // insert all so that we have counts 0
+  foreach ( QgsRuleBasedRendererV2::Rule* rule, ruleList )
+  {
+    countMap[rule].count = 0;
+    countMap[rule].duplicateCount = 0;
+  }
+
+  mLayer->select( mLayer->pendingAllAttributesList(), QgsRectangle(), false, false );
+
+  QgsRenderContext renderContext;
+  renderContext.setRendererScale( 0 ); // ignore scale
+  mRenderer->startRender( renderContext, mLayer );
+
+  int nFeatures = mLayer->pendingFeatureCount();
+  QProgressDialog p( tr( "Calculating feature count." ), tr( "Abort" ), 0, nFeatures );
+  p.setWindowModality( Qt::WindowModal );
+  int featuresCounted = 0;
+
+  QgsFeature f;
+  while ( mLayer->nextFeature( f ) )
+  {
+    QgsRuleBasedRendererV2::RuleList featureRuleList = mRenderer->rootRule()->rulesForFeature( f );
+
+    foreach ( QgsRuleBasedRendererV2::Rule* rule, featureRuleList )
+    {
+      countMap[rule].count++;
+      if ( featureRuleList.size() > 1 )
+      {
+        countMap[rule].duplicateCount++;
+      }
+      foreach ( QgsRuleBasedRendererV2::Rule* duplicateRule, featureRuleList )
+      {
+        if ( duplicateRule == rule ) continue;
+        countMap[rule].duplicateCountMap[duplicateRule] += 1;
+      }
+    }
+    ++featuresCounted;
+    if ( featuresCounted % 50 == 0 )
+    {
+      if ( featuresCounted > nFeatures ) //sometimes the feature count is not correct
+      {
+        p.setMaximum( 0 );
+      }
+      p.setValue( featuresCounted );
+      if ( p.wasCanceled() )
+      {
+        return;
+      }
+    }
+  }
+  p.setValue( nFeatures );
+
+  mRenderer->stopRender( renderContext );
+
+#ifdef QGISDEBUG
+  foreach ( QgsRuleBasedRendererV2::Rule *rule, countMap.keys() )
+  {
+    QgsDebugMsg( QString( "rule: %1 count %2" ).arg( rule->label() ).arg( countMap[rule].count ) );
+  }
+#endif
+
+  mModel->setFeatureCounts( countMap );
+}
 
 ///////////
 
@@ -556,6 +636,39 @@ QVariant QgsRuleBasedRendererV2Model::data( const QModelIndex &index, int role )
       case 1: return rule->filterExpression().isEmpty() ? tr( "(no filter)" ) : rule->filterExpression();
       case 2: return rule->dependsOnScale() ? _formatScale( rule->scaleMinDenom() ) : QVariant();
       case 3: return rule->dependsOnScale() ? _formatScale( rule->scaleMaxDenom() ) : QVariant();
+      case 4:
+        if ( mFeatureCountMap.count( rule ) == 1 )
+        {
+          return QVariant( mFeatureCountMap[rule].count );
+        }
+        return QVariant();
+      case 5:
+        if ( mFeatureCountMap.count( rule ) == 1 )
+        {
+          if ( role == Qt::DisplayRole )
+          {
+            return QVariant( mFeatureCountMap[rule].duplicateCount );
+          }
+          else // tooltip - detailed info about duplicates
+          {
+            if ( mFeatureCountMap[rule].duplicateCount > 0 )
+            {
+              QString tip = "
          ";
+              foreach ( QgsRuleBasedRendererV2::Rule* duplicateRule, mFeatureCountMap[rule].duplicateCountMap.keys() )
+              {
+                QString label = duplicateRule->label().replace( "&", "&" ).replace( ">", ">" ).replace( "<", "<" );
+                tip += tr( "
        • %1 features also in rule %2
          • " ).arg( mFeatureCountMap[rule].duplicateCountMap[duplicateRule] ).arg( label );
+              }
+              tip += "
        ";
+              return tip;
+            }
+            else
+            {
+              return 0;
+            }
+          }
+        }
+        return QVariant();
       default: return QVariant();
     }
   }
@@ -584,11 +697,22 @@ QVariant QgsRuleBasedRendererV2Model::data( const QModelIndex &index, int role )
 
 QVariant QgsRuleBasedRendererV2Model::headerData( int section, Qt::Orientation orientation, int role ) const
 {
-  if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 5 )
+  if ( orientation == Qt::Horizontal && role == Qt::DisplayRole && section >= 0 && section < 7 )
   {
-    QStringList lst; lst << tr( "Label" ) << tr( "Rule" ) << tr( "Min. scale" ) << tr( "Max.scale" );
+    QStringList lst; lst << tr( "Label" ) << tr( "Rule" ) << tr( "Min. scale" ) << tr( "Max.scale" ) << tr( "Count" ) << tr( "Duplicate count" );
     return lst[section];
   }
+  else if ( orientation == Qt::Horizontal && role == Qt::ToolTipRole )
+  {
+    if ( section == 4 ) // Count
+    {
+      return tr( "Number of features in this rule." );
+    }
+    else if ( section == 5 )  // Duplicate count
+    {
+      return tr( "Number of features in this rule which are also present in other rule(s)." );
+    }
+  }
 
   return QVariant();
 }
@@ -605,7 +729,7 @@ int QgsRuleBasedRendererV2Model::rowCount( const QModelIndex &parent ) const
 
 int QgsRuleBasedRendererV2Model::columnCount( const QModelIndex & ) const
 {
-  return 4;
+  return 6;
 }
 
 QModelIndex QgsRuleBasedRendererV2Model::index( int row, int column, const QModelIndex &parent ) const
@@ -813,6 +937,18 @@ void QgsRuleBasedRendererV2Model::updateRule( const QModelIndex& parent, int row
                     index( row, columnCount( parent ), parent ) );
 }
 
+void QgsRuleBasedRendererV2Model::updateRule( const QModelIndex& idx )
+{
+  emit dataChanged( index( 0, 0, idx ),
+                    index( rowCount( idx ) - 1, columnCount( idx ) - 1, idx ) );
+
+  for ( int i = 0; i < rowCount( idx ); i++ )
+  {
+    updateRule( index( i, 0, idx ) );
+  }
+}
+
+
 void QgsRuleBasedRendererV2Model::removeRule( const QModelIndex& index )
 {
   if ( !index.isValid() )
@@ -836,3 +972,15 @@ void QgsRuleBasedRendererV2Model::finishedAddingRules()
 {
   emit endInsertRows();
 }
+
+void QgsRuleBasedRendererV2Model::setFeatureCounts( QMap theCountMap )
+{
+  mFeatureCountMap = theCountMap;
+  updateRule( QModelIndex() );
+}
+
+void QgsRuleBasedRendererV2Model::clearFeatureCounts()
+{
+  mFeatureCountMap.clear();
+  updateRule( QModelIndex() );
+}
diff --git a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
index 86770a804c42..d9228c081ce7 100644
--- a/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
+++ b/src/gui/symbology-ng/qgsrulebasedrendererv2widget.h
@@ -25,6 +25,15 @@ class QMenu;
 
 #include 
 
+/* Features count fro rule */
+struct QgsRuleBasedRendererV2Count
+{
+  int count; // number of features
+  int duplicateCount; // number of features present also in other rule(s)
+  // map of feature counts in other rules
+  QMap duplicateCountMap;
+};
+
 /*
 Tree model for the rules:
 
@@ -65,13 +74,19 @@ class GUI_EXPORT QgsRuleBasedRendererV2Model : public QAbstractItemModel
 
     void insertRule( const QModelIndex& parent, int before, QgsRuleBasedRendererV2::Rule* newrule );
     void updateRule( const QModelIndex& parent, int row );
+    // update rule and all its descendants
+    void updateRule( const QModelIndex& index );
     void removeRule( const QModelIndex& index );
 
     void willAddRules( const QModelIndex& parent, int count ); // call beginInsertRows
     void finishedAddingRules(); // call endInsertRows
 
+    void setFeatureCounts( QMap theCountMap );
+    void clearFeatureCounts();
+
   protected:
     QgsRuleBasedRendererV2* mR;
+    QMap mFeatureCountMap;
 };
 
 
@@ -98,6 +113,8 @@ class GUI_EXPORT QgsRuleBasedRendererV2Widget : public QgsRendererV2Widget, priv
     void editRule();
     void editRule( const QModelIndex& index );
     void removeRule();
+    void countFeatures();
+    void clearFeatureCounts() { mModel->clearFeatureCounts(); }
 
     void refineRuleScales();
     void refineRuleCategories();
diff --git a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
index b3aca222c9ca..d02369be601f 100644
--- a/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
+++ b/src/gui/symbology-ng/qgsstylev2managerdialog.cpp
@@ -466,9 +466,17 @@ QString QgsStyleV2ManagerDialog::addColorRampStatic( QWidget* parent, QgsStyleV2
       delete cptCityRamp;
       return QString();
     }
-    ramp = cptCityRamp;
     // name = dlg.selectedName();
     name = QFileInfo( cptCityRamp->schemeName() ).baseName() + cptCityRamp->variantName();
+    if ( dlg.saveAsGradientRamp() )
+    {
+      ramp = cptCityRamp->cloneGradientRamp();
+      delete cptCityRamp;
+    }
+    else
+    {
+      ramp = cptCityRamp;
+    }
   }
   else
   {
@@ -632,6 +640,11 @@ bool QgsStyleV2ManagerDialog::editColorRamp()
       delete ramp;
       return false;
     }
+    if ( dlg.saveAsGradientRamp() )
+    {
+      ramp = cptCityRamp->cloneGradientRamp();
+      delete cptCityRamp;
+    }
   }
   else
   {
@@ -670,7 +683,7 @@ void QgsStyleV2ManagerDialog::removeItem()
 bool QgsStyleV2ManagerDialog::removeSymbol()
 {
   QModelIndexList indexes = listItems->selectionModel()->selectedIndexes();
-  foreach( QModelIndex index, indexes )
+  foreach ( QModelIndex index, indexes )
   {
     QString symbolName = index.data().toString();
     // delete from style and update list
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
index 85b85963c495..e91caed3ddf3 100644
--- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
+++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp
@@ -24,6 +24,7 @@
 #include "qgsdashspacedialog.h"
 #include "qgssymbolv2selectordialog.h"
 #include "qgssvgcache.h"
+#include "qgssymbollayerv2utils.h"
 
 #include "qgsstylev2.h" //for symbol selector dialog
 
@@ -33,6 +34,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 #include 
@@ -526,13 +528,13 @@ class QgsSvgListModel : public QAbstractListModel
   public:
     QgsSvgListModel( QObject* parent ) : QAbstractListModel( parent )
     {
-      mSvgFiles = QgsSvgMarkerSymbolLayerV2::listSvgFiles();
+      mSvgFiles = QgsSymbolLayerV2Utils::listSvgFiles();
     }
 
     // Constructor to create model for icons in a specific path
     QgsSvgListModel( QObject* parent, QString path ) : QAbstractListModel( parent )
     {
-      mSvgFiles = QgsSvgMarkerSymbolLayerV2::listSvgFilesAt( path );
+      mSvgFiles = QgsSymbolLayerV2Utils::listSvgFilesAt( path );
     }
 
     int rowCount( const QModelIndex & parent = QModelIndex() ) const
@@ -683,12 +685,16 @@ void QgsSvgMarkerSymbolLayerV2Widget::setGuiForSvg( const QgsSvgMarkerSymbolLaye
   mBorderWidthSpinBox->blockSignals( true );
   mBorderWidthSpinBox->setValue( layer->outlineWidth() );
   mBorderWidthSpinBox->blockSignals( false );
-
 }
 
 
 void QgsSvgMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
 {
+  if ( !layer )
+  {
+    return;
+  }
+
   if ( layer->layerType() != "SvgMarker" )
     return;
 
@@ -711,8 +717,6 @@ void QgsSvgMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
     }
   }
 
-
-
   spinSize->setValue( mLayer->size() );
   spinAngle->setValue( mLayer->angle() );
 
@@ -725,7 +729,6 @@ void QgsSvgMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer )
   spinOffsetY->blockSignals( false );
 
   setGuiForSvg( mLayer );
-
 }
 
 QgsSymbolLayerV2* QgsSvgMarkerSymbolLayerV2Widget::symbolLayer()
@@ -790,6 +793,25 @@ void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_textEdited( const QString
   emit changed();
 }
 
+void QgsSvgMarkerSymbolLayerV2Widget::on_mFileLineEdit_editingFinished()
+{
+  if ( !QFileInfo( mFileLineEdit->text() ).exists() )
+  {
+    QUrl url( mFileLineEdit->text() );
+    if ( !url.isValid() )
+    {
+      return;
+    }
+  }
+
+  QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
+  mLayer->setPath( mFileLineEdit->text() );
+  QApplication::restoreOverrideCursor();
+
+  setGuiForSvg( mLayer );
+  emit changed();
+}
+
 void QgsSvgMarkerSymbolLayerV2Widget::on_mChangeColorButton_clicked()
 {
   if ( !mLayer )
@@ -945,7 +967,7 @@ void QgsSVGFillSymbolLayerWidget::on_mTextureWidthSpinBox_valueChanged( double d
   }
 }
 
-void QgsSVGFillSymbolLayerWidget::on_mSVGLineEdit_textChanged( const QString & text )
+void QgsSVGFillSymbolLayerWidget::on_mSVGLineEdit_textEdited( const QString & text )
 {
   if ( !mLayer )
   {
@@ -958,14 +980,43 @@ void QgsSVGFillSymbolLayerWidget::on_mSVGLineEdit_textChanged( const QString & t
     return;
   }
   mLayer->setSvgFilePath( text );
+  updateParamGui();
   emit changed();
+}
+
+void QgsSVGFillSymbolLayerWidget::on_mSVGLineEdit_editingFinished()
+{
+  if ( !mLayer )
+  {
+    return;
+  }
+
+  QFileInfo fi( mSVGLineEdit->text() );
+  if ( !fi.exists() )
+  {
+    QUrl url( mSVGLineEdit->text() );
+    if ( !url.isValid() )
+    {
+      return;
+    }
+  }
+
+  QApplication::setOverrideCursor( QCursor( Qt::WaitCursor ) );
+  mLayer->setSvgFilePath( mSVGLineEdit->text() );
+  QApplication::restoreOverrideCursor();
+
   updateParamGui();
+  emit changed();
 }
 
 void QgsSVGFillSymbolLayerWidget::setFile( const QModelIndex& item )
 {
-  mSVGLineEdit->setText( item.data( Qt::UserRole ).toString() );
+  QString file = item.data( Qt::UserRole ).toString();
+  mLayer->setSvgFilePath( file );
+  mSVGLineEdit->setText( file );
+
   updateParamGui();
+  emit changed();
 }
 
 void QgsSVGFillSymbolLayerWidget::insertIcons()
@@ -1000,8 +1051,8 @@ void QgsSVGFillSymbolLayerWidget::on_mRotationSpinBox_valueChanged( double d )
   if ( mLayer )
   {
     mLayer->setAngle( d );
+    emit changed();
   }
-  emit changed();
 }
 
 void QgsSVGFillSymbolLayerWidget::updateParamGui()
diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.h b/src/gui/symbology-ng/qgssymbollayerv2widget.h
index c72b0723c529..ed45ca51ae51 100644
--- a/src/gui/symbology-ng/qgssymbollayerv2widget.h
+++ b/src/gui/symbology-ng/qgssymbollayerv2widget.h
@@ -198,6 +198,7 @@ class GUI_EXPORT QgsSvgMarkerSymbolLayerV2Widget : public QgsSymbolLayerV2Widget
     void setOffset();
     void on_mFileToolButton_clicked();
     void on_mFileLineEdit_textEdited( const QString& text );
+    void on_mFileLineEdit_editingFinished();
     void on_mChangeColorButton_clicked();
     void on_mChangeBorderColorButton_clicked();
     void on_mBorderWidthSpinBox_valueChanged( double d );
@@ -266,7 +267,8 @@ class GUI_EXPORT QgsSVGFillSymbolLayerWidget : public QgsSymbolLayerV2Widget, pr
   private slots:
     void on_mBrowseToolButton_clicked();
     void on_mTextureWidthSpinBox_valueChanged( double d );
-    void on_mSVGLineEdit_textChanged( const QString & text );
+    void on_mSVGLineEdit_textEdited( const QString & text );
+    void on_mSVGLineEdit_editingFinished();
     void setFile( const QModelIndex& item );
     void populateIcons( const QModelIndex& item );
     void on_mRotationSpinBox_valueChanged( double d );
diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
index 89112dcb2101..f02b7401c796 100644
--- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
+++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.cpp
@@ -16,66 +16,188 @@
 #include "qgsvectorgradientcolorrampv2dialog.h"
 
 #include "qgsvectorcolorrampv2.h"
+#include "qgsdialog.h"
+#include "qgscptcityarchive.h"
 
 #include 
 #include 
 #include 
+#include 
+#include 
 
 QgsVectorGradientColorRampV2Dialog::QgsVectorGradientColorRampV2Dialog( QgsVectorGradientColorRampV2* ramp, QWidget* parent )
     : QDialog( parent ), mRamp( ramp )
 {
-
   setupUi( this );
 
   connect( btnColor1, SIGNAL( clicked() ), this, SLOT( setColor1() ) );
   connect( btnColor2, SIGNAL( clicked() ), this, SLOT( setColor2() ) );
 
   // handle stops
-  QgsVectorGradientColorRampV2::StopsMap stops = ramp->stops();
+  updateStops();
+  connect( groupStops, SIGNAL( toggled( bool ) ), this, SLOT( toggledStops( bool ) ) );
+  connect( btnAddStop, SIGNAL( clicked() ), this, SLOT( addStop() ) );
+  connect( btnRemoveStop, SIGNAL( clicked() ), this, SLOT( removeStop() ) );
+  connect( treeStops, SIGNAL( itemDoubleClicked( QTreeWidgetItem*, int ) ), this, SLOT( stopDoubleClicked( QTreeWidgetItem*, int ) ) );
+
+  // fill type combobox
+  cboType->blockSignals( true );
+  cboType->addItem( tr( "Discrete" ) );
+  cboType->addItem( tr( "Continous" ) );
+  if ( mRamp->isDiscrete() )
+    cboType->setCurrentIndex( 0 );
+  else
+    cboType->setCurrentIndex( 1 );
+  cboType->blockSignals( false );
+
+  // information button if needed
+  // QPushButton* button = buttonBox->addButton( tr( "Information" ), QDialogButtonBox::ActionRole );
+  if ( mRamp->info().isEmpty() )
+    btnInformation->setEnabled( false );
+  // else
+  //   connect( button, SIGNAL( pressed() ), this, SLOT( showInformation() ) );
+
+  updatePreview();
+}
+
+void QgsVectorGradientColorRampV2Dialog::on_cboType_currentIndexChanged( int index )
+{
+  if (( index == 0 && mRamp->isDiscrete() ) ||
+      ( index == 1 && !mRamp->isDiscrete() ) )
+    return;
+  mRamp->convertToDiscrete( index == 0 );
+  updateStops();
+  updatePreview();
+}
+
+void QgsVectorGradientColorRampV2Dialog::on_btnInformation_pressed()
+{
+  if ( mRamp->info().isEmpty() )
+    return;
+
+  QgsDialog *dlg = new QgsDialog( this );
+  QLabel *label = 0;
+
+  // information table
+  QTableWidget *tableInfo = new QTableWidget( dlg );
+  tableInfo->verticalHeader()->hide();
+  tableInfo->horizontalHeader()->hide();
+  tableInfo->setRowCount( mRamp->info().count() );
+  tableInfo->setColumnCount( 2 );
+  int i = 0;
+  for ( QgsStringMap::const_iterator it = mRamp->info().constBegin();
+        it != mRamp->info().constEnd(); ++it )
+  {
+    if ( it.key().startsWith( "cpt-city" ) )
+      continue;
+    tableInfo->setItem( i, 0, new QTableWidgetItem( it.key() ) );
+    tableInfo->setItem( i, 1, new QTableWidgetItem( it.value() ) );
+    tableInfo->resizeRowToContents( i );
+    i++;
+  }
+  tableInfo->resizeColumnToContents( 0 );
+  tableInfo->horizontalHeader()->setStretchLastSection( true );
+  tableInfo->setRowCount( i );
+  tableInfo->setFixedHeight( tableInfo->rowHeight( 0 ) * i + 5 );
+  dlg->layout()->addWidget( tableInfo );
+  dlg->resize( 600, 250 );
+
+  dlg->layout()->addSpacing( 5 );
+
+  // gradient file
+  QString gradientFile = mRamp->info().value( "cpt-city-gradient" );
+  if ( ! gradientFile.isNull() )
+  {
+    QString fileName = gradientFile;
+    fileName.replace( "", QgsCptCityArchive::defaultBaseDir() );
+    if ( ! QFile::exists( fileName ) )
+    {
+      fileName = gradientFile;
+      fileName.replace( "", "http://soliton.vm.bytemark.co.uk/pub/cpt-city" );
+    }
+    label = new QLabel( tr( "Gradient file : %1" ).arg( fileName ), dlg );
+    label->setTextInteractionFlags( Qt::TextBrowserInteraction );
+    dlg->layout()->addSpacing( 5 );
+    dlg->layout()->addWidget( label );
+  }
+
+  // license file
+  QString licenseFile = mRamp->info().value( "cpt-city-license" );
+  if ( !licenseFile.isNull() )
+  {
+    QString fileName = licenseFile;
+    fileName.replace( "", QgsCptCityArchive::defaultBaseDir() );
+    if ( ! QFile::exists( fileName ) )
+    {
+      fileName = licenseFile;
+      fileName.replace( "", "http://soliton.vm.bytemark.co.uk/pub/cpt-city" );
+    }
+    label = new QLabel( tr( "License file : %1" ).arg( fileName ), dlg );
+    label->setTextInteractionFlags( Qt::TextBrowserInteraction );
+    dlg->layout()->addSpacing( 5 );
+    dlg->layout()->addWidget( label );
+    if ( QFile::exists( fileName ) )
+    {
+      QTextEdit *textEdit = new QTextEdit( dlg );
+      textEdit->setReadOnly( true );
+      QFile file( fileName );
+      if ( file.open( QIODevice::ReadOnly | QIODevice::Text ) )
+      {
+        textEdit->setText( file.readAll() );
+        file.close();
+        dlg->layout()->addSpacing( 5 );
+        dlg->layout()->addWidget( textEdit );
+        dlg->resize( 600, 500 );
+      }
+    }
+  }
+
+  dlg->show(); //non modal
+}
+
+void QgsVectorGradientColorRampV2Dialog::updateStops()
+{
+  QgsGradientStopsList stops = mRamp->stops();
   groupStops->setChecked( !stops.isEmpty() );
 
-  QgsVectorGradientColorRampV2::StopsMap::iterator i;
   QList items;
-  for ( i = stops.begin(); i != stops.end(); ++i )
+  for ( QgsGradientStopsList::iterator it = stops.begin();
+        it != stops.end(); ++it )
   {
+    double val = it->offset * 100.0;
     QStringList lst;
-    lst << "." << QString::number( i.key()*100, 'f', 0 );
+    lst << "." << QString(( val < 10 ) ? '0' + QString::number( val ) : QString::number( val ) );
     QTreeWidgetItem* item = new QTreeWidgetItem( lst );
 
-    setStopColor( item, i.value() );
-    item->setData( 0, StopOffsetRole, i.key() );
+    setStopColor( item, it->color );
+    item->setData( 0, StopOffsetRole, it->offset );
 
     items.append( item );
   }
+  treeStops->clear();
   treeStops->insertTopLevelItems( 0, items );
   treeStops->resizeColumnToContents( 0 );
+  treeStops->setColumnWidth( 0, treeStops->columnWidth( 0 ) + 20 );
   treeStops->sortByColumn( 1, Qt::AscendingOrder );
   treeStops->setSortingEnabled( true );
-
-  connect( groupStops, SIGNAL( toggled( bool ) ), this, SLOT( toggledStops( bool ) ) );
-  connect( btnAddStop, SIGNAL( clicked() ), this, SLOT( addStop() ) );
-  connect( btnRemoveStop, SIGNAL( clicked() ), this, SLOT( removeStop() ) );
-  connect( treeStops, SIGNAL( itemDoubleClicked( QTreeWidgetItem*, int ) ), this, SLOT( stopDoubleClicked( QTreeWidgetItem*, int ) ) );
-
-  updatePreview();
 }
 
 void QgsVectorGradientColorRampV2Dialog::updatePreview()
 {
   // update ramp stops from the tree widget
-  QgsVectorGradientColorRampV2::StopsMap map;
+  QgsGradientStopsList stops;
   if ( groupStops->isChecked() )
   {
     int count = treeStops->topLevelItemCount();
     for ( int i = 0; i < count; i++ )
     {
       QTreeWidgetItem* item = treeStops->topLevelItem( i );
-      double key = item->data( 0, StopOffsetRole ).toDouble();
-      QColor c = item->data( 0, StopColorRole ).value();
-      map.insert( key, c );
+      double offset = item->data( 0, StopOffsetRole ).toDouble();
+      QColor color = item->data( 0, StopColorRole ).value();
+      stops.append( QgsGradientStop( offset, color ) );
     }
   }
-  mRamp->setStops( map );
+  mRamp->setStops( stops );
 
   // generate the preview
   QSize size( 300, 40 );
@@ -160,17 +282,18 @@ void QgsVectorGradientColorRampV2Dialog::stopDoubleClicked( QTreeWidgetItem* ite
   {
     bool ok;
     double key = item->data( 0, StopOffsetRole ).toDouble();
-    int val = ( int )( key * 100 );
+    // allow for floating-point values
+    double val = key * 100;
 #if QT_VERSION >= 0x40500
-    val = QInputDialog::getInt( this, tr( "Offset of the stop" ),
-                                tr( "Please enter offset in percents (%) of the new stop" ),
-                                val, 0, 100, 1, &ok );
+    val = QInputDialog::getDouble( this, tr( "Offset of the stop" ),
+                                   tr( "Please enter offset in percents (%) of the new stop" ),
+                                   val, 0, 100, 2, &ok );
 #else
     QString res = QInputDialog::getText( this, tr( "Offset of the stop" ),
                                          tr( "Please enter offset in percents (%) of the new stop" ),
                                          QLineEdit::Normal, QString::number( val ), &ok );
     if ( ok )
-      val = res.toInt( &ok );
+      val = res.toDouble( &ok );
     if ( ok )
       ok = val >= 0 && val <= 100;
 #endif
@@ -178,8 +301,7 @@ void QgsVectorGradientColorRampV2Dialog::stopDoubleClicked( QTreeWidgetItem* ite
       return;
 
     double newkey = val / 100.0;
-    item->setText( 1, QString::number( val ) );
-
+    item->setText( 1, ( val < 10 ) ? '0' + QString::number( val ) : QString::number( val ) );
     item->setData( 0, StopOffsetRole, newkey );
 
     updatePreview();
@@ -203,17 +325,17 @@ void QgsVectorGradientColorRampV2Dialog::addStop()
     return;
 
   bool ok;
-  int val = 50;
+  double val = 50.0;
 #if QT_VERSION >= 0x40500
-  val = QInputDialog::getInt( this, tr( "Offset of the stop" ),
-                              tr( "Please enter offset in percents (%) of the new stop" ),
-                              val, 0, 100, 1, &ok );
+  val = QInputDialog::getDouble( this, tr( "Offset of the stop" ),
+                                 tr( "Please enter offset in percents (%) of the new stop" ),
+                                 val, 0, 100, 2, &ok );
 #else
   QString res = QInputDialog::getText( this, tr( "Offset of the stop" ),
                                        tr( "Please enter offset in percents (%) of the new stop" ),
                                        QLineEdit::Normal, QString::number( val ), &ok );
   if ( ok )
-    val = res.toInt( &ok );
+    val = res.toDouble( &ok );
   if ( ok )
     ok = val >= 0 && val <= 100;
 #endif
@@ -222,7 +344,8 @@ void QgsVectorGradientColorRampV2Dialog::addStop()
 
   double key = val / 100.0;
   QStringList lst;
-  lst << "." << QString::number( val, 'f', 0 );
+  lst << "." << QString(( val < 10 ) ? '0' + QString::number( val ) : QString::number( val ) );
+
   QTreeWidgetItem* item = new QTreeWidgetItem( lst );
 
   setStopColor( item, color );
@@ -231,6 +354,7 @@ void QgsVectorGradientColorRampV2Dialog::addStop()
   treeStops->addTopLevelItem( item );
 
   treeStops->resizeColumnToContents( 0 );
+  treeStops->setColumnWidth( 0, treeStops->columnWidth( 0 ) + 20 );
 
   updatePreview();
 }
diff --git a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h
index ee11452c30bf..c1bd28aa030f 100644
--- a/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h
+++ b/src/gui/symbology-ng/qgsvectorgradientcolorrampv2dialog.h
@@ -39,8 +39,13 @@ class GUI_EXPORT QgsVectorGradientColorRampV2Dialog : public QDialog, private Ui
 
     void stopDoubleClicked( QTreeWidgetItem* item, int column );
 
+  protected slots:
+    void on_cboType_currentIndexChanged( int index );
+    void on_btnInformation_pressed();
+
   protected:
 
+    void updateStops();
     void updatePreview();
     void setStopColor( QTreeWidgetItem* item, QColor color );
 
diff --git a/src/mapserver/CMakeLists.txt b/src/mapserver/CMakeLists.txt
index fecaa014e0f8..604b83f64616 100644
--- a/src/mapserver/CMakeLists.txt
+++ b/src/mapserver/CMakeLists.txt
@@ -34,6 +34,7 @@ SET ( qgis_mapserv_SRCS
   qgsbetweenfilter.cpp
   qgscomparisonfilter.cpp
   qgslogicalfilter.cpp
+  qgsspatialfilter.cpp
   qgsftptransaction.cpp
   qgsmslayerbuilder.cpp 
   qgshostedvdsbuilder.cpp
diff --git a/src/mapserver/qgis_map_serv.cpp b/src/mapserver/qgis_map_serv.cpp
index c0b5853d4aea..adc3f3090fb2 100644
--- a/src/mapserver/qgis_map_serv.cpp
+++ b/src/mapserver/qgis_map_serv.cpp
@@ -456,7 +456,7 @@ int main( int argc, char * argv[] )
           continue;
         }
         capabilitiesCache.insertCapabilitiesDocument( configFilePath, getProjectSettings ? "projectSettings" : version, &doc );
-        capabilitiesDocument = capabilitiesCache.searchCapabilitiesDocument( configFilePath, version );
+        capabilitiesDocument = capabilitiesCache.searchCapabilitiesDocument( configFilePath, getProjectSettings ? "projectSettings" : version );
       }
       else
       {
@@ -523,15 +523,7 @@ int main( int argc, char * argv[] )
         continue;
       }
 
-      //info format for GetFeatureInfo
-
-      //additionally support text/xml; format=sia2045
       QString infoFormat = parameterMap.value( "INFO_FORMAT" );
-      if ( infoFormat.compare( "text/xml", Qt::CaseInsensitive ) == 0 && adminConfigParser->featureInfoFormatSIA2045() )
-      {
-        infoFormat = "text/xml; format=sia2045";
-      }
-
       theRequestHandler->sendGetFeatureInfoResponse( featureInfoDoc, infoFormat );
       delete theRequestHandler;
       delete theServer;
diff --git a/src/mapserver/qgsconfigparser.cpp b/src/mapserver/qgsconfigparser.cpp
index 4e9d80d5e444..40d5f45d5540 100644
--- a/src/mapserver/qgsconfigparser.cpp
+++ b/src/mapserver/qgsconfigparser.cpp
@@ -69,6 +69,7 @@ void QgsConfigParser::setDefaultLegendSettings()
 {
   mLegendBoxSpace = 2;
   mLegendLayerSpace = 3;
+  mLegendLayerTitleSpace = 3;
   mLegendSymbolSpace = 2;
   mLegendIconLabelSpace = 2;
   mLegendSymbolWidth = 7;
diff --git a/src/mapserver/qgsconfigparser.h b/src/mapserver/qgsconfigparser.h
index 03e94653012b..2ba7acdecef9 100644
--- a/src/mapserver/qgsconfigparser.h
+++ b/src/mapserver/qgsconfigparser.h
@@ -46,6 +46,8 @@ class QgsConfigParser
     virtual void featureTypeList( QDomElement& parentElement, QDomDocument& doc ) const = 0;
 
     virtual void describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const = 0;
+    /**Returns one or possibly several maplayers for a given type name. If no layers/style are found, an empty list is returned*/
+    virtual QList mapLayerFromTypeName( const QString& tName, bool useCache = true ) const = 0;
 
     /**Returns one or possibly several maplayers for a given layer name and style. If there are several layers, the layers should be drawn in inverse list order.
        If no layers/style are found, an empty list is returned
@@ -88,6 +90,7 @@ class QgsConfigParser
 
     double legendBoxSpace() const { return mLegendBoxSpace; }
     double legendLayerSpace() const { return mLegendLayerSpace; }
+    double legendLayerTitleSpace() const { return mLegendLayerTitleSpace; }
     double legendSymbolSpace() const { return mLegendSymbolSpace; }
     double legendIconLabelSpace() const { return mLegendIconLabelSpace; }
     double legendSymbolWidth() const { return mLegendSymbolWidth; }
@@ -136,10 +139,18 @@ class QgsConfigParser
     virtual QString featureInfoDocumentElement( const QString& defaultValue ) const { return defaultValue; }
     /**Returns document element namespace in GetFeatureInfo response or empty string*/
     virtual QString featureInfoDocumentElementNS() const { return ""; }
+    /**Returns schema url for feature info xsd (or an empty string if there is no schema)*/
+    virtual QString featureInfoSchema() const { return ""; }
 
     /**Return feature info in format SIA2045?*/
     virtual bool featureInfoFormatSIA2045() const { return false; }
 
+    /**Possibility to draw specific items on a WMS image (e.g. annotation items from the QGIS project file)
+        @param dpi resolution of the output image
+        @param width width of output image
+        @param height height of output image*/
+    virtual void drawOverlays( QPainter* p, int dpi, int width, int height ) const { Q_UNUSED( p ); Q_UNUSED( dpi ); Q_UNUSED( width ); Q_UNUSED( height ); }
+
   protected:
     /**Parser to forward not resolved requests (e.g. SLD parser based on user request might have a fallback parser with admin configuration)*/
     QgsConfigParser* mFallbackParser;
@@ -172,6 +183,7 @@ class QgsConfigParser
     //various parameters used for GetLegendGraphics
     double mLegendBoxSpace;
     double mLegendLayerSpace;
+    double mLegendLayerTitleSpace;
     double mLegendSymbolSpace;
     double mLegendIconLabelSpace;
     double mLegendSymbolWidth;
diff --git a/src/mapserver/qgsfilter.cpp b/src/mapserver/qgsfilter.cpp
index 1afad5ff4826..c269ec1e9da5 100644
--- a/src/mapserver/qgsfilter.cpp
+++ b/src/mapserver/qgsfilter.cpp
@@ -19,6 +19,7 @@
 #include "qgsbetweenfilter.h"
 #include "qgscomparisonfilter.h"
 #include "qgslogicalfilter.h"
+#include "qgsspatialfilter.h"
 #include "qgsvectordataprovider.h"
 #include 
 #include 
@@ -56,7 +57,8 @@ QgsFilter* QgsFilter::createFilterFromXml( const QDomElement& filterElem, QgsVec
   }
 
   //Name of the element indicates the type of filter
-  QString filterName = filterElem.localName();
+  //using tagName and to upper for interoperability
+  QString filterName = filterElem.tagName().toUpper();
 
   if ( filterName == "AND" || filterName == "OR" || filterName == "NOT" )
   {
@@ -91,6 +93,119 @@ QgsFilter* QgsFilter::createFilterFromXml( const QDomElement& filterElem, QgsVec
     }
     delete subFilter1; delete subFilter2; return 0;
   }
+  // if the filter is spatial
+  if ( filterName == "BBOX" || filterName == "CONTAINS" || filterName == "CROSSES" || filterName == "DISJOINT" || filterName == "EQUALS" || filterName == "INTERSECTS" || filterName == "OVERLAPS" || filterName == "TOUCHES" || filterName == "WITHIN" )
+  {
+    QgsGeometry *geom = 0;
+
+    QDomNodeList bNodes = filterElem.elementsByTagName( "Box" );
+    if ( bNodes.size() > 0 )
+    {
+      QDomElement bElem = bNodes.at( 0 ).toElement().firstChild().toElement();
+      QString coordSeparator = ",";
+      QString tupelSeparator = " ";
+      if ( bElem.hasAttribute( "cs" ) )
+      {
+        coordSeparator = bElem.attribute( "cs" );
+      }
+      if ( bElem.hasAttribute( "ts" ) )
+      {
+        tupelSeparator = bElem.attribute( "ts" );
+      }
+
+      QString bString = bElem.text();
+      bool conversionSuccess;
+      double minx = bString.section( tupelSeparator, 0, 0 ).section( coordSeparator, 0, 0 ).toDouble( &conversionSuccess );
+      double miny = bString.section( tupelSeparator, 0, 0 ).section( coordSeparator, 1, 1 ).toDouble( &conversionSuccess );
+      double maxx = bString.section( tupelSeparator, 1, 1 ).section( coordSeparator, 0, 0 ).toDouble( &conversionSuccess );
+      double maxy = bString.section( tupelSeparator, 1, 1 ).section( coordSeparator, 1, 1 ).toDouble( &conversionSuccess );
+      QgsRectangle* rect = new QgsRectangle( minx, miny, maxx, maxy );
+      geom = QgsGeometry::fromRect( *rect );
+    }
+
+    if ( !geom )
+    {
+      QDomNodeList gNodes = filterElem.elementsByTagName( "Point" );
+      if ( gNodes.size() > 0 )
+      {
+        QDomElement gElem = gNodes.at( 0 ).toElement();
+        geom = QgsGeometry::fromGML2( gElem );
+      }
+    }
+
+    if ( !geom )
+    {
+      QDomNodeList gNodes = filterElem.elementsByTagName( "LineString" );
+      if ( gNodes.size() > 0 )
+      {
+        QDomElement gElem = gNodes.at( 0 ).toElement();
+        geom = QgsGeometry::fromGML2( gElem );
+      }
+    }
+
+    if ( !geom )
+    {
+      QDomNodeList gNodes = filterElem.elementsByTagName( "Polygon" );
+      if ( gNodes.size() > 0 )
+      {
+        QDomElement gElem = gNodes.at( 0 ).toElement();
+        geom = QgsGeometry::fromGML2( gElem );
+      }
+    }
+
+    if ( !geom )
+    {
+      QDomNodeList gNodes = filterElem.elementsByTagName( "MultiPoint" );
+      if ( gNodes.size() > 0 )
+      {
+        QDomElement gElem = gNodes.at( 0 ).toElement();
+        geom = QgsGeometry::fromGML2( gElem );
+      }
+    }
+
+    if ( !geom )
+    {
+      QDomNodeList gNodes = filterElem.elementsByTagName( "MultiLineString" );
+      if ( gNodes.size() > 0 )
+      {
+        QDomElement gElem = gNodes.at( 0 ).toElement();
+        geom = QgsGeometry::fromGML2( gElem );
+      }
+    }
+
+    if ( !geom )
+    {
+      QDomNodeList gNodes = filterElem.elementsByTagName( "MultiPolygon" );
+      if ( gNodes.size() > 0 )
+      {
+        QDomElement gElem = gNodes.at( 0 ).toElement();
+        geom = QgsGeometry::fromGML2( gElem );
+      }
+    }
+
+    if ( !geom )
+      return 0;
+
+    if ( filterName == "BBOX" )
+      return new QgsSpatialFilter( QgsSpatialFilter::BBOX, geom );
+    if ( filterName == "CONTAINS" )
+      return new QgsSpatialFilter( QgsSpatialFilter::CONTAINS, geom );
+    if ( filterName == "CROSSES" )
+      return new QgsSpatialFilter( QgsSpatialFilter::CROSSES, geom );
+    if ( filterName == "DISJOINT" )
+      return new QgsSpatialFilter( QgsSpatialFilter::DISJOINT, geom );
+    if ( filterName == "EQUALS" )
+      return new QgsSpatialFilter( QgsSpatialFilter::EQUALS, geom );
+    if ( filterName == "INTERSECTS" )
+      return new QgsSpatialFilter( QgsSpatialFilter::INTERSECTS, geom );
+    if ( filterName == "OVERLAPS" )
+      return new QgsSpatialFilter( QgsSpatialFilter::OVERLAPS, geom );
+    if ( filterName == "TOUCHES" )
+      return new QgsSpatialFilter( QgsSpatialFilter::TOUCHES, geom );
+    if ( filterName == "WITHIN" )
+      return new QgsSpatialFilter( QgsSpatialFilter::WITHIN, geom );
+    return 0;
+  }
 
   //assume it must be a comparison filter
 
@@ -153,33 +268,33 @@ QgsFilter* QgsFilter::createFilterFromXml( const QDomElement& filterElem, QgsVec
   //now create the filter
 
   //comparison filter?
-  if ( filterName == "PropertyIsEqualTo" )
+  if ( filterName == "PROPERTYISEQUALTO" )
   {
     return new QgsComparisonFilter( attributeIndex, QgsComparisonFilter::EQUAL, literalList.at( 0 ) );
   }
-  else if ( filterName == "PropertyIsNotEqualTo" )
+  else if ( filterName == "PROPERTYISNOTEQUALTO" )
   {
     return new QgsComparisonFilter( attributeIndex, QgsComparisonFilter::NOT_EQUAL, literalList.at( 0 ) );
   }
-  else if ( filterName == "PropertyIsLessThan" )
+  else if ( filterName == "PROPERTYISLESSTHAN" )
   {
     return new QgsComparisonFilter( attributeIndex, QgsComparisonFilter::LESSER, literalList.at( 0 ) );
   }
-  else if ( filterName == "PropertyIsGreaterThan" )
+  else if ( filterName == "PROPERTYISGREATERTHAN" )
   {
     return new QgsComparisonFilter( attributeIndex, QgsComparisonFilter::GREATER, literalList.at( 0 ) );
   }
-  else if ( filterName == "PropertyIsLessThanOrEqualTo" )
+  else if ( filterName == "PROPERTYISLESSTHANOREQUALTO" )
   {
     return new QgsComparisonFilter( attributeIndex, QgsComparisonFilter::LESSER_OR_EQUAL, literalList.at( 0 ) );
   }
-  else if ( filterName == "PropertyIsGreaterThanOrEqualTo" )
+  else if ( filterName == "PROPERTYISGREATERTHANOREQUALTO" )
   {
     return new QgsComparisonFilter( attributeIndex, QgsComparisonFilter::GREATER_OR_EQUAL, literalList.at( 0 ) );
   }
 
   //between filter?
-  else if ( filterName == "PropertyIsBetween" )
+  else if ( filterName == "PROPERTYISBETWEEN" )
   {
     return new QgsBetweenFilter( attributeIndex, literalList.at( 0 ), literalList.at( 1 ) );
   }
diff --git a/src/mapserver/qgshttprequesthandler.cpp b/src/mapserver/qgshttprequesthandler.cpp
index bf72b378d829..e45caf49e7c0 100644
--- a/src/mapserver/qgshttprequesthandler.cpp
+++ b/src/mapserver/qgshttprequesthandler.cpp
@@ -147,73 +147,6 @@ void QgsHttpRequestHandler::sendGetFeatureInfoResponse( const QDomDocument& info
   {
     ba = infoDoc.toByteArray();
   }
-  else if ( infoFormat == "text/xml; format=sia2045" )
-  {
-    QDomDocument outFeatureInfoDoc;
-    QDomElement infoDocElement = infoDoc.documentElement();
-    QDomElement outInfoDocElement = outFeatureInfoDoc.importNode( infoDocElement, false ).toElement();
-    outFeatureInfoDoc.appendChild( outInfoDocElement );
-
-    QString currentAttributeName;
-    QString currentAttributeValue;
-    QDomElement currentAttributeElem;
-    QString currentLayerName;
-    QDomElement currentLayerElem;
-    QDomNodeList layerNodeList = infoDocElement.elementsByTagName( "Layer" );
-    for ( int i = 0; i < layerNodeList.size(); ++i )
-    {
-      currentLayerElem = layerNodeList.at( i ).toElement();
-      currentLayerName = currentLayerElem.attribute( "name" );
-      QDomElement currentFeatureElem;
-
-      QDomNodeList featureList = currentLayerElem.elementsByTagName( "Feature" );
-      if ( featureList.size() < 1 )
-      {
-        //raster?
-        QDomNodeList attributeList = currentLayerElem.elementsByTagName( "Attribute" );
-        QDomElement rasterLayerElem;
-        if ( attributeList.size() > 0 )
-        {
-          rasterLayerElem = outFeatureInfoDoc.createElement( currentLayerName );
-        }
-        for ( int j = 0; j < attributeList.size(); ++j )
-        {
-          currentAttributeElem = attributeList.at( j ).toElement();
-          currentAttributeName = currentAttributeElem.attribute( "name" );
-          currentAttributeValue = currentAttributeElem.attribute( "value" );
-          QDomElement outAttributeElem = outFeatureInfoDoc.createElement( currentAttributeName );
-          QDomText outAttributeText = outFeatureInfoDoc.createTextNode( currentAttributeValue );
-          outAttributeElem.appendChild( outAttributeText );
-          rasterLayerElem.appendChild( outAttributeElem );
-        }
-        if ( attributeList.size() > 0 )
-        {
-          outInfoDocElement.appendChild( rasterLayerElem );
-        }
-      }
-      else //vector
-      {
-        for ( int j = 0; j < featureList.size(); ++j )
-        {
-          QDomElement outFeatureElem = outFeatureInfoDoc.createElement( currentLayerName );
-          currentFeatureElem = featureList.at( j ).toElement();
-          QDomNodeList attributeList = currentFeatureElem.elementsByTagName( "Attribute" );
-          for ( int k = 0; k < attributeList.size(); ++k )
-          {
-            currentAttributeElem = attributeList.at( k ).toElement();
-            currentAttributeName = currentAttributeElem.attribute( "name" );
-            currentAttributeValue = currentAttributeElem.attribute( "value" );
-            QDomElement outAttributeElem = outFeatureInfoDoc.createElement( currentAttributeName );
-            QDomText outAttributeText = outFeatureInfoDoc.createTextNode( currentAttributeValue );
-            outAttributeElem.appendChild( outAttributeText );
-            outFeatureElem.appendChild( outAttributeElem );
-          }
-          outInfoDocElement.appendChild( outFeatureElem );
-        }
-      }
-    }
-    ba = outFeatureInfoDoc.toByteArray();
-  }
   else if ( infoFormat == "text/plain" || infoFormat == "text/html" )
   {
     //create string
diff --git a/src/mapserver/qgspostrequesthandler.cpp b/src/mapserver/qgspostrequesthandler.cpp
index 933ee12f92d8..34c4feecc27c 100644
--- a/src/mapserver/qgspostrequesthandler.cpp
+++ b/src/mapserver/qgspostrequesthandler.cpp
@@ -58,9 +58,11 @@ QMap QgsPostRequestHandler::parseInput()
     requestStringToParameterMap( queryString, parameters );
 
     QDomElement docElem = doc.documentElement();
-    parameters.insert( "VERSION", docElem.attribute( "version" ) );
-    parameters.insert( "SERVICE", docElem.attribute( "service" ) );
-    parameters.insert( "REQUEST", docElem.localName() );
+    if ( docElem.hasAttribute( "version" ) )
+      parameters.insert( "VERSION", docElem.attribute( "version" ) );
+    if ( docElem.hasAttribute( "service" ) )
+      parameters.insert( "SERVICE", docElem.attribute( "service" ) );
+    parameters.insert( "REQUEST", docElem.tagName() );
     parameters.insert( "REQUEST_BODY", inputString );
   }
 
diff --git a/src/mapserver/qgsprojectparser.cpp b/src/mapserver/qgsprojectparser.cpp
index 538757bec606..282ed2437419 100644
--- a/src/mapserver/qgsprojectparser.cpp
+++ b/src/mapserver/qgsprojectparser.cpp
@@ -38,7 +38,10 @@
 #include "qgscomposershape.h"
 
 #include "QFileInfo"
+#include 
+#include 
 #include "QTextStream"
+#include 
 
 
 QgsProjectParser::QgsProjectParser( QDomDocument* xmlDoc, const QString& filePath ): QgsConfigParser(), mXMLDoc( xmlDoc ), mProjectPath( filePath )
@@ -48,7 +51,7 @@ QgsProjectParser::QgsProjectParser( QDomDocument* xmlDoc, const QString& filePat
   setSelectionColor();
   setMaxWidthHeight();
 
-  //accelerate search for layers and groups
+  //accelerate the search for layers, groups and the creation of annotation items
   if ( mXMLDoc )
   {
     QDomNodeList layerNodeList = mXMLDoc->elementsByTagName( "maplayer" );
@@ -73,6 +76,8 @@ QgsProjectParser::QgsProjectParser( QDomDocument* xmlDoc, const QString& filePat
     }
 
     mRestrictedLayers = restrictedLayers();
+    createTextAnnotationItems();
+    createSvgAnnotationItems();
   }
 }
 
@@ -83,6 +88,8 @@ QgsProjectParser::QgsProjectParser(): mXMLDoc( 0 )
 QgsProjectParser::~QgsProjectParser()
 {
   delete mXMLDoc;
+  cleanupTextAnnotationItems();
+  cleanupSvgAnnotationItems();
 }
 
 int QgsProjectParser::numberOfLayers() const
@@ -189,14 +196,6 @@ void QgsProjectParser::featureTypeList( QDomElement& parentElement, QDomDocument
         srsElem.appendChild( srsText );
         layerElem.appendChild( srsElem );
 
-        QgsRectangle layerExtent = layer->extent();
-        QDomElement bBoxElement = doc.createElement( "LatLongBoundingBox" );
-        bBoxElement.setAttribute( "minx", QString::number( layerExtent.xMinimum() ) );
-        bBoxElement.setAttribute( "miny", QString::number( layerExtent.yMinimum() ) );
-        bBoxElement.setAttribute( "maxx", QString::number( layerExtent.xMaximum() ) );
-        bBoxElement.setAttribute( "maxy", QString::number( layerExtent.yMaximum() ) );
-        layerElem.appendChild( bBoxElement );
-
         //wfs:Operations element
         QDomElement operationsElement = doc.createElement( "Operations"/*wfs:Operations*/ );
         //wfs:Query element
@@ -228,6 +227,14 @@ void QgsProjectParser::featureTypeList( QDomElement& parentElement, QDomDocument
 
         layerElem.appendChild( operationsElement );
 
+        QgsRectangle layerExtent = layer->extent();
+        QDomElement bBoxElement = doc.createElement( "LatLongBoundingBox" );
+        bBoxElement.setAttribute( "minx", QString::number( layerExtent.xMinimum() ) );
+        bBoxElement.setAttribute( "miny", QString::number( layerExtent.yMinimum() ) );
+        bBoxElement.setAttribute( "maxx", QString::number( layerExtent.xMaximum() ) );
+        bBoxElement.setAttribute( "maxy", QString::number( layerExtent.yMaximum() ) );
+        layerElem.appendChild( bBoxElement );
+
         parentElement.appendChild( layerElem );
       }
     }
@@ -243,6 +250,18 @@ void QgsProjectParser::describeFeatureType( const QString& aTypeName, QDomElemen
   }
 
   QStringList wfsLayersId = wfsLayers();
+  QStringList typeNameList;
+  if ( aTypeName != "" )
+  {
+    QStringList typeNameSplit = aTypeName.split( "," );
+    foreach ( const QString &str, typeNameSplit )
+    {
+      if ( str.contains( ":" ) )
+        typeNameList << str.section( ":", 1, 1 );
+      else
+        typeNameList << str;
+    }
+  }
 
   foreach ( const QDomElement &elem, mProjectLayerElements )
   {
@@ -251,7 +270,11 @@ void QgsProjectParser::describeFeatureType( const QString& aTypeName, QDomElemen
     {
       QgsMapLayer *mLayer = createLayerFromElement( elem );
       QgsVectorLayer* layer = dynamic_cast( mLayer );
-      if ( layer && wfsLayersId.contains( layer->id() ) && ( aTypeName == "" || layer->name() == aTypeName ) )
+
+      QString typeName = layer->name();
+      typeName = typeName.replace( QString( " " ), QString( "_" ) );
+
+      if ( layer && wfsLayersId.contains( layer->id() ) && ( aTypeName == "" || typeNameList.contains( typeName ) ) )
       {
         //do a select with searchRect and go through all the features
         QgsVectorDataProvider* provider = layer->dataProvider();
@@ -263,9 +286,6 @@ void QgsProjectParser::describeFeatureType( const QString& aTypeName, QDomElemen
         //hidden attributes for this layer
         const QSet& layerExcludedAttributes = layer->excludeAttributesWFS();
 
-        QString typeName = layer->name();
-        typeName = typeName.replace( QString( " " ), QString( "_" ) );
-
         //xsd:element
         QDomElement elementElem = doc.createElement( "element"/*xsd:element*/ );
         elementElem.setAttribute( "name", typeName );
@@ -364,6 +384,37 @@ void QgsProjectParser::describeFeatureType( const QString& aTypeName, QDomElemen
   return;
 }
 
+QList QgsProjectParser::mapLayerFromTypeName( const QString& tName, bool useCache ) const
+{
+  QList layerList;
+
+  if ( mProjectLayerElements.size() < 1 )
+  {
+    return layerList;
+  }
+
+  QStringList wfsLayersId = wfsLayers();
+
+  foreach ( const QDomElement &elem, mProjectLayerElements )
+  {
+    QString type = elem.attribute( "type" );
+    if ( type == "vector" )
+    {
+      QgsMapLayer *mLayer = createLayerFromElement( elem, useCache );
+      QgsVectorLayer* layer = dynamic_cast( mLayer );
+
+      QString typeName = layer->name();
+      typeName = typeName.replace( QString( " " ), QString( "_" ) );
+      if ( tName == typeName )
+      {
+        layerList.push_back( mLayer );
+        return layerList;
+      }
+    }
+  }
+  return layerList;
+}
+
 void QgsProjectParser::addLayers( QDomDocument &doc,
                                   QDomElement &parentElem,
                                   const QDomElement &legendElem,
@@ -1299,6 +1350,24 @@ QgsMapLayer* QgsProjectParser::createLayerFromElement( const QDomElement& elem,
         }
       }
     }
+    else if ( uri.startsWith( "file:" ) ) //a file based datasource in url notation (e.g. delimited text layer)
+    {
+      QString filePath = uri.mid( 5, uri.indexOf( "?" ) - 5 );
+      QString absoluteFilePath = convertToAbsolutePath( filePath );
+      if ( filePath != absoluteFilePath )
+      {
+        QUrl destUrl = QUrl::fromEncoded( uri.toAscii() );
+        destUrl.setScheme( "file" );
+        destUrl.setPath( absoluteFilePath );
+        absoluteUri = destUrl.toEncoded();
+        QDomText absoluteTextNode = mXMLDoc->createTextNode( absoluteUri );
+        dataSourceElem.replaceChild( absoluteTextNode, dataSourceElem.firstChild() );
+      }
+      else
+      {
+        absoluteUri = uri;
+      }
+    }
     else //file based data source
     {
       absoluteUri = convertToAbsolutePath( uri );
@@ -1677,6 +1746,12 @@ QList QgsProjectParser::publishedComposerElements() const
 
 void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocument& doc ) const
 {
+  if ( doc.documentElement().tagName() == "WFS_Capabilities" )
+  {
+    serviceWFSCapabilities( parentElement, doc );
+    return;
+  }
+
   QDomElement serviceElem = doc.createElement( "Service" );
 
   QDomElement propertiesElem = mXMLDoc->documentElement().firstChildElement( "properties" );
@@ -1719,6 +1794,32 @@ void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocu
     serviceElem.appendChild( wmsAbstractElem );
   }
 
+  //keyword list
+  QDomElement keywordListElem = propertiesElem.firstChildElement( "WMSKeywordList" );
+  if ( !keywordListElem.isNull() )
+  {
+    bool siaFormat = featureInfoFormatSIA2045();
+
+    QDomElement wmsKeywordElem = doc.createElement( "KeywordList" );
+    QDomNodeList keywordList = keywordListElem.elementsByTagName( "value" );
+    for ( int i = 0; i < keywordList.size(); ++i )
+    {
+      QDomElement keywordElem = doc.createElement( "Keyword" );
+      QDomText keywordText = doc.createTextNode( keywordList.at( i ).toElement().text() );
+      keywordElem.appendChild( keywordText );
+      if ( siaFormat )
+      {
+        keywordElem.setAttribute( "vocabulary", "SIA_Geo405" );
+      }
+      wmsKeywordElem.appendChild( keywordElem );
+    }
+
+    if ( keywordList.size() > 0 )
+    {
+      serviceElem.appendChild( wmsKeywordElem );
+    }
+  }
+
   //OnlineResource element is mandatory according to the WMS specification
   QDomElement wmsOnlineResourceElem = propertiesElem.firstChildElement( "WMSOnlineResource" );
   QDomElement onlineResourceElem = doc.createElement( "OnlineResource" );
@@ -1785,6 +1886,26 @@ void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocu
 
   serviceElem.appendChild( contactInfoElem );
 
+  //Fees
+  QDomElement feesElem = propertiesElem.firstChildElement( "WMSFees" );
+  if ( !feesElem.isNull() )
+  {
+    QDomElement wmsFeesElem = doc.createElement( "Fees" );
+    QDomText wmsFeesText = doc.createTextNode( feesElem.text() );
+    wmsFeesElem.appendChild( wmsFeesText );
+    serviceElem.appendChild( wmsFeesElem );
+  }
+
+  //AccessConstraints
+  QDomElement accessConstraintsElem = propertiesElem.firstChildElement( "WMSAccessConstraints" );
+  if ( !accessConstraintsElem.isNull() )
+  {
+    QDomElement wmsAccessConstraintsElem = doc.createElement( "AccessConstraints" );
+    QDomText wmsAccessConstraintsText = doc.createTextNode( accessConstraintsElem.text() );
+    wmsAccessConstraintsElem.appendChild( wmsAccessConstraintsText );
+    serviceElem.appendChild( wmsAccessConstraintsElem );
+  }
+
   //MaxWidth / MaxHeight for WMS 1.3
   QString version = doc.documentElement().attribute( "version" );
   if ( version != "1.1.1" )
@@ -1808,6 +1929,110 @@ void QgsProjectParser::serviceCapabilities( QDomElement& parentElement, QDomDocu
   parentElement.appendChild( serviceElem );
 }
 
+void QgsProjectParser::serviceWFSCapabilities( QDomElement& parentElement, QDomDocument& doc ) const
+{
+  QDomElement serviceElem = doc.createElement( "Service" );
+
+  QDomElement propertiesElem = mXMLDoc->documentElement().firstChildElement( "properties" );
+  if ( propertiesElem.isNull() )
+  {
+    QgsConfigParser::serviceCapabilities( parentElement, doc );
+    return;
+  }
+
+  QDomElement serviceCapabilityElem = propertiesElem.firstChildElement( "WMSServiceCapabilities" );
+  if ( serviceCapabilityElem.isNull() || serviceCapabilityElem.text().compare( "true", Qt::CaseInsensitive ) != 0 )
+  {
+    QgsConfigParser::serviceCapabilities( parentElement, doc );
+    return;
+  }
+
+  //Service name is always WMS
+  QDomElement wmsNameElem = doc.createElement( "Name" );
+  QDomText wmsNameText = doc.createTextNode( "WFS" );
+  wmsNameElem.appendChild( wmsNameText );
+  serviceElem.appendChild( wmsNameElem );
+
+  //WMS title
+  QDomElement titleElem = propertiesElem.firstChildElement( "WMSServiceTitle" );
+  if ( !titleElem.isNull() )
+  {
+    QDomElement wmsTitleElem = doc.createElement( "Title" );
+    QDomText wmsTitleText = doc.createTextNode( titleElem.text() );
+    wmsTitleElem.appendChild( wmsTitleText );
+    serviceElem.appendChild( wmsTitleElem );
+  }
+
+  //WMS abstract
+  QDomElement abstractElem = propertiesElem.firstChildElement( "WMSServiceAbstract" );
+  if ( !abstractElem.isNull() )
+  {
+    QDomElement wmsAbstractElem = doc.createElement( "Abstract" );
+    QDomText wmsAbstractText = doc.createTextNode( abstractElem.text() );
+    wmsAbstractElem.appendChild( wmsAbstractText );
+    serviceElem.appendChild( wmsAbstractElem );
+  }
+
+  //keyword list
+  QDomElement keywordListElem = propertiesElem.firstChildElement( "WMSKeywordList" );
+  if ( !keywordListElem.isNull() )
+  {
+    bool siaFormat = featureInfoFormatSIA2045();
+
+    QDomNodeList keywordList = keywordListElem.elementsByTagName( "value" );
+    QStringList keywords;
+    for ( int i = 0; i < keywordList.size(); ++i )
+    {
+      keywords << keywordList.at( i ).toElement().text();
+    }
+
+    if ( keywordList.size() > 0 )
+    {
+      QDomElement wfsKeywordElem = doc.createElement( "Keywords" );
+      QDomText keywordText = doc.createTextNode( keywords.join( ", " ) );
+      wfsKeywordElem.appendChild( keywordText );
+      if ( siaFormat )
+      {
+        wfsKeywordElem.setAttribute( "vocabulary", "SIA_Geo405" );
+      }
+      serviceElem.appendChild( wfsKeywordElem );
+    }
+  }
+
+  //OnlineResource element is mandatory according to the WMS specification
+  QDomElement wmsOnlineResourceElem = propertiesElem.firstChildElement( "WMSOnlineResource" );
+  QDomElement onlineResourceElem = doc.createElement( "OnlineResource" );
+  onlineResourceElem.setAttribute( "xmlns:xlink", "http://www.w3.org/1999/xlink" );
+  onlineResourceElem.setAttribute( "xlink:type", "simple" );
+  if ( !wmsOnlineResourceElem.isNull() )
+  {
+    onlineResourceElem.setAttribute( "xlink:href", wmsOnlineResourceElem.text() );
+  }
+
+  serviceElem.appendChild( onlineResourceElem );
+
+  //Fees
+  QDomElement feesElem = propertiesElem.firstChildElement( "WMSFees" );
+  if ( !feesElem.isNull() )
+  {
+    QDomElement wmsFeesElem = doc.createElement( "Fees" );
+    QDomText wmsFeesText = doc.createTextNode( feesElem.text() );
+    wmsFeesElem.appendChild( wmsFeesText );
+    serviceElem.appendChild( wmsFeesElem );
+  }
+
+  //AccessConstraints
+  QDomElement accessConstraintsElem = propertiesElem.firstChildElement( "WMSAccessConstraints" );
+  if ( !accessConstraintsElem.isNull() )
+  {
+    QDomElement wmsAccessConstraintsElem = doc.createElement( "AccessConstraints" );
+    QDomText wmsAccessConstraintsText = doc.createTextNode( accessConstraintsElem.text() );
+    wmsAccessConstraintsElem.appendChild( wmsAccessConstraintsText );
+    serviceElem.appendChild( wmsAccessConstraintsElem );
+  }
+  parentElement.appendChild( serviceElem );
+}
+
 QString QgsProjectParser::serviceUrl() const
 {
   QString url;
@@ -1929,6 +2154,21 @@ QString QgsProjectParser::featureInfoDocumentElementNS() const
   return featureInfoDocumentNSElem.text();
 }
 
+QString QgsProjectParser::featureInfoSchema() const
+{
+  QDomElement propertiesElem = mXMLDoc->documentElement().firstChildElement( "properties" );
+  if ( propertiesElem.isNull() )
+  {
+    return "";
+  }
+  QDomElement featureInfoSchemaElem = propertiesElem.firstChildElement( "WMSFeatureInfoSchema" );
+  if ( featureInfoSchemaElem.isNull() )
+  {
+    return "";
+  }
+  return featureInfoSchemaElem.text();
+}
+
 bool QgsProjectParser::featureInfoFormatSIA2045() const
 {
   if ( !mXMLDoc )
@@ -2159,6 +2399,43 @@ QgsRectangle QgsProjectParser::layerBoundingBoxInProjectCRS( const QDomElement&
   return BBox;
 }
 
+void QgsProjectParser::addDrawingOrder( QDomElement elem, bool useDrawingOrder, QMap& orderedLayerList ) const
+{
+  if ( elem.isNull() )
+  {
+    return;
+  }
+
+  if ( elem.tagName() == "legendgroup" )
+  {
+    if ( elem.attribute( "embedded" ) == "1" )
+    {
+      addDrawingOrderEmbeddedGroup( elem, orderedLayerList, useDrawingOrder );
+    }
+    else
+    {
+      QDomNodeList groupChildren = elem.childNodes();
+      for ( int i = 0; i < groupChildren.size(); ++i )
+      {
+        addDrawingOrder( groupChildren.at( i ).toElement(), useDrawingOrder, orderedLayerList );
+      }
+    }
+  }
+  else if ( elem.tagName() == "legendlayer" )
+  {
+    QString layerName = elem.attribute( "name" );
+    if ( useDrawingOrder )
+    {
+      int drawingOrder = elem.attribute( "drawingOrder", "-1" ).toInt();
+      orderedLayerList.insert( drawingOrder, layerName );
+    }
+    else
+    {
+      orderedLayerList.insert( orderedLayerList.size(), layerName );
+    }
+  }
+}
+
 void QgsProjectParser::addDrawingOrder( QDomElement& parentElem, QDomDocument& doc ) const
 {
   if ( !mXMLDoc )
@@ -2173,33 +2450,23 @@ void QgsProjectParser::addDrawingOrder( QDomElement& parentElem, QDomDocument& d
     return;
   }
 
-  QStringList layerList;
-
   bool useDrawingOrder = ( legendElement.attribute( "updateDrawingOrder" ) == "false" );
-  QDomNodeList layerNodeList = legendElement.elementsByTagName( "legendlayer" );
-  if ( !useDrawingOrder ) //bottom to top
+  QMap orderedLayerNames;
+
+  QDomNodeList legendChildren = legendElement.childNodes();
+  QDomElement childElem;
+  for ( int i = 0; i < legendChildren.size(); ++i )
   {
-    for ( int i = 0; i < layerNodeList.size(); ++i )
-    {
-      layerList.prepend( layerNodeList.at( i ).toElement().attribute( "name" ) );
-    }
+    addDrawingOrder( legendChildren.at( i ).toElement(), useDrawingOrder, orderedLayerNames );
   }
-  else
-  {
-    QMap orderedLayerNames;
-    for ( int i = 0; i < layerNodeList.size(); ++i )
-    {
-      QString layerName = layerNodeList.at( i ).toElement().attribute( "name" );
-      int order = layerNodeList.at( i ).toElement().attribute( "drawingOrder" ).toInt();
-      orderedLayerNames.insert( order, layerName );
-    }
 
-    QMap::const_iterator orderIt = orderedLayerNames.constBegin();
-    for ( ; orderIt != orderedLayerNames.constEnd(); ++orderIt )
-    {
-      layerList.prepend( *orderIt );
-    }
+  QStringList layerList;
+  QMap::const_iterator nameIt = orderedLayerNames.constBegin();
+  for ( ; nameIt != orderedLayerNames.constEnd(); ++nameIt )
+  {
+    layerList.prepend( nameIt.value() );
   }
+
   QDomElement layerDrawingOrderElem = doc.createElement( "LayerDrawingOrder" );
   QDomText drawingOrderText = doc.createTextNode( layerList.join( "," ) );
   layerDrawingOrderElem.appendChild( drawingOrderText );
@@ -2335,3 +2602,278 @@ void QgsProjectParser::sublayersOfEmbeddedGroup( const QString& projectFilePath,
     }
   }
 }
+
+QgsRectangle QgsProjectParser::projectExtent() const
+{
+  QgsRectangle extent;
+  if ( !mXMLDoc )
+  {
+    return extent;
+  }
+
+  QDomElement qgisElem = mXMLDoc->documentElement();
+  QDomElement mapCanvasElem = qgisElem.firstChildElement( "mapcanvas" );
+  if ( mapCanvasElem.isNull() )
+  {
+    return extent;
+  }
+
+  QDomElement extentElem = mapCanvasElem.firstChildElement( "extent" );
+  bool xminOk, xmaxOk, yminOk, ymaxOk;
+  double xMin = extentElem.firstChildElement( "xmin" ).text().toDouble( &xminOk );
+  double xMax = extentElem.firstChildElement( "xmax" ).text().toDouble( &xmaxOk );
+  double yMin = extentElem.firstChildElement( "ymin" ).text().toDouble( &yminOk );
+  double yMax = extentElem.firstChildElement( "ymax" ).text().toDouble( &ymaxOk );
+
+  if ( xminOk && xmaxOk && yminOk && ymaxOk )
+  {
+    extent = QgsRectangle( xMin, yMin, xMax, yMax );
+  }
+
+  return extent;
+}
+
+void QgsProjectParser::drawOverlays( QPainter* p, int dpi, int width, int height ) const
+{
+  Q_UNUSED( width );
+  Q_UNUSED( height );
+
+  //consider DPI
+  double scaleFactor = dpi / 88.0; //assume 88 as standard dpi
+  QgsRectangle prjExtent = projectExtent();
+
+  //text annotations
+  QList< QPair< QTextDocument*, QDomElement > >::const_iterator textIt = mTextAnnotationItems.constBegin();
+  for ( ; textIt != mTextAnnotationItems.constEnd(); ++textIt )
+  {
+    QDomElement annotationElem = textIt->second;
+    if ( annotationElem.isNull() )
+    {
+      continue;
+    }
+
+    int itemWidth = annotationElem.attribute( "frameWidth", "0" ).toInt();
+    int itemHeight = annotationElem.attribute( "frameHeight", "0" ).toInt();
+
+    //calculate item position
+    double xPos, yPos;
+    if ( !annotationPosition( annotationElem, scaleFactor, xPos, yPos ) )
+    {
+      continue;
+    }
+
+    drawAnnotationRectangle( p, annotationElem, scaleFactor, xPos, yPos, itemWidth, itemHeight );
+
+    //draw annotation contents
+    p->translate( xPos, yPos );
+    p->scale( scaleFactor, scaleFactor );
+    textIt->first->drawContents( p, QRectF( 0, 0, itemWidth / scaleFactor, itemHeight / scaleFactor ) );
+    p->restore();
+  }
+
+  //svg annotations
+  QList< QPair< QSvgRenderer*, QDomElement > >::const_iterator svgIt = mSvgAnnotationElems.constBegin();
+  QDomElement annotationElem;
+  for ( ; svgIt != mSvgAnnotationElems.constEnd(); ++svgIt )
+  {
+    annotationElem = svgIt->second;
+    int itemWidth = annotationElem.attribute( "frameWidth", "0" ).toInt() * scaleFactor;
+    int itemHeight = annotationElem.attribute( "frameHeight", "0" ).toInt() * scaleFactor;
+
+    //calculate item position
+    double xPos, yPos;
+    if ( !annotationPosition( annotationElem, scaleFactor, xPos, yPos ) )
+    {
+      continue;
+    }
+
+    drawAnnotationRectangle( p, annotationElem, scaleFactor, xPos, yPos, itemWidth, itemHeight );
+
+    //keep width/height ratio of svg
+    QRect viewBox = svgIt->first->viewBox();
+    if ( viewBox.isValid() )
+    {
+      double widthRatio = ( double )( itemWidth ) / ( double )( viewBox.width() );
+      double heightRatio = ( double )( itemHeight ) / ( double )( viewBox.height() );
+      double renderWidth = 0;
+      double renderHeight = 0;
+      if ( widthRatio <= heightRatio )
+      {
+        renderWidth = itemWidth;
+        renderHeight = viewBox.height() * itemWidth / viewBox.width() ;
+      }
+      else
+      {
+        renderHeight = itemHeight;
+        renderWidth = viewBox.width() * itemHeight / viewBox.height() ;
+      }
+
+      svgIt->first->render( p, QRectF( xPos, yPos, renderWidth,
+                                       renderHeight ) );
+    }
+  }
+}
+
+void QgsProjectParser::createTextAnnotationItems()
+{
+  cleanupTextAnnotationItems();
+
+  if ( !mXMLDoc )
+  {
+    return;
+  }
+
+  //text annotations
+  QDomElement qgisElem = mXMLDoc->documentElement();
+  QDomNodeList textAnnotationList = qgisElem.elementsByTagName( "TextAnnotationItem" );
+  QDomElement textAnnotationElem;
+  QDomElement annotationElem;
+  for ( int i = 0; i < textAnnotationList.size(); ++i )
+  {
+    textAnnotationElem = textAnnotationList.at( i ).toElement();
+    annotationElem = textAnnotationElem.firstChildElement( "AnnotationItem" );
+    if ( !annotationElem.isNull() && annotationElem.attribute( "mapPositionFixed" ) != "1" )
+    {
+      QTextDocument* textDoc = new QTextDocument();
+      textDoc->setHtml( textAnnotationElem.attribute( "document" ) );
+      mTextAnnotationItems.push_back( qMakePair( textDoc, annotationElem ) );
+    }
+  }
+}
+
+void QgsProjectParser::createSvgAnnotationItems()
+{
+  mSvgAnnotationElems.clear();
+  if ( !mXMLDoc )
+  {
+    return;
+  }
+
+  QDomElement qgisElem = mXMLDoc->documentElement();
+  QDomNodeList svgAnnotationList = qgisElem.elementsByTagName( "SVGAnnotationItem" );
+  QDomElement svgAnnotationElem;
+  QDomElement annotationElem;
+  for ( int i = 0; i < svgAnnotationList.size(); ++i )
+  {
+    svgAnnotationElem = svgAnnotationList.at( i ).toElement();
+    annotationElem = svgAnnotationElem.firstChildElement( "AnnotationItem" );
+    if ( !annotationElem.isNull() && annotationElem.attribute( "mapPositionFixed" ) != "1" )
+    {
+      QSvgRenderer* svg = new QSvgRenderer();
+      if ( svg->load( convertToAbsolutePath( svgAnnotationElem.attribute( "file" ) ) ) )
+      {
+        mSvgAnnotationElems.push_back( qMakePair( svg, annotationElem ) );
+      }
+      else
+      {
+        delete svg;
+      }
+    }
+  }
+}
+
+void QgsProjectParser::cleanupSvgAnnotationItems()
+{
+  QList< QPair< QSvgRenderer*, QDomElement > >::const_iterator it = mSvgAnnotationElems.constBegin();
+  for ( ; it != mSvgAnnotationElems.constEnd(); ++it )
+  {
+    delete it->first;
+  }
+  mSvgAnnotationElems.clear();
+}
+
+void QgsProjectParser::cleanupTextAnnotationItems()
+{
+  QList< QPair< QTextDocument*, QDomElement > >::const_iterator it = mTextAnnotationItems.constBegin();
+  for ( ; it != mTextAnnotationItems.constEnd(); ++it )
+  {
+    delete it->first;
+  }
+  mTextAnnotationItems.clear();
+}
+
+bool QgsProjectParser::annotationPosition( const QDomElement& elem, double scaleFactor,
+    double& xPos, double& yPos )
+{
+  Q_UNUSED( scaleFactor );
+
+  xPos = elem.attribute( "canvasPosX" ).toDouble() / scaleFactor;
+  yPos = elem.attribute( "canvasPosY" ).toDouble() / scaleFactor;
+  return true;
+}
+
+void QgsProjectParser::drawAnnotationRectangle( QPainter* p, const QDomElement& elem, double scaleFactor, double xPos, double yPos, int itemWidth, int itemHeight )
+{
+  Q_UNUSED( scaleFactor );
+  if ( !p )
+  {
+    return;
+  }
+
+  QColor backgroundColor( elem.attribute( "frameBackgroundColor", "#000000" ) );
+  backgroundColor.setAlpha( elem.attribute( "frameBackgroundColorAlpha", "255" ).toInt() );
+  p->setBrush( QBrush( backgroundColor ) );
+  QColor frameColor( elem.attribute( "frameColor", "#000000" ) );
+  frameColor.setAlpha( elem.attribute( "frameColorAlpha", "255" ).toInt() );
+  QPen framePen( frameColor );
+  framePen.setWidth( elem.attribute( "frameBorderWidth", "1" ).toInt() );
+  p->setPen( framePen );
+
+  p->drawRect( QRectF( xPos, yPos, itemWidth, itemHeight ) );
+}
+
+void QgsProjectParser::addDrawingOrderEmbeddedGroup( const QDomElement& groupElem, QMap& orderedLayerList, bool useDrawingOrder ) const
+{
+  if ( groupElem.isNull() )
+  {
+    return;
+  }
+
+  QString project = convertToAbsolutePath( groupElem.attribute( "project" ) );
+  if ( project.isEmpty() )
+  {
+    return;
+  }
+
+  int embedDrawingOrder = groupElem.attribute( "drawingOrder", "-1" ).toInt();
+  QgsProjectParser* p = dynamic_cast( QgsConfigCache::instance()->searchConfiguration( project ) );
+  if ( !p )
+  {
+    return;
+  }
+
+  QDomDocument* doc = p->mXMLDoc;
+  if ( !doc )
+  {
+    return;
+  }
+
+  QDomNodeList layerNodeList = doc->elementsByTagName( "legendlayer" );
+  QDomElement layerElem;
+  QStringList layerNames;
+  QString layerName;
+  for ( int i = 0; i < layerNodeList.size(); ++i )
+  {
+    layerElem = layerNodeList.at( i ).toElement();
+    layerName = layerElem.attribute( "name" );
+    if ( useDrawingOrder )
+    {
+      layerNames.push_back( layerName );
+    }
+    else
+    {
+      orderedLayerList.insert( orderedLayerList.size(), layerName );
+    }
+  }
+
+  if ( useDrawingOrder )
+  {
+    for ( int i = layerNames.size() - 1; i >= 0; --i )
+    {
+      if ( useDrawingOrder )
+      {
+        orderedLayerList.insertMulti( embedDrawingOrder, layerNames.at( i ) );
+      }
+    }
+  }
+}
diff --git a/src/mapserver/qgsprojectparser.h b/src/mapserver/qgsprojectparser.h
index afb5c33dd8be..4760c2ca1272 100644
--- a/src/mapserver/qgsprojectparser.h
+++ b/src/mapserver/qgsprojectparser.h
@@ -23,6 +23,9 @@
 #include 
 #include 
 
+class QSvgRenderer;
+class QTextDocument;
+
 //Information about relationship between groups and layers
 //key: group name (or null strings for single layers without groups)
 //value: containter with layer ids contained in the group
@@ -43,6 +46,8 @@ class QgsProjectParser: public QgsConfigParser
     virtual void featureTypeList( QDomElement& parentElement, QDomDocument& doc ) const;
 
     virtual void describeFeatureType( const QString& aTypeName, QDomElement& parentElement, QDomDocument& doc ) const;
+    /**Returns one or possibly several maplayers for a given type name. If no layers/style are found, an empty list is returned*/
+    virtual QList mapLayerFromTypeName( const QString& tName, bool useCache = true ) const;
 
     int numberOfLayers() const;
 
@@ -118,9 +123,14 @@ class QgsProjectParser: public QgsConfigParser
 
     virtual QString featureInfoDocumentElementNS() const;
 
+    virtual QString featureInfoSchema() const;
+
     /**Return feature info in format SIA2045?*/
     bool featureInfoFormatSIA2045() const;
 
+    /**Draw text annotation items from the QGIS projectfile*/
+    void drawOverlays( QPainter* p, int dpi, int width, int height ) const;
+
   private:
 
     //forbidden
@@ -142,6 +152,10 @@ class QgsProjectParser: public QgsConfigParser
     QHash< QString, QDomElement > mProjectLayerElementsByName;
     /**Names of layers and groups which should not be published*/
     QSet mRestrictedLayers;
+    /**Watermark text items*/
+    QList< QPair< QTextDocument*, QDomElement > > mTextAnnotationItems;
+    /**Watermark items (content cached in QgsSVGCache)*/
+    QList< QPair< QSvgRenderer*, QDomElement > > mSvgAnnotationElems;
 
     /**Creates a maplayer object from  element. The layer cash owns the maplayer, so don't delete it
     @return the maplayer or 0 in case of error*/
@@ -195,6 +209,8 @@ class QgsProjectParser: public QgsConfigParser
     void setMaxWidthHeight();
     /**Reads layer drawing order from the legend section of the project file and appends it to the parent elemen (usually the  element)*/
     void addDrawingOrder( QDomElement& parentElem, QDomDocument& doc ) const;
+    /**Adds drawing order info from layer element or group element (recursive)*/
+    void addDrawingOrder( QDomElement elem, bool useDrawingOrder, QMap& orderedLayerList ) const;
     /**Returns project layers by id*/
     void projectLayerMap( QMap& layerMap ) const;
 
@@ -204,6 +220,39 @@ class QgsProjectParser: public QgsConfigParser
     QSet restrictedLayers() const;
     /**Adds sublayers of an embedded group to layer set*/
     static void sublayersOfEmbeddedGroup( const QString& projectFilePath, const QString& groupName, QSet& layerSet );
+    /**Returns visible extent from the project file (or an empty rectangle in case of error)*/
+    QgsRectangle projectExtent() const;
+
+    void createTextAnnotationItems();
+    void createSvgAnnotationItems();
+
+    void cleanupSvgAnnotationItems();
+    void cleanupTextAnnotationItems();
+
+    /**Calculates annotation position to provide the same distance to the lower right corner as in the QGIS project file
+    @param width output image pixel width
+    @param height output image pixel height
+    @param itemWidth item width in pixels in the QGIS project (screen pixels)
+    @param itemHeight item height in pixels in the QGIS project (screen pixels)
+    @param xPos out: x-coordinate of the item in the output image
+    @param yPos out: y-coordinate of the item in the output image*/
+    static bool annotationPosition( const QDomElement& elem, double scaleFactor, double& xPos, double& yPos );
+
+    /**Draws background rectangle and frame for an annotation
+    @param elem  xml element
+    @param scaleFactor dpi related scale factor
+    @param xPos x-position of the item
+    @param yPos y-position of the item
+    @param itemWidth item width in pixels in the QGIS project (screen pixels)
+    @param itemHeight item height in pixels in the QGIS project (screen pixels)*/
+    static void drawAnnotationRectangle( QPainter* p, const QDomElement& elem, double scaleFactor, double xPos, double yPos, int itemWidth, int itemHeight );
+
+    void addDrawingOrderEmbeddedGroup( const QDomElement& groupElem, QMap& orderedLayerList, bool useDrawingOrder ) const;
+
+    /**Reads service metadata from projectfile or falls back to parent class method if not there
+     * This is for WFS Services
+     **/
+    void serviceWFSCapabilities( QDomElement& parentElement, QDomDocument& doc ) const;
 };
 
 #endif // QGSPROJECTPARSER_H
diff --git a/src/mapserver/qgssldparser.cpp b/src/mapserver/qgssldparser.cpp
index e8606cfc246b..73abb2175fda 100644
--- a/src/mapserver/qgssldparser.cpp
+++ b/src/mapserver/qgssldparser.cpp
@@ -1564,6 +1564,14 @@ bool QgsSLDParser::featureInfoFormatSIA2045() const
   return false;
 }
 
+void QgsSLDParser::drawOverlays( QPainter* p, int dpi, int width, int height ) const
+{
+  if ( mFallbackParser )
+  {
+    mFallbackParser->drawOverlays( p, dpi, width, height );
+  }
+}
+
 #ifdef DIAGRAMSERVER
 int QgsSLDParser::overlaysFromUserStyle( const QDomElement& userStyleElement, QgsVectorLayer* vec ) const
 {
diff --git a/src/mapserver/qgssldparser.h b/src/mapserver/qgssldparser.h
index 6224b4d60d22..ecbeaac3d0fb 100644
--- a/src/mapserver/qgssldparser.h
+++ b/src/mapserver/qgssldparser.h
@@ -59,6 +59,8 @@ class QgsSLDParser: public QgsConfigParser
     void featureTypeList( QDomElement &, QDomDocument & ) const {}
 
     void describeFeatureType( const QString& , QDomElement& , QDomDocument& ) const {}
+    /**Returns one or possibly several maplayers for a given type name. If no layers/style are found, an empty list is returned*/
+    QList mapLayerFromTypeName( const QString&, bool ) const { QList layerList; return layerList; }
 
     /**Returns number of layers in configuration*/
     int numberOfLayers() const;
@@ -89,6 +91,9 @@ class QgsSLDParser: public QgsConfigParser
     /**Return feature info in format SIA2045?*/
     bool featureInfoFormatSIA2045() const;
 
+    /**Forward to fallback parser*/
+    void drawOverlays( QPainter* p, int dpi, int width, int height ) const;
+
   private:
     /**Don't use the default constructor*/
     QgsSLDParser();
diff --git a/src/mapserver/qgsspatialfilter.cpp b/src/mapserver/qgsspatialfilter.cpp
new file mode 100644
index 000000000000..aa2153c23229
--- /dev/null
+++ b/src/mapserver/qgsspatialfilter.cpp
@@ -0,0 +1,77 @@
+/***************************************************************************
+                              qgsspatialfilter.cpp
+                              -----------------------
+  begin                : Oct 19, 2012
+  copyright            : (C) 2012 by René-Luc D'Hont
+  email                : rldhont at 3liz dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#include "qgsspatialfilter.h"
+#include "qgsgeometry.h"
+#include 
+
+QgsSpatialFilter::QgsSpatialFilter(): QgsFilter(), mSpatialType( QgsSpatialFilter::UNKNOWN ), mGeom( 0 )
+{
+}
+
+QgsSpatialFilter::QgsSpatialFilter( SPATIAL_TYPE st, QgsGeometry* geom ): QgsFilter(), mSpatialType( st ), mGeom( geom )
+{
+}
+
+QgsSpatialFilter::~QgsSpatialFilter()
+{
+  delete mGeom;
+}
+
+bool QgsSpatialFilter::evaluate( const QgsFeature& f ) const
+{
+  if ( !mGeom )
+  {
+    return true;
+  }
+
+  QgsGeometry* geom = ( new QgsFeature( f ) )->geometry();
+  switch ( mSpatialType )
+  {
+    case BBOX:
+      return geom->intersects( mGeom->boundingBox() );
+      break;
+    case CONTAINS:
+      return geom->contains( mGeom );
+      break;
+    case CROSSES:
+      return geom->crosses( mGeom );
+      break;
+    case DISJOINT:
+      return geom->disjoint( mGeom );
+      break;
+    case EQUALS:
+      return geom->equals( mGeom );
+      break;
+    case INTERSECTS:
+      return geom->intersects( mGeom );
+      break;
+    case OVERLAPS:
+      return geom->overlaps( mGeom );
+      break;
+    case TOUCHES:
+      return geom->touches( mGeom );
+      break;
+    case WITHIN:
+      return geom->within( mGeom );
+      break;
+    case UNKNOWN:
+    default:
+      break;
+  }
+  return false;
+}
diff --git a/src/mapserver/qgsspatialfilter.h b/src/mapserver/qgsspatialfilter.h
new file mode 100644
index 000000000000..3cb263d7b939
--- /dev/null
+++ b/src/mapserver/qgsspatialfilter.h
@@ -0,0 +1,73 @@
+/***************************************************************************
+                              qgsspatialfilter.h
+                              ---------------------
+  begin                : Oct 19, 2012
+  copyright            : (C) 2012 by René-Luc D'Hont
+  email                : rldhont at 3liz dot com
+ ***************************************************************************/
+
+/***************************************************************************
+ *                                                                         *
+ *   This program is free software; you can redistribute it and/or modify  *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; either version 2 of the License, or     *
+ *   (at your option) any later version.                                   *
+ *                                                                         *
+ ***************************************************************************/
+
+#ifndef QGSSPATIALFILTER_H
+#define QGSSPATIALFILTER_H
+
+#include 
+#include 
+#include 
+
+/**A filter for spatial filter (bbox, intersects, within, disjoint)
+Sample xml fragment:
+
+
+
+135.45,-47.425 157.95,-36.175
+
+
+
+*/
+class QgsSpatialFilter: public QgsFilter
+{
+  public:
+    enum SPATIAL_TYPE
+    {
+      BBOX,
+      CONTAINS,
+      CROSSES,
+      EQUALS,
+      DISJOINT,
+      INTERSECTS,
+      OVERLAPS,
+      TOUCHES,
+      WITHIN,
+      UNKNOWN
+    };
+
+    QgsSpatialFilter();
+    QgsSpatialFilter( SPATIAL_TYPE st, QgsGeometry* geom );
+    ~QgsSpatialFilter();
+
+    /**Evaluates a feature against the filter.
+     @return true if the filter applies for the feature*/
+    bool evaluate( const QgsFeature& f ) const;
+
+    //setters and getters
+    SPATIAL_TYPE spatialType() const {return mSpatialType;}
+    void setSpatialType( SPATIAL_TYPE t ) {mSpatialType = t;}
+
+    //setters and getters
+    QgsGeometry* geometry() const {return mGeom;}
+    void setGeometry( QgsGeometry* g ) {mGeom = g;}
+
+  private:
+    SPATIAL_TYPE mSpatialType;
+    QgsGeometry* mGeom;
+};
+
+#endif //QGSSPATIALFILTER_H
diff --git a/src/mapserver/qgswfsserver.cpp b/src/mapserver/qgswfsserver.cpp
index d76df93bbab7..65a71d7ec804 100644
--- a/src/mapserver/qgswfsserver.cpp
+++ b/src/mapserver/qgswfsserver.cpp
@@ -18,6 +18,7 @@
 #include "qgsconfigparser.h"
 #include "qgscrscache.h"
 #include "qgsfield.h"
+#include "qgsexpression.h"
 #include "qgsgeometry.h"
 #include "qgsmaplayer.h"
 #include "qgsmaplayerregistry.h"
@@ -87,7 +88,7 @@ QDomDocument QgsWFSServer::getCapabilities()
   QDomElement wfsCapabilitiesElement = doc.createElement( "WFS_Capabilities"/*wms:WFS_Capabilities*/ );
   wfsCapabilitiesElement.setAttribute( "xmlns", WFS_NAMESPACE );
   wfsCapabilitiesElement.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
-  wfsCapabilitiesElement.setAttribute( "xsi:schemaLocation", WFS_NAMESPACE + " http://schemas.opengis.net/wfs/1.0.0/wfs.xsd" );
+  wfsCapabilitiesElement.setAttribute( "xsi:schemaLocation", WFS_NAMESPACE + " http://schemas.opengis.net/wfs/1.0.0/WFS-capabilities.xsd" );
   wfsCapabilitiesElement.setAttribute( "xmlns:ogc", OGC_NAMESPACE );
   wfsCapabilitiesElement.setAttribute( "xmlns:gml", GML_NAMESPACE );
   wfsCapabilitiesElement.setAttribute( "xmlns:ows", "http://www.opengis.net/ows" );
@@ -111,10 +112,6 @@ QDomDocument QgsWFSServer::getCapabilities()
   //wfs:GetCapabilities
   QDomElement getCapabilitiesElement = doc.createElement( "GetCapabilities"/*wfs:GetCapabilities*/ );
   requestElement.appendChild( getCapabilitiesElement );
-  QDomElement capabilitiesFormatElement = doc.createElement( "Format" );/*wfs:Format*/
-  getCapabilitiesElement.appendChild( capabilitiesFormatElement );
-  QDomText capabilitiesFormatText = doc.createTextNode( "text/xml" );
-  capabilitiesFormatElement.appendChild( capabilitiesFormatText );
 
   QDomElement dcpTypeElement = doc.createElement( "DCPType"/*wfs:DCPType*/ );
   getCapabilitiesElement.appendChild( dcpTypeElement );
@@ -178,11 +175,11 @@ QDomDocument QgsWFSServer::getCapabilities()
   //only Get supported for the moment
   QDomElement getElement = doc.createElement( "Get"/*wfs:Get*/ );
   httpElement.appendChild( getElement );
-  QDomElement olResourceElement = doc.createElement( "OnlineResource"/*wfs:OnlineResource*/ );
-  olResourceElement.setAttribute( "xlink:type", "simple" );
   requestUrl.truncate( requestUrl.indexOf( "?" ) + 1 );
-  olResourceElement.setAttribute( "xlink:href", hrefString );
-  getElement.appendChild( olResourceElement );
+  getElement.setAttribute( "onlineResource", hrefString );
+  QDomElement getCapabilitiesDhcTypePostElement = dcpTypeElement.cloneNode().toElement();//this is the same as for 'GetCapabilities'
+  getCapabilitiesDhcTypePostElement.firstChild().firstChild().toElement().setTagName( "Post" );
+  getCapabilitiesElement.appendChild( getCapabilitiesDhcTypePostElement );
 
   //wfs:DescribeFeatureType
   QDomElement describeFeatureTypeElement = doc.createElement( "DescribeFeatureType"/*wfs:DescribeFeatureType*/ );
@@ -193,6 +190,9 @@ QDomDocument QgsWFSServer::getCapabilities()
   schemaDescriptionLanguageElement.appendChild( xmlSchemaElement );
   QDomElement describeFeatureTypeDhcTypeElement = dcpTypeElement.cloneNode().toElement();//this is the same as for 'GetCapabilities'
   describeFeatureTypeElement.appendChild( describeFeatureTypeDhcTypeElement );
+  QDomElement describeFeatureTypeDhcTypePostElement = dcpTypeElement.cloneNode().toElement();//this is the same as for 'GetCapabilities'
+  describeFeatureTypeDhcTypePostElement.firstChild().firstChild().toElement().setTagName( "Post" );
+  describeFeatureTypeElement.appendChild( describeFeatureTypeDhcTypePostElement );
 
   //wfs:GetFeature
   QDomElement getFeatureElement = doc.createElement( "GetFeature"/*wfs:GetFeature*/ );
@@ -203,8 +203,11 @@ QDomDocument QgsWFSServer::getCapabilities()
   getFeatureFormatElement.appendChild( gmlFormatElement );
   QDomElement geojsonFormatElement = doc.createElement( "GeoJSON" );/*wfs:GeoJSON*/
   getFeatureFormatElement.appendChild( geojsonFormatElement );
-  QDomElement getFeatureDhcTypeElement = dcpTypeElement.cloneNode().toElement();//this is the same as for 'GetCapabilities'
-  getFeatureElement.appendChild( getFeatureDhcTypeElement );
+  QDomElement getFeatureDhcTypeGetElement = dcpTypeElement.cloneNode().toElement();//this is the same as for 'GetCapabilities'
+  getFeatureElement.appendChild( getFeatureDhcTypeGetElement );
+  QDomElement getFeatureDhcTypePostElement = dcpTypeElement.cloneNode().toElement();//this is the same as for 'GetCapabilities'
+  getFeatureDhcTypePostElement.firstChild().firstChild().toElement().setTagName( "Post" );
+  getFeatureElement.appendChild( getFeatureDhcTypePostElement );
 
   //wfs:Transaction
   QDomElement transactionElement = doc.createElement( "Transaction"/*wfs:Transaction*/ );
@@ -240,14 +243,21 @@ QDomDocument QgsWFSServer::getCapabilities()
   filterCapabilitiesElement.appendChild( spatialCapabilitiesElement );
   QDomElement spatialOperatorsElement = doc.createElement( "ogc:Spatial_Operators"/*ogc:Spatial_Operators*/ );
   spatialCapabilitiesElement.appendChild( spatialOperatorsElement );
-  QDomElement ogcBboxElement = doc.createElement( "ogc:BBOX"/*ogc:BBOX*/ );
-  spatialOperatorsElement.appendChild( ogcBboxElement );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:BBOX"/*ogc:BBOX*/ ) );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:Disjoint"/*ogc:Disjoint*/ ) );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:Intersect"/*ogc:Intersects*/ ) );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:Touches"/*ogc:Touches*/ ) );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:Crosses"/*ogc:Crosses*/ ) );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:Contains"/*ogc:Contains*/ ) );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:Overlaps"/*ogc:Overlaps*/ ) );
+  spatialOperatorsElement.appendChild( doc.createElement( "ogc:Within"/*ogc:Within*/ ) );
   QDomElement scalarCapabilitiesElement = doc.createElement( "ogc:Scalar_Capabilities"/*ogc:Scalar_Capabilities*/ );
   filterCapabilitiesElement.appendChild( scalarCapabilitiesElement );
   QDomElement comparisonOperatorsElement = doc.createElement( "ogc:Comparison_Operators"/*ogc:Comparison_Operators*/ );
   scalarCapabilitiesElement.appendChild( comparisonOperatorsElement );
-  QDomElement simpleComparisonsElement = doc.createElement( "ogc:Simple_Comparisons"/*ogc:Simple_Comparisons*/ );
-  comparisonOperatorsElement.appendChild( simpleComparisonsElement );
+  comparisonOperatorsElement.appendChild( doc.createElement( "ogc:Simple_Comparisons"/*ogc:Simple_Comparisons*/ ) );
+  comparisonOperatorsElement.appendChild( doc.createElement( "ogc:Between"/*ogc:Between*/ ) );
+  comparisonOperatorsElement.appendChild( doc.createElement( "ogc:Like"/*ogc:Like*/ ) );
   return doc;
 }
 
@@ -263,7 +273,7 @@ QDomDocument QgsWFSServer::describeFeatureType()
   schemaElement.setAttribute( "xmlns:gml", GML_NAMESPACE );
   schemaElement.setAttribute( "xmlns:qgs", QGS_NAMESPACE );
   schemaElement.setAttribute( "targetNamespace", QGS_NAMESPACE );
-  schemaElement.setAttribute( "elementFromDefault", "qualified" );
+  schemaElement.setAttribute( "elementFormDefault", "qualified" );
   schemaElement.setAttribute( "version", "1.0" );
   doc.appendChild( schemaElement );
 
@@ -273,18 +283,42 @@ QDomDocument QgsWFSServer::describeFeatureType()
   importElement.setAttribute( "schemaLocation", "http://schemas.opengis.net/gml/2.1.2/feature.xsd" );
   schemaElement.appendChild( importElement );
 
-  //read TYPENAME
-  QString typeName;
-  QMap::const_iterator type_name_it = mParameterMap.find( "TYPENAME" );
-  if ( type_name_it != mParameterMap.end() )
+  //defining typename
+  QString typeName = "";
+
+  QDomDocument queryDoc;
+  QString errorMsg;
+  if ( queryDoc.setContent( mParameterMap.value( "REQUEST_BODY" ), true, &errorMsg ) )
   {
-    typeName = type_name_it.value();
+    //read doc
+    QDomElement queryDocElem = queryDoc.documentElement();
+    QDomNodeList docChildNodes = queryDocElem.childNodes();
+    if ( docChildNodes.size() )
+    {
+      for ( int i = 0; i < docChildNodes.size(); i++ )
+      {
+        QDomElement docChildElem = docChildNodes.at( i ).toElement();
+        if ( docChildElem.tagName() == "TypeName" )
+        {
+          if ( typeName == "" )
+            typeName = docChildElem.text();
+          else
+            typeName += "," + docChildElem.text();
+        }
+      }
+    }
+    mConfigParser->describeFeatureType( typeName, schemaElement, doc );
   }
   else
   {
-    typeName = "";
+    //read TYPENAME
+    QMap::const_iterator type_name_it = mParameterMap.find( "TYPENAME" );
+    if ( type_name_it != mParameterMap.end() )
+    {
+      typeName = type_name_it.value();
+    }
+    mConfigParser->describeFeatureType( typeName, schemaElement, doc );
   }
-  mConfigParser->describeFeatureType( typeName, schemaElement, doc );
   return doc;
 }
 
@@ -292,238 +326,618 @@ int QgsWFSServer::getFeature( QgsRequestHandler& request, const QString& format
 {
   QgsDebugMsg( "Info format is:" + format );
 
-  //read TYPENAME
-  QMap::const_iterator type_name_it = mParameterMap.find( "TYPENAME" );
-  if ( type_name_it != mParameterMap.end() )
-  {
-    mTypeName = type_name_it.value();
-  }
-  else
-  {
-    return 1;
-  }
-
   QStringList wfsLayersId = mConfigParser->wfsLayers();
 
   QList layerList;
   QgsMapLayer* currentLayer = 0;
 
-  layerList = mConfigParser->mapLayerFromStyle( mTypeName, "" );
-  currentLayer = layerList.at( 0 );
+  mErrors = QStringList();
+  mTypeNames = QStringList();
+
+  long maxFeat = 0;
+  long maxFeatures = -1;
+  long featureCounter = 0;
 
-  QgsVectorLayer* layer = dynamic_cast( currentLayer );
-  if ( layer && wfsLayersId.contains( layer->id() ) )
+  QDomDocument doc;
+  QString errorMsg;
+  if ( doc.setContent( mParameterMap.value( "REQUEST_BODY" ), true, &errorMsg ) )
   {
-    //is there alias info for this vector layer?
-    QMap< int, QString > layerAliasInfo;
-    const QMap< QString, QString >& aliasMap = layer->attributeAliases();
-    QMap< QString, QString >::const_iterator aliasIt = aliasMap.constBegin();
-    for ( ; aliasIt != aliasMap.constEnd(); ++aliasIt )
+    QDomElement docElem = doc.documentElement();
+
+    if ( docElem.hasAttribute( "maxFeatures" ) )
+      maxFeatures = docElem.attribute( "maxFeatures" ).toLong();
+
+    QDomNodeList queryNodes = docElem.elementsByTagName( "Query" );
+    QDomElement queryElem;
+    for ( int i = 0; i < queryNodes.size(); i++ )
     {
-      int attrIndex = layer->fieldNameIndex( aliasIt.key() );
-      if ( attrIndex != -1 )
+      queryElem = queryNodes.at( 0 ).toElement();
+      mTypeName = queryElem.attribute( "typeName", "" );
+      if ( mTypeName.contains( ":" ) )
       {
-        layerAliasInfo.insert( attrIndex, aliasIt.value() );
+        mTypeName = mTypeName.section( ":", 1, 1 );
       }
+      mTypeNames << mTypeName;
     }
+    for ( int i = 0; i < queryNodes.size(); i++ )
+    {
+      queryElem = queryNodes.at( 0 ).toElement();
+      mTypeName = queryElem.attribute( "typeName", "" );
+      if ( mTypeName.contains( ":" ) )
+      {
+        mTypeName = mTypeName.section( ":", 1, 1 );
+      }
 
-    //excluded attributes for this layer
-    const QSet& layerExcludedAttributes = layer->excludeAttributesWFS();
+      layerList = mConfigParser->mapLayerFromTypeName( mTypeName );
+      if ( layerList.size() < 1 )
+      {
+        mErrors << QString( "The layer for the TypeName '%1' is not found" ).arg( mTypeName );
+        continue;
+      }
+
+      currentLayer = layerList.at( 0 );
+      QgsVectorLayer* layer = dynamic_cast( currentLayer );
+      if ( layer && wfsLayersId.contains( layer->id() ) )
+      {
+        //is there alias info for this vector layer?
+        QMap< int, QString > layerAliasInfo;
+        const QMap< QString, QString >& aliasMap = layer->attributeAliases();
+        QMap< QString, QString >::const_iterator aliasIt = aliasMap.constBegin();
+        for ( ; aliasIt != aliasMap.constEnd(); ++aliasIt )
+        {
+          int attrIndex = layer->fieldNameIndex( aliasIt.key() );
+          if ( attrIndex != -1 )
+          {
+            layerAliasInfo.insert( attrIndex, aliasIt.value() );
+          }
+        }
+
+        //excluded attributes for this layer
+        const QSet& layerExcludedAttributes = layer->excludeAttributesWFS();
+
+        //do a select with searchRect and go through all the features
+        QgsVectorDataProvider* provider = layer->dataProvider();
+        if ( !provider )
+        {
+          mErrors << QString( "The layer's provider for the TypeName '%1' is not found" ).arg( mTypeName );
+          continue;
+        }
+
+        QgsFeature feature;
+        QgsAttributeMap featureAttributes;
+        const QgsFieldMap& fields = provider->fields();
+
+        mWithGeom = true;
+        QgsAttributeList attrIndexes = provider->attributeIndexes();
+
+        QDomNodeList queryChildNodes = queryElem.childNodes();
+        if ( queryChildNodes.size() )
+        {
+          QStringList::const_iterator alstIt;
+          QList idxList;
+          QMap fieldMap = provider->fieldNameMap();
+          QMap::const_iterator fieldIt;
+          QString fieldName;
+          QDomElement propertyElem;
+          for ( int q = 0; q < queryChildNodes.size(); q++ )
+          {
+            QDomElement queryChildElem = queryChildNodes.at( q ).toElement();
+            if ( queryChildElem.tagName() == "PropertyName" )
+            {
+              fieldName = queryChildElem.text();
+              if ( fieldName.contains( ":" ) )
+              {
+                fieldName = fieldName.section( ":", 1, 1 );
+              }
+              fieldIt = fieldMap.find( fieldName );
+              if ( fieldIt != fieldMap.end() )
+              {
+                idxList.append( fieldIt.value() );
+              }
+            }
+          }
+          if ( idxList.size() > 0 )
+          {
+            attrIndexes = idxList;
+          }
+        }
+
+        //map extent
+        QgsRectangle searchRect = layer->extent();
+        searchRect.set( searchRect.xMinimum() - 0.000001
+                        , searchRect.yMinimum() - 0.000001
+                        , searchRect.xMaximum() + 0.000001
+                        , searchRect.yMaximum() + 0.000001 );
+        QgsCoordinateReferenceSystem layerCrs = layer->crs();
+
+        if ( maxFeatures == -1 )
+          maxFeat += layer->featureCount();
+
+        provider->select( attrIndexes, searchRect, mWithGeom, true );
+
+        long featCounter = 0;
+        QDomNodeList filterNodes = queryElem.elementsByTagName( "Filter" );
+        if ( filterNodes.size() > 0 )
+        {
+          QDomElement filterElem = filterNodes.at( 0 ).toElement();
+          QDomNodeList fidNodes = filterElem.elementsByTagName( "FeatureId" );
+          if ( fidNodes.size() > 0 )
+          {
+            QDomElement fidElem;
+            QString fid = "";
+            for ( int f = 0; f < fidNodes.size(); f++ )
+            {
+              fidElem = fidNodes.at( f ).toElement();
+              fid = fidElem.attribute( "fid" );
+              if ( fid.contains( "." ) )
+              {
+                if ( fid.section( ".", 0, 0 ) != mTypeName )
+                  continue;
+                fid = fid.section( ".", 1, 1 );
+              }
+
+              provider->featureAtId( fid.toInt(), feature, mWithGeom, attrIndexes );
+
+              if ( featureCounter == 0 )
+                startGetFeature( request, format, layerCrs, &searchRect );
+
+              sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+
+              fid = "";
+              ++featCounter;
+              ++featureCounter;
+            }
+          }
+          else if ( filterElem.firstChildElement().tagName() == "BBOX" )
+          {
+            QDomElement bboxElem = filterElem.firstChildElement();
+            QDomElement childElem = bboxElem.firstChildElement();
+            while ( !childElem.isNull() )
+            {
+              if ( childElem.tagName() == "Box" )
+              {
+                QgsRectangle* rect = new QgsRectangle( childElem );
+                provider->select( attrIndexes, *rect, mWithGeom, true );
+              }
+              else if ( childElem.tagName() != "PropertyName" )
+              {
+                QgsGeometry* geom = QgsGeometry::fromGML2( childElem );
+                provider->select( attrIndexes, geom->boundingBox(), mWithGeom, true );
+              }
+              childElem = childElem.nextSiblingElement();
+            }
+            while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
+            {
+              if ( featureCounter == 0 )
+                startGetFeature( request, format, layerCrs, &searchRect );
+
+              sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+              ++featCounter;
+              ++featureCounter;
+            }
+          }
+          else
+          {
+            QgsExpression *mFilter = QgsExpression::createFromOgcFilter( filterElem );
+            if ( mFilter->hasParserError() )
+            {
+              throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
+            }
+            if ( mFilter )
+            {
+              while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
+              {
+                QVariant res = mFilter->evaluate( &feature, fields );
+                if ( mFilter->hasEvalError() )
+                {
+                  throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
+                }
+                if ( res.toInt() != 0 )
+                {
+                  if ( featureCounter == 0 )
+                    startGetFeature( request, format, layerCrs, &searchRect );
+
+                  sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
+                  ++featureCounter;
+                  ++featCounter;
+                }
+              }
+            }
+          }
+        }
+        else
+        {
+          while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
+          {
+            if ( featureCounter == 0 )
+              startGetFeature( request, format, layerCrs, &searchRect );
+
+            sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+            ++featCounter;
+            ++featureCounter;
+          }
+        }
+      }
+      else
+      {
+        mErrors << QString( "The layer for the TypeName '%1' is not a WFS layer" ).arg( mTypeName );
+      }
 
-    //do a select with searchRect and go through all the features
-    QgsVectorDataProvider* provider = layer->dataProvider();
-    if ( !provider )
-    {
-      return 2;
     }
 
-    QgsFeature feature;
-    QgsAttributeMap featureAttributes;
-    const QgsFieldMap& fields = provider->fields();
+    if ( featureCounter == 0 )
+      throw QgsMapServiceException( "RequestNotWellFormed", mErrors.join( ". " ) );
+    else
+      endGetFeature( request, format );
+    return 0;
+  }
+
+  // Information about parameters
+  // FILTER
+  bool filterOk = false;
+  QDomDocument filter;
+  // EXP_FILTER
+  bool expFilterOk = false;
+  QString expFilter;
+  // BBOX
+  bool bboxOk = false;
+  double minx, miny, maxx, maxy;
+
+  //read FEATUREDID
+  bool featureIdOk = false;
+  QStringList featureIdList;
+  QMap::const_iterator feature_id_it = mParameterMap.find( "FEATUREID" );
+  if ( feature_id_it != mParameterMap.end() )
+  {
+    featureIdOk = true;
+    featureIdList = feature_id_it.value().split( "," );
+    QStringList typeNameList;
+    foreach ( const QString &fidStr, featureIdList )
+    {
+      // testing typename in the WFS featureID
+      if ( !fidStr.contains( "." ) )
+        throw QgsMapServiceException( "RequestNotWellFormed", "FEATUREID has to have  TYPENAME in the values" );
+
+      QString typeName = fidStr.section( ".", 0, 0 );
+      if ( !typeNameList.contains( typeName ) )
+        typeNameList << typeName;
+    }
 
-    //map extent
-    QgsRectangle searchRect = layer->extent();
+    mTypeName = typeNameList.join( "," );
+  }
 
-    //read FEATUREDID
-    bool fidOk = false;
-    QString fid;
-    QMap::const_iterator fidIt = mParameterMap.find( "FEATUREID" );
-    if ( fidIt != mParameterMap.end() )
+  if ( !featureIdOk )
+  {
+    //read TYPENAME
+    QMap::const_iterator type_name_it = mParameterMap.find( "TYPENAME" );
+    if ( type_name_it != mParameterMap.end() )
+    {
+      mTypeName = type_name_it.value();
+    }
+    else
     {
-      fidOk = true;
-      fid = fidIt.value();
+      throw QgsMapServiceException( "RequestNotWellFormed", "TYPENAME is MANDATORY" );
     }
 
     //read FILTER
-    bool filterOk = false;
-    QDomDocument filter;
     QMap::const_iterator filterIt = mParameterMap.find( "FILTER" );
     if ( filterIt != mParameterMap.end() )
     {
-      try
+      QString errorMsg;
+      if ( !filter.setContent( filterIt.value(), true, &errorMsg ) )
       {
-        QString errorMsg;
-        if ( !filter.setContent( filterIt.value(), true, &errorMsg ) )
-        {
-          QgsDebugMsg( "soap request parse error" );
-          QgsDebugMsg( "error message: " + errorMsg );
-          QgsDebugMsg( "the xml string was:" );
-          QgsDebugMsg( filterIt.value() );
-        }
-        else
-        {
-          filterOk = true;
-        }
+        throw QgsMapServiceException( "RequestNotWellFormed", QString( "error message: %1. The XML string was: %2" ).arg( errorMsg ).arg( filterIt.value() ) );
       }
-      catch ( QgsMapServiceException& e )
+      else
       {
-        Q_UNUSED( e );
-        filterOk = false;
+        filterOk = true;
       }
     }
 
-
-    bool conversionSuccess;
-    double minx, miny, maxx, maxy;
-    bool bboxOk = false;
-    //read BBOX
-    QMap::const_iterator bbIt = mParameterMap.find( "BBOX" );
-    if ( bbIt == mParameterMap.end() )
+    //read EXP_FILTER
+    if ( !filterOk )
     {
-      minx = 0; miny = 0; maxx = 0; maxy = 0;
+      QMap::const_iterator expFilterIt = mParameterMap.find( "EXP_FILTER" );
+      if ( expFilterIt != mParameterMap.end() )
+      {
+        expFilterOk = true;
+        expFilter = expFilterIt.value();
+      }
     }
-    else
+
+    //read BBOX
+    if ( !filterOk )
     {
-      bboxOk = true;
-      QString bbString = bbIt.value();
-      minx = bbString.section( ",", 0, 0 ).toDouble( &conversionSuccess );
-      if ( !conversionSuccess ) {bboxOk = false;}
-      miny = bbString.section( ",", 1, 1 ).toDouble( &conversionSuccess );
-      if ( !conversionSuccess ) {bboxOk = false;}
-      maxx = bbString.section( ",", 2, 2 ).toDouble( &conversionSuccess );
-      if ( !conversionSuccess ) {bboxOk = false;}
-      maxy = bbString.section( ",", 3, 3 ).toDouble( &conversionSuccess );
-      if ( !conversionSuccess ) {bboxOk = false;}
+      QMap::const_iterator bbIt = mParameterMap.find( "BBOX" );
+      if ( bbIt == mParameterMap.end() )
+      {
+        minx = 0; miny = 0; maxx = 0; maxy = 0;
+      }
+      else
+      {
+        bool conversionSuccess;
+        bboxOk = true;
+        QString bbString = bbIt.value();
+        minx = bbString.section( ",", 0, 0 ).toDouble( &conversionSuccess );
+        if ( !conversionSuccess ) {bboxOk = false;}
+        miny = bbString.section( ",", 1, 1 ).toDouble( &conversionSuccess );
+        if ( !conversionSuccess ) {bboxOk = false;}
+        maxx = bbString.section( ",", 2, 2 ).toDouble( &conversionSuccess );
+        if ( !conversionSuccess ) {bboxOk = false;}
+        maxy = bbString.section( ",", 3, 3 ).toDouble( &conversionSuccess );
+        if ( !conversionSuccess ) {bboxOk = false;}
+      }
     }
+  }
+
+  //read MAXFEATURES
+  QMap::const_iterator mfIt = mParameterMap.find( "MAXFEATURES" );
+  if ( mfIt != mParameterMap.end() )
+  {
+    QString mfString = mfIt.value();
+    bool mfOk;
+    maxFeatures = mfString.toLong( &mfOk, 10 );
+    maxFeat = mfString.toLong( &mfOk, 10 );
+  }
 
-    //read MAXFEATURES
-    long maxFeat = layer->featureCount();
-    long featureCounter = 0;
-    QMap::const_iterator mfIt = mParameterMap.find( "MAXFEATURES" );
-    if ( mfIt != mParameterMap.end() )
+  //read PROPERTYNAME
+  mWithGeom = true;
+  mPropertyName = "*";
+  QMap::const_iterator pnIt = mParameterMap.find( "PROPERTYNAME" );
+  if ( pnIt != mParameterMap.end() )
+  {
+    mPropertyName = pnIt.value();
+  }
+
+  mTypeNames = mTypeName.split( "," );
+  foreach ( const QString &tnStr, mTypeNames )
+  {
+    mTypeName = tnStr;
+    layerList = mConfigParser->mapLayerFromTypeName( tnStr );
+    if ( layerList.size() < 1 )
     {
-      QString mfString = mfIt.value();
-      bool mfOk;
-      maxFeat = mfString.toLong( &mfOk, 10 );
-      if ( !mfOk ) { maxFeat = layer->featureCount(); }
+      mErrors << QString( "The layer for the TypeName '%1' is not found" ).arg( tnStr );
+      continue;
     }
 
-    //read PROPERTYNAME
-    mWithGeom = true;
-    QgsAttributeList attrIndexes = provider->attributeIndexes();
-    QMap::const_iterator pnIt = mParameterMap.find( "PROPERTYNAME" );
-    if ( pnIt != mParameterMap.end() )
+    currentLayer = layerList.at( 0 );
+
+    QgsVectorLayer* layer = dynamic_cast( currentLayer );
+    if ( layer && wfsLayersId.contains( layer->id() ) )
     {
-      QStringList attrList = pnIt.value().split( "," );
-      if ( attrList.size() > 0 )
+      //is there alias info for this vector layer?
+      QMap< int, QString > layerAliasInfo;
+      const QMap< QString, QString >& aliasMap = layer->attributeAliases();
+      QMap< QString, QString >::const_iterator aliasIt = aliasMap.constBegin();
+      for ( ; aliasIt != aliasMap.constEnd(); ++aliasIt )
       {
-        mWithGeom = false;
-        QStringList::const_iterator alstIt;
-        QList idxList;
-        QMap fieldMap = provider->fieldNameMap();
-        QMap::const_iterator fieldIt;
-        QString fieldName;
-        for ( alstIt = attrList.begin(); alstIt != attrList.end(); ++alstIt )
+        int attrIndex = layer->fieldNameIndex( aliasIt.key() );
+        if ( attrIndex != -1 )
         {
-          fieldName = *alstIt;
-          fieldIt = fieldMap.find( fieldName );
-          if ( fieldIt != fieldMap.end() )
+          layerAliasInfo.insert( attrIndex, aliasIt.value() );
+        }
+      }
+
+      //excluded attributes for this layer
+      const QSet& layerExcludedAttributes = layer->excludeAttributesWFS();
+
+      //do a select with searchRect and go through all the features
+      QgsVectorDataProvider* provider = layer->dataProvider();
+      if ( !provider )
+      {
+        mErrors << QString( "The layer's provider for the TypeName '%1' is not found" ).arg( tnStr );
+        continue;
+      }
+
+      QgsFeature feature;
+      QgsAttributeMap featureAttributes;
+      const QgsFieldMap& fields = provider->fields();
+
+      //map extent
+      QgsRectangle searchRect = layer->extent();
+
+      QgsAttributeList attrIndexes = provider->attributeIndexes();
+      if ( mPropertyName != "*" )
+      {
+        QStringList attrList = mPropertyName.split( "," );
+        if ( attrList.size() > 0 )
+        {
+          QStringList::const_iterator alstIt;
+          QList idxList;
+          QMap fieldMap = provider->fieldNameMap();
+          QMap::const_iterator fieldIt;
+          QString fieldName;
+          for ( alstIt = attrList.begin(); alstIt != attrList.end(); ++alstIt )
           {
-            idxList.append( fieldIt.value() );
+            fieldName = *alstIt;
+            fieldIt = fieldMap.find( fieldName );
+            if ( fieldIt != fieldMap.end() )
+            {
+              idxList.append( fieldIt.value() );
+            }
           }
-          else if ( fieldName == "geometry" )
+          if ( idxList.size() > 0 )
           {
-            mWithGeom = true;
+            attrIndexes = idxList;
           }
         }
-        if ( idxList.size() > 0 || mWithGeom )
+      }
+
+      if ( maxFeatures == -1 )
+        maxFeat += layer->featureCount();
+
+      if ( bboxOk )
+        searchRect.set( minx, miny, maxx, maxy );
+      else
+        searchRect.set( searchRect.xMinimum() - 0.000001
+                        , searchRect.yMinimum() - 0.000001
+                        , searchRect.xMaximum() + 0.000001
+                        , searchRect.yMaximum() + 0.000001 );
+      QgsCoordinateReferenceSystem layerCrs = layer->crs();
+
+      long featCounter = 0;
+      if ( featureIdOk )
+      {
+        foreach ( const QString &fidStr, featureIdList )
         {
-          attrIndexes = idxList;
+          if ( !fidStr.startsWith( tnStr ) )
+            continue;
+          provider->featureAtId( fidStr.section( ".", 1, 1 ).toInt(), feature, mWithGeom, attrIndexes );
+
+          if ( featureCounter == 0 )
+            startGetFeature( request, format, layerCrs, &searchRect );
+
+          sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+          ++featCounter;
+          ++featureCounter;
         }
-        else
+      }
+      else if ( expFilterOk )
+      {
+        provider->select( attrIndexes, searchRect, mWithGeom, true );
+        QgsExpression *mFilter = new QgsExpression( expFilter );
+        if ( mFilter->hasParserError() )
         {
-          mWithGeom = true;
+          throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
+        }
+        if ( mFilter )
+        {
+          while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
+          {
+            QVariant res = mFilter->evaluate( &feature, fields );
+            if ( mFilter->hasEvalError() )
+            {
+              throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
+            }
+            if ( res.toInt() != 0 )
+            {
+              if ( featureCounter == 0 )
+                startGetFeature( request, format, layerCrs, &searchRect );
+
+              sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+              ++featCounter;
+              ++featureCounter;
+            }
+          }
+          delete mFilter;
         }
       }
-    }
+      else if ( filterOk )
+      {
+        provider->select( attrIndexes, searchRect, mWithGeom, true );
+        QDomElement filterElem = filter.firstChildElement();
+        QDomNodeList fidNodes = filterElem.elementsByTagName( "FeatureId" );
+        if ( fidNodes.size() > 0 )
+        {
+          QDomElement fidElem;
+          QString fid = "";
+          for ( int f = 0; f < fidNodes.size(); f++ )
+          {
+            fidElem = fidNodes.at( f ).toElement();
+            fid = fidElem.attribute( "fid" );
+            if ( fid.contains( "." ) )
+            {
+              if ( fid.section( ".", 0, 0 ) != mTypeName )
+                continue;
+              fid = fid.section( ".", 1, 1 );
+            }
 
-    if ( bboxOk )
-      searchRect.set( minx, miny, maxx, maxy );
-    else
-      searchRect.set( searchRect.xMinimum() - 0.000001
-                      , searchRect.yMinimum() - 0.000001
-                      , searchRect.xMaximum() + 0.000001
-                      , searchRect.yMaximum() + 0.000001 );
-    QgsCoordinateReferenceSystem layerCrs = layer->crs();
+            provider->featureAtId( fid.toInt(), feature, mWithGeom, attrIndexes );
 
-    startGetFeature( request, format, layerCrs, &searchRect );
+            if ( featureCounter == 0 )
+              startGetFeature( request, format, layerCrs, &searchRect );
 
-    if ( fidOk )
-    {
-      provider->featureAtId( fid.toInt(), feature, mWithGeom, attrIndexes );
-      sendGetFeature( request, format, &feature, 0, layerCrs, fields, layerExcludedAttributes );
-    }
-    else if ( filterOk )
-    {
-      provider->select( attrIndexes, searchRect, mWithGeom, true );
-      try
-      {
-        QgsFilter* mFilter = QgsFilter::createFilterFromXml( filter.firstChild().toElement().firstChild().toElement(), layer );
-        while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
+            sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+
+            fid = "";
+            ++featCounter;
+            ++featureCounter;
+          }
+        }
+        else if ( filterElem.firstChildElement().tagName() == "BBOX" )
         {
-          if ( mFilter )
+          QDomElement bboxElem = filterElem.firstChildElement();
+          QDomElement childElem = bboxElem.firstChildElement();
+          while ( !childElem.isNull() )
           {
-            if ( mFilter->evaluate( feature ) )
+            if ( childElem.tagName() == "Box" )
             {
-              sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
-              ++featureCounter;
+              QgsRectangle* rect = new QgsRectangle( childElem );
+              provider->select( attrIndexes, *rect, mWithGeom, true );
             }
+            else if ( childElem.tagName() != "PropertyName" )
+            {
+              QgsGeometry* geom = QgsGeometry::fromGML2( childElem );
+              provider->select( attrIndexes, geom->boundingBox(), mWithGeom, true );
+            }
+            childElem = childElem.nextSiblingElement();
           }
-          else
+          while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
           {
-            sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
+            if ( featureCounter == 0 )
+              startGetFeature( request, format, layerCrs, &searchRect );
+
+            sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+            ++featCounter;
             ++featureCounter;
           }
         }
-        delete mFilter;
+        else
+        {
+          QgsExpression *mFilter = QgsExpression::createFromOgcFilter( filterElem );
+          if ( mFilter->hasParserError() )
+          {
+            throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
+          }
+          if ( mFilter )
+          {
+            while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
+            {
+              QVariant res = mFilter->evaluate( &feature, fields );
+              if ( mFilter->hasEvalError() )
+              {
+                throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
+              }
+              if ( res.toInt() != 0 )
+              {
+                if ( featureCounter == 0 )
+                  startGetFeature( request, format, layerCrs, &searchRect );
+
+                sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
+                ++featureCounter;
+                ++featCounter;
+              }
+            }
+          }
+          delete mFilter;
+        }
       }
-      catch ( QgsMapServiceException& e )
+      else
       {
-        Q_UNUSED( e );
-
+        provider->select( attrIndexes, searchRect, mWithGeom, true );
         while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
         {
-          sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
+          if ( featureCounter == 0 )
+            startGetFeature( request, format, layerCrs, &searchRect );
+
+          sendGetFeature( request, format, &feature, featCounter, layerCrs, fields, layerExcludedAttributes );
+          ++featCounter;
           ++featureCounter;
         }
       }
+
     }
     else
     {
-      provider->select( attrIndexes, searchRect, mWithGeom, true );
-      while ( provider->nextFeature( feature ) && featureCounter < maxFeat )
-      {
-        sendGetFeature( request, format, &feature, featureCounter, layerCrs, fields, layerExcludedAttributes );
-        ++featureCounter;
-      }
+      mErrors << QString( "The layer for the TypeName '%1' is not a WFS layer" ).arg( tnStr );
     }
 
-    endGetFeature( request, format );
   }
+  if ( featureCounter == 0 )
+    throw QgsMapServiceException( "RequestNotWellFormed", mErrors.join( ". " ) );
   else
-  {
-    return 2;
-  }
+    endGetFeature( request, format );
+
   return 0;
 }
 
@@ -597,6 +1011,10 @@ void QgsWFSServer::startGetFeature( QgsRequestHandler& request, const QString& f
       {
         mapUrl.removeQueryItem( queryIt->first );
       }
+      else if ( queryIt->first.compare( "TYPENAME", Qt::CaseInsensitive ) == 0 )
+      {
+        mapUrl.removeQueryItem( queryIt->first );
+      }
       else if ( queryIt->first.compare( "FILTER", Qt::CaseInsensitive ) == 0 )
       {
         mapUrl.removeQueryItem( queryIt->first );
@@ -614,6 +1032,7 @@ void QgsWFSServer::startGetFeature( QgsRequestHandler& request, const QString& f
         mapUrl.removeQueryItem( queryIt->first );
       }
     }
+    mapUrl.addQueryItem( "TYPENAME", mTypeNames.join( "," ) );
     mapUrl.addQueryItem( "OUTPUTFORMAT", "XMLSCHEMA" );
     hrefString = mapUrl.toString();
 
@@ -651,6 +1070,9 @@ void QgsWFSServer::startGetFeature( QgsRequestHandler& request, const QString& f
 
 void QgsWFSServer::sendGetFeature( QgsRequestHandler& request, const QString& format, QgsFeature* feat, int featIdx, QgsCoordinateReferenceSystem& crs, QMap< int, QgsField > fields, QSet excludedAttributes ) /*const*/
 {
+  if ( !feat->isValid() )
+    return;
+
   QByteArray result;
   if ( format == "GeoJSON" )
   {
@@ -748,6 +1170,9 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
       typeName = actionElem.attribute( "typeName" );
     }
 
+    if ( typeName.contains( ":" ) )
+      typeName = typeName.section( ":", 1, 1 );
+
     QDomNodeList typeNameList = mDocElem.elementsByTagName( typeName );
     if ( typeNameList.count() == 0 )
     {
@@ -772,8 +1197,8 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
   respElem.setAttribute( "version", "1.0.0" );
   resp.appendChild( respElem );
 
-  // Store the created feature id
-  QgsFeatureIds insertResults;
+  // Store the created feature id for WFS
+  QStringList insertResults;
   // Get the WFS layers id
   QStringList wfsLayersId = mConfigParser->wfsLayers();
 
@@ -786,9 +1211,9 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
   {
     // Get the vector layer
     typeNameElem = docChildNodes.at( i ).toElement();
-    typeName = typeNameElem.tagName();
+    mTypeName = typeNameElem.tagName();
 
-    layerList = mConfigParser->mapLayerFromStyle( typeName, "" );
+    layerList = mConfigParser->mapLayerFromTypeName( mTypeName );
     currentLayer = layerList.at( 0 );
 
     QgsVectorLayer* layer = qobject_cast( currentLayer );
@@ -1004,13 +1429,12 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
             }
             // Add the feature to th layer
             // and store it to put it's Feature Id in the response
-            layer->addFeature( *f, true );
-            inFeatList << *f;
+            inFeatList.append( *f );
           }
         }
       }
       // Commit the changes of the insert elements
-      if ( !layer->commitChanges() )
+      if ( !provider->addFeatures( inFeatList ) )
       {
         QDomElement trElem = doc.createElement( "TransactionResult" );
         QDomElement stElem = doc.createElement( "Status" );
@@ -1024,6 +1448,13 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
         trElem.appendChild( locElem );
 
         QDomElement mesElem = doc.createElement( "Message" );
+        QStringList mesErrors;
+        mesErrors << QString( "ERROR: %n feature(s) not added." ).arg( inFeatList.size() );
+        if ( provider->hasErrors() )
+        {
+          mesErrors << "\n  Provider errors:" << provider->errors();
+          provider->clearErrors();
+        }
         mesElem.appendChild( doc.createTextNode( layer->commitErrors().join( "\n  " ) ) );
         trElem.appendChild( mesElem );
 
@@ -1032,7 +1463,7 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
       // Get the Feature Ids of the inserted feature
       for ( int j = 0; j < inFeatList.size(); j++ )
       {
-        insertResults.insert( inFeatList[j].id() );
+        insertResults << mTypeName + "." + QString::number( inFeatList[j].id() );
       }
     }
   }
@@ -1040,17 +1471,14 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
   // Put the Feature Ids of the inserted feature
   if ( insertResults.size() > 0 )
   {
-    QDomElement irsElem = doc.createElement( "InsertResults" );
-    QgsFeatureIds::const_iterator irIt = insertResults.constBegin();
-    for ( ; irIt != insertResults.constEnd(); ++irIt )
+    foreach ( const QString &fidStr, insertResults )
     {
       QDomElement irElem = doc.createElement( "InsertResult" );
       QDomElement fiElem = doc.createElement( "ogc:FeatureId" );
-      fiElem.setAttribute( "fid", *irIt );
+      fiElem.setAttribute( "fid", fidStr );
       irElem.appendChild( fiElem );
-      irsElem.appendChild( irElem );
+      respElem.appendChild( irElem );
     }
-    respElem.appendChild( irsElem );
   }
 
   // Set the transaction reposne for success
@@ -1064,27 +1492,46 @@ QDomDocument QgsWFSServer::transaction( const QString& requestBody )
   return resp;
 }
 
-QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( QDomElement filter, QgsVectorLayer* layer )
+QgsFeatureIds QgsWFSServer::getFeatureIdsFromFilter( QDomElement filterElem, QgsVectorLayer* layer )
 {
   QgsFeatureIds fids;
 
   QgsVectorDataProvider* provider = layer->dataProvider();
-  QDomElement filterFirstElem = filter.firstChild().toElement();
+  QDomNodeList fidNodes = filterElem.elementsByTagName( "FeatureId" );
 
-  if ( filterFirstElem.localName() == "FeatureId" )
+  if ( fidNodes.size() != 0 )
   {
+    QDomElement fidElem;
+    QString fid;
     bool conversionSuccess;
-    fids.insert( filterFirstElem.attribute( "fid" ).toInt( &conversionSuccess ) );
+    for ( int i = 0; i < fidNodes.size(); ++i )
+    {
+      fidElem = fidNodes.at( i ).toElement();
+      fid = fidElem.attribute( "fid" );
+      if ( fid.contains( "." ) )
+        fid = fid.section( ".", 1, 1 );
+      fids.insert( fid.toInt( &conversionSuccess ) );
+    }
   }
   else
   {
-    QgsFeature feature;
-    QgsFilter* mFilter = QgsFilter::createFilterFromXml( filter, layer );
-    while ( provider->nextFeature( feature ) )
+    QgsExpression *mFilter = QgsExpression::createFromOgcFilter( filterElem );
+    if ( mFilter->hasParserError() )
     {
-      if ( mFilter )
+      throw QgsMapServiceException( "RequestNotWellFormed", mFilter->parserErrorString() );
+    }
+    if ( mFilter )
+    {
+      QgsFeature feature;
+      const QgsFieldMap& fields = provider->fields();
+      while ( provider->nextFeature( feature ) )
       {
-        if ( mFilter->evaluate( feature ) )
+        QVariant res = mFilter->evaluate( &feature, fields );
+        if ( mFilter->hasEvalError() )
+        {
+          throw QgsMapServiceException( "RequestNotWellFormed", mFilter->evalErrorString() );
+        }
+        if ( res.toInt() != 0 )
         {
           fids.insert( feature.id() );
         }
@@ -1100,7 +1547,7 @@ QString QgsWFSServer::createFeatureGeoJSON( QgsFeature* feat, QgsCoordinateRefer
   QString fStr = "{\"type\": \"Feature\",\n";
 
   fStr += "   \"id\": ";
-  fStr +=  QString::number( feat->id() );
+  fStr += mTypeName + "." + QString::number( feat->id() );
   fStr += ",\n";
 
   QgsGeometry* geom = feat->geometry();
@@ -1161,8 +1608,8 @@ QDomElement QgsWFSServer::createFeatureGML2( QgsFeature* feat, QDomDocument& doc
   QDomElement featureElement = doc.createElement( "gml:featureMember"/*wfs:FeatureMember*/ );
 
   //qgs:%TYPENAME%
-  QDomElement typeNameElement = doc.createElement( "qgs:" + mTypeName.replace( QString( " " ), QString( "_" ) )/*qgs:%TYPENAME%*/ );
-  typeNameElement.setAttribute( "fid", QString::number( feat->id() ) );
+  QDomElement typeNameElement = doc.createElement( "qgs:" + mTypeName /*qgs:%TYPENAME%*/ );
+  typeNameElement.setAttribute( "fid", mTypeName + "." + QString::number( feat->id() ) );
   featureElement.appendChild( typeNameElement );
 
   if ( mWithGeom )
diff --git a/src/mapserver/qgswfsserver.h b/src/mapserver/qgswfsserver.h
index 2c33f4ba1de9..0083eff9efac 100644
--- a/src/mapserver/qgswfsserver.h
+++ b/src/mapserver/qgswfsserver.h
@@ -82,8 +82,14 @@ class QgsWFSServer
     /**Map containing the WMS parameters*/
     QMap mParameterMap;
     QgsConfigParser* mConfigParser;
+    /* The Type of Feature created */
     QString mTypeName;
+    /* The list of Feature's Type requested */
+    QStringList mTypeNames;
+    QString mPropertyName;
     bool mWithGeom;
+    /* Error messages */
+    QStringList mErrors;
 
   protected:
 
diff --git a/src/mapserver/qgswmsserver.cpp b/src/mapserver/qgswmsserver.cpp
index 961ff4384a5d..c7bdeb0c7178 100644
--- a/src/mapserver/qgswmsserver.cpp
+++ b/src/mapserver/qgswmsserver.cpp
@@ -14,6 +14,7 @@
  *   (at your option) any later version.                                   *
  *                                                                         *
  ***************************************************************************/
+
 #include "qgswmsserver.h"
 #include "qgsconfigparser.h"
 #include "qgscrscache.h"
@@ -306,11 +307,11 @@ QImage* QgsWMSServer::getLegendGraphics()
   double fontOversamplingFactor = 10.0;
 
   //get icon size, spaces between legend items and font from config parser
-  double boxSpace, layerSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight;
+  double boxSpace, layerSpace, layerTitleSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight;
   QFont layerFont, itemFont;
   QColor layerFontColor, itemFontColor;
-  legendParameters( mmToPixelFactor, fontOversamplingFactor, boxSpace, layerSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight,
-                    layerFont, itemFont, layerFontColor, itemFontColor );
+  legendParameters( mmToPixelFactor, fontOversamplingFactor, boxSpace, layerSpace, layerTitleSpace, symbolSpace,
+                    iconLabelSpace, symbolWidth, symbolHeight, layerFont, itemFont, layerFontColor, itemFontColor );
 
   //first find out image dimensions without painting
   QStandardItem* rootItem = legendModel.invisibleRootItem();
@@ -331,9 +332,12 @@ QImage* QgsWMSServer::getLegendGraphics()
     QgsComposerLayerItem* layerItem = dynamic_cast( rootItem->child( i ) );
     if ( layerItem )
     {
-
+      if ( i > 0 )
+      {
+        currentY += layerSpace;
+      }
       drawLegendLayerItem( layerItem, 0, maxTextWidth, maxSymbolWidth, currentY, layerFont, layerFontColor, itemFont, itemFontColor,
-                           boxSpace, layerSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight, fontOversamplingFactor,
+                           boxSpace, layerSpace, layerTitleSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight, fontOversamplingFactor,
                            theImage->dotsPerMeterX() * 0.0254 );
     }
   }
@@ -352,10 +356,15 @@ QImage* QgsWMSServer::getLegendGraphics()
     QgsComposerLayerItem* layerItem = dynamic_cast( rootItem->child( i ) );
     if ( layerItem )
     {
+      if ( i > 0 )
+      {
+        currentY += layerSpace;
+      }
       drawLegendLayerItem( layerItem, &p, maxTextWidth, maxSymbolWidth, currentY, layerFont, layerFontColor, itemFont, itemFontColor, boxSpace,
-                           layerSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight, fontOversamplingFactor,
+                           layerSpace, layerTitleSpace, symbolSpace, iconLabelSpace, symbolWidth, symbolHeight, fontOversamplingFactor,
                            theImage->dotsPerMeterX() * 0.0254 );
     }
+    currentY += layerSpace;
   }
 
   QgsMapLayerRegistry::instance()->mapLayers().clear();
@@ -363,7 +372,8 @@ QImage* QgsWMSServer::getLegendGraphics()
   return paintImage;
 }
 
-void QgsWMSServer::legendParameters( double mmToPixelFactor, double fontOversamplingFactor, double& boxSpace, double& layerSpace, double& symbolSpace, double& iconLabelSpace, double& symbolWidth, double& symbolHeight,
+void QgsWMSServer::legendParameters( double mmToPixelFactor, double fontOversamplingFactor, double& boxSpace, double& layerSpace, double& layerTitleSpace,
+                                     double& symbolSpace, double& iconLabelSpace, double& symbolWidth, double& symbolHeight,
                                      QFont& layerFont, QFont& itemFont, QColor& layerFontColor, QColor& itemFontColor )
 {
   //spaces between legend elements
@@ -373,6 +383,9 @@ void QgsWMSServer::legendParameters( double mmToPixelFactor, double fontOversamp
   QMap::const_iterator layerSpaceIt = mParameterMap.find( "LAYERSPACE" );
   layerSpace = ( layerSpaceIt == mParameterMap.constEnd() ) ? mConfigParser->legendLayerSpace() * mmToPixelFactor :
                layerSpaceIt.value().toDouble() * mmToPixelFactor;
+  QMap::const_iterator layerTitleSpaceIt = mParameterMap.find( "LAYERTITLESPACE" );
+  layerTitleSpace = ( layerTitleSpaceIt == mParameterMap.constEnd() ) ? mConfigParser->legendLayerTitleSpace() * mmToPixelFactor :
+                    layerTitleSpaceIt.value().toDouble() * mmToPixelFactor;
   QMap::const_iterator symbolSpaceIt = mParameterMap.find( "SYMBOLSPACE" );
   symbolSpace = ( symbolSpaceIt == mParameterMap.constEnd() ) ? mConfigParser->legendSymbolSpace() * mmToPixelFactor :
                 symbolSpaceIt.value().toDouble() * mmToPixelFactor;
@@ -538,6 +551,7 @@ QByteArray* QgsWMSServer::getPrint( const QString& formatString )
   else if ( formatString.compare( "png", Qt::CaseInsensitive ) == 0 || formatString.compare( "jpg", Qt::CaseInsensitive ) == 0 )
   {
     QImage image = c->printPageAsRaster( 0 ); //can only return the first page if pixmap is requested
+
     ba = new QByteArray();
     QBuffer buffer( ba );
     buffer.open( QIODevice::WriteOnly );
@@ -600,8 +614,20 @@ QImage* QgsWMSServer::getMap()
   QMap originalLayerFilters = applyRequestedLayerFilters( layersList );
   QStringList selectedLayerIdList = applyFeatureSelections( layersList );
 
+  QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> > bkVectorRenderers;
+  QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > > bkRasterRenderers;
+  QList< QPair< QgsVectorLayer*, unsigned int> > bkVectorOld;
+
+  applyOpacities( layersList, bkVectorRenderers, bkVectorOld, bkRasterRenderers );
+
   mMapRenderer->render( &thePainter );
+  if ( mConfigParser )
+  {
+    //draw configuration format specific overlay items
+    mConfigParser->drawOverlays( &thePainter, theImage->dotsPerMeterX() / 1000.0 * 25.4, theImage->width(), theImage->height() );
+  }
 
+  restoreOpacities( bkVectorRenderers, bkVectorOld, bkRasterRenderers );
   restoreLayerFilters( originalLayerFilters );
   clearFeatureSelections( selectedLayerIdList );
 
@@ -740,6 +766,14 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
   {
     getFeatureInfoElement = result.createElementNS( featureInfoElemNS, featureInfoElemName );
   }
+  //feature info schema
+  QString featureInfoSchema = mConfigParser->featureInfoSchema();
+  if ( !featureInfoSchema.isEmpty() )
+  {
+    getFeatureInfoElement.setAttribute( "xmlns:xsi", "http://www.w3.org/2001/XMLSchema-instance" );
+    getFeatureInfoElement.setAttribute( "xsi:schemaLocation", featureInfoSchema );
+  }
+
   result.appendChild( getFeatureInfoElement );
 
   QStringList nonIdentifiableLayers = mConfigParser->identifyDisabledLayers();
@@ -756,6 +790,8 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
     renderContext.setPainter( 0 );
   }
 
+  bool sia2045 = mConfigParser->featureInfoFormatSIA2045();
+
   //layers can have assigned a different name for GetCapabilities
   QHash layerAliasMap = mConfigParser->featureInfoLayerAliasMap();
 
@@ -797,6 +833,10 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
       }
       layerElement.setAttribute( "name", layerName );
       getFeatureInfoElement.appendChild( layerElement );
+      if ( sia2045 ) //the name might not be unique after alias replacement
+      {
+        layerElement.setAttribute( "id", currentLayer->id() );
+      }
 
       //switch depending on vector or raster
       QgsVectorLayer* vectorLayer = dynamic_cast( currentLayer );
@@ -837,6 +877,11 @@ int QgsWMSServer::getFeatureInfo( QDomDocument& result, QString version )
     getFeatureInfoElement.insertBefore( bBoxElem, QDomNode() ); //insert as first child
   }
 
+  if ( sia2045 && mParameterMap.value( "INFO_FORMAT" ).compare( "text/xml", Qt::CaseInsensitive ) == 0 )
+  {
+    convertFeatureInfoToSIA2045( result );
+  }
+
   restoreLayerFilters( originalLayerFilters );
   delete featuresRect;
   delete infoPoint;
@@ -1411,9 +1456,10 @@ QStringList QgsWMSServer::layerSet( const QStringList &layersList,
 
 void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p, double& maxTextWidth, double& maxSymbolWidth, double& currentY, const QFont& layerFont,
                                         const QColor& layerFontColor, const QFont& itemFont, const QColor&  itemFontColor, double boxSpace, double layerSpace,
-                                        double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor,
+                                        double layerTitleSpace, double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor,
                                         double dpi ) const
 {
+  Q_UNUSED( layerSpace );
   if ( !item )
   {
     return;
@@ -1441,7 +1487,7 @@ void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p,
     }
   }
 
-  currentY += layerSpace;
+  currentY += layerTitleSpace;
 
   int opacity = 0;
   QgsMapLayer* layerInstance = QgsMapLayerRegistry::instance()->mapLayer( item->layerID() );
@@ -1523,7 +1569,10 @@ void QgsWMSServer::drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p,
     }
 
     currentY += symbolItemHeight;
-    currentY += symbolSpace;
+    if ( i < ( nChildItems - 1 ) )
+    {
+      currentY += symbolSpace;
+    }
   }
 }
 
@@ -1770,33 +1819,6 @@ QMap QgsWMSServer::applyRequestedLayerFilters( const QStringLi
       }
       mMapRenderer->setExtent( filterExtent );
     }
-
-    //No BBOX parameter in request. We use the union of the filtered layer
-    //to provide the functionality of zooming to selected records via (enhanced) WMS.
-    if ( mMapRenderer && mMapRenderer->extent().isEmpty() )
-    {
-      QgsRectangle filterExtent;
-      QMap::const_iterator filterIt = filterMap.constBegin();
-      for ( ; filterIt != filterMap.constEnd(); ++filterIt )
-      {
-        QgsMapLayer* mapLayer = QgsMapLayerRegistry::instance()->mapLayer( filterIt.key() );
-        if ( !mapLayer )
-        {
-          continue;
-        }
-
-        QgsRectangle layerExtent = mapLayer->extent();
-        if ( filterExtent.isEmpty() )
-        {
-          filterExtent = layerExtent;
-        }
-        else
-        {
-          filterExtent.combineExtentWith( &layerExtent );
-        }
-      }
-      mMapRenderer->setExtent( filterExtent );
-    }
   }
   return filterMap;
 }
@@ -1964,6 +1986,116 @@ void QgsWMSServer::clearFeatureSelections( const QStringList& layerIds ) const
   return;
 }
 
+void QgsWMSServer::applyOpacities( const QStringList& layerList, QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >& vectorRenderers,
+                                   QList< QPair< QgsVectorLayer*, unsigned int> >& vectorOld,
+                                   QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers )
+{
+  //get opacity list
+  QMap::const_iterator opIt = mParameterMap.find( "OPACITIES" );
+  if ( opIt == mParameterMap.constEnd() )
+  {
+    return;
+  }
+  QStringList opacityList = opIt.value().split( "," );
+
+  //collect leaf layers and their opacity
+  QList< QPair< QgsMapLayer*, int > > layerOpacityList;
+  QStringList::const_iterator oIt = opacityList.constBegin();
+  QStringList::const_iterator lIt = layerList.constBegin();
+  for ( ; oIt != opacityList.constEnd(); ++oIt, ++lIt )
+  {
+    //get layer list for
+    int opacity = oIt->toInt();
+    if ( opacity < 0 || opacity > 255 )
+    {
+      continue;
+    }
+    QList llist = mConfigParser->mapLayerFromStyle( *lIt, "" );
+    QList::const_iterator lListIt = llist.constBegin();
+    for ( ; lListIt != llist.constEnd(); ++lListIt )
+    {
+      layerOpacityList.push_back( qMakePair( *lListIt, opacity ) );
+    }
+  }
+
+  QList< QPair< QgsMapLayer*, int > >::const_iterator lOpIt = layerOpacityList.constBegin();
+  for ( ; lOpIt != layerOpacityList.constEnd(); ++lOpIt )
+  {
+    //vector or raster?
+    QgsMapLayer* ml = lOpIt->first;
+    int opacity = lOpIt->second;
+    if ( !ml || opacity == 255 )
+    {
+      continue;
+    }
+
+    if ( ml->type() == QgsMapLayer::VectorLayer )
+    {
+      QgsVectorLayer* vl = qobject_cast( ml );
+      if ( vl && vl->isUsingRendererV2() )
+      {
+        QgsFeatureRendererV2* rendererV2 = vl->rendererV2();
+        //backup old renderer
+        vectorRenderers.push_back( qMakePair( vl, rendererV2->clone() ) );
+        //modify symbols of current renderer
+        QgsSymbolV2List symbolList = rendererV2->symbols();
+        QgsSymbolV2List::iterator symbolIt = symbolList.begin();
+        for ( ; symbolIt != symbolList.end(); ++symbolIt )
+        {
+          ( *symbolIt )->setAlpha(( *symbolIt )->alpha() * opacity / 255.0 );
+        }
+      }
+      else //old symbology
+      {
+        vectorOld.push_back( qMakePair( vl, vl->getTransparency() ) );
+        vl->setTransparency( opacity );
+      }
+
+    }
+    else if ( ml->type() == QgsMapLayer::RasterLayer )
+    {
+      QgsRasterLayer* rl = qobject_cast( ml );
+      if ( rl )
+      {
+        QgsRasterRenderer* rasterRenderer = rl->renderer();
+        if ( rasterRenderer )
+        {
+          rasterRenderers.push_back( qMakePair( rl, dynamic_cast( rasterRenderer->clone() ) ) );
+          rasterRenderer->setOpacity( opacity / 255.0 );
+        }
+      }
+    }
+  }
+}
+
+void QgsWMSServer::restoreOpacities( QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >& vectorRenderers,
+                                     QList< QPair< QgsVectorLayer*, unsigned int> >& vectorOld,
+                                     QList < QPair< QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers )
+{
+  if ( vectorRenderers.isEmpty() && vectorOld.isEmpty() && rasterRenderers.isEmpty() )
+  {
+    return;
+  }
+
+  QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >::iterator vIt = vectorRenderers.begin();
+  for ( ; vIt != vectorRenderers.end(); ++vIt )
+  {
+    ( *vIt ).first->setRendererV2(( *vIt ).second );
+  }
+
+  QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > >::iterator rIt = rasterRenderers.begin();
+  for ( ; rIt != rasterRenderers.end(); ++rIt )
+  {
+    ( *rIt ).first->setRenderer(( *rIt ).second );
+  }
+
+  QList< QPair< QgsVectorLayer*, unsigned int> >::iterator oIt = vectorOld.begin();
+  for ( ; oIt != vectorOld.end(); ++oIt )
+  {
+    ( *oIt ).first->setTransparency(( *oIt ).second );
+  }
+}
+
 bool QgsWMSServer::checkMaximumWidthHeight() const
 {
   //test if maxWidth / maxHeight set and WIDTH / HEIGHT parameter is in the range
@@ -2050,3 +2182,119 @@ void QgsWMSServer::addXMLDeclaration( QDomDocument& doc ) const
   QDomProcessingInstruction xmlDeclaration = doc.createProcessingInstruction( "xml", "version=\"1.0\"" );
   doc.appendChild( xmlDeclaration );
 }
+
+void QgsWMSServer::convertFeatureInfoToSIA2045( QDomDocument& doc )
+{
+  QDomDocument SIAInfoDoc;
+  QDomElement infoDocElement = doc.documentElement();
+  QDomElement SIAInfoDocElement = SIAInfoDoc.importNode( infoDocElement, false ).toElement();
+  SIAInfoDoc.appendChild( SIAInfoDocElement );
+
+  QString currentAttributeName;
+  QString currentAttributeValue;
+  QDomElement currentAttributeElem;
+  QString currentLayerName;
+  QDomElement currentLayerElem;
+  QDomNodeList layerNodeList = infoDocElement.elementsByTagName( "Layer" );
+  for ( int i = 0; i < layerNodeList.size(); ++i )
+  {
+    currentLayerElem = layerNodeList.at( i ).toElement();
+    currentLayerName = currentLayerElem.attribute( "name" );
+
+    QDomElement currentFeatureElem;
+
+    QDomNodeList featureList = currentLayerElem.elementsByTagName( "Feature" );
+    if ( featureList.size() < 1 )
+    {
+      //raster?
+      QDomNodeList attributeList = currentLayerElem.elementsByTagName( "Attribute" );
+      QDomElement rasterLayerElem;
+      if ( attributeList.size() > 0 )
+      {
+        rasterLayerElem = SIAInfoDoc.createElement( currentLayerName );
+      }
+      for ( int j = 0; j < attributeList.size(); ++j )
+      {
+        currentAttributeElem = attributeList.at( j ).toElement();
+        currentAttributeName = currentAttributeElem.attribute( "name" );
+        currentAttributeValue = currentAttributeElem.attribute( "value" );
+        QDomElement outAttributeElem = SIAInfoDoc.createElement( currentAttributeName );
+        QDomText outAttributeText = SIAInfoDoc.createTextNode( currentAttributeValue );
+        outAttributeElem.appendChild( outAttributeText );
+        rasterLayerElem.appendChild( outAttributeElem );
+      }
+      if ( attributeList.size() > 0 )
+      {
+        SIAInfoDocElement.appendChild( rasterLayerElem );
+      }
+    }
+    else //vector
+    {
+      //property attributes
+      QSet layerPropertyAttributes;
+      QString currentLayerId = currentLayerElem.attribute( "id" );
+      if ( !currentLayerId.isEmpty() )
+      {
+        QgsMapLayer* currentLayer = QgsMapLayerRegistry::instance()->mapLayer( currentLayerId );
+        if ( currentLayer )
+        {
+          QString WMSPropertyAttributesString = currentLayer->customProperty( "WMSPropertyAttributes" ).toString();
+          if ( !WMSPropertyAttributesString.isEmpty() )
+          {
+            QStringList propertyList = WMSPropertyAttributesString.split( "//" );
+            QStringList::const_iterator propertyIt = propertyList.constBegin();
+            for ( ; propertyIt != propertyList.constEnd(); ++propertyIt )
+            {
+              layerPropertyAttributes.insert( *propertyIt );
+            }
+          }
+        }
+      }
+
+      QDomElement propertyRefChild; //child to insert the next property after (or
+      for ( int j = 0; j < featureList.size(); ++j )
+      {
+        QDomElement SIAFeatureElem = SIAInfoDoc.createElement( currentLayerName );
+        currentFeatureElem = featureList.at( j ).toElement();
+        QDomNodeList attributeList = currentFeatureElem.elementsByTagName( "Attribute" );
+
+        for ( int k = 0; k < attributeList.size(); ++k )
+        {
+          currentAttributeElem = attributeList.at( k ).toElement();
+          currentAttributeName = currentAttributeElem.attribute( "name" );
+          currentAttributeValue = currentAttributeElem.attribute( "value" );
+          if ( layerPropertyAttributes.contains( currentAttributeName ) )
+          {
+            QDomElement propertyElem = SIAInfoDoc.createElement( "property" );
+            QDomElement identifierElem = SIAInfoDoc.createElement( "identifier" );
+            QDomText identifierText = SIAInfoDoc.createTextNode( currentAttributeName );
+            identifierElem.appendChild( identifierText );
+            QDomElement valueElem = SIAInfoDoc.createElement( "value" );
+            QDomText valueText = SIAInfoDoc.createTextNode( currentAttributeValue );
+            valueElem.appendChild( valueText );
+            propertyElem.appendChild( identifierElem );
+            propertyElem.appendChild( valueElem );
+            if ( propertyRefChild.isNull() )
+            {
+              SIAFeatureElem.insertBefore( propertyElem, QDomNode() );
+              propertyRefChild = propertyElem;
+            }
+            else
+            {
+              SIAFeatureElem.insertAfter( propertyElem, propertyRefChild );
+            }
+          }
+          else
+          {
+            QDomElement SIAAttributeElem = SIAInfoDoc.createElement( currentAttributeName );
+            QDomText SIAAttributeText = SIAInfoDoc.createTextNode( currentAttributeValue );
+            SIAAttributeElem.appendChild( SIAAttributeText );
+            SIAFeatureElem.appendChild( SIAAttributeElem );
+          }
+        }
+        SIAInfoDocElement.appendChild( SIAFeatureElem );
+      }
+    }
+  }
+  doc = SIAInfoDoc;
+}
diff --git a/src/mapserver/qgswmsserver.h b/src/mapserver/qgswmsserver.h
index 8f9ae489ab3f..8b653e09cf0c 100644
--- a/src/mapserver/qgswmsserver.h
+++ b/src/mapserver/qgswmsserver.h
@@ -20,6 +20,7 @@
 
 #include 
 #include 
+#include 
 #include 
 #include 
 
@@ -28,10 +29,12 @@ class QgsComposerLayerItem;
 class QgsComposerLegendItem;
 class QgsComposition;
 class QgsConfigParser;
+class QgsFeatureRendererV2;
 class QgsMapLayer;
 class QgsMapRenderer;
 class QgsPoint;
 class QgsRasterLayer;
+class QgsRasterRenderer;
 class QgsRectangle;
 class QgsRenderContext;
 class QgsVectorLayer;
@@ -133,7 +136,7 @@ class QgsWMSServer
       */
     void drawLegendLayerItem( QgsComposerLayerItem* item, QPainter* p, double& maxTextWidth, double& maxSymbolWidth, double& currentY, const QFont& layerFont,
                               const QColor& layerFontColor, const QFont& itemFont, const QColor&  itemFontColor, double boxSpace, double layerSpace,
-                              double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor, double dpi ) const;
+                              double layerTitleSpace, double symbolSpace, double iconLabelSpace, double symbolWidth, double symbolHeight, double fontOversamplingFactor, double dpi ) const;
     /**Draws a (old generation) symbol. Optionally, maxHeight is adapted (e.g. for large point markers) */
     void drawLegendSymbol( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double& symbolWidth, double& symbolHeight,
                            double layerOpacity, double dpi, double yDownShift ) const;
@@ -144,8 +147,8 @@ class QgsWMSServer
     void drawRasterSymbol( QgsComposerLegendItem* item, QPainter* p, double boxSpace, double currentY, double symbolWidth, double symbolHeight, double yDownShift ) const;
 
     /**Read legend parameter from the request or from the first print composer in the project*/
-    void legendParameters( double mmToPixelFactor, double fontOversamplingFactor, double& boxSpace, double& layerSpace, double& symbolSpace, double& iconLabelSpace, double& symbolWidth, double& symbolHeight,
-                           QFont& layerFont, QFont& itemFont, QColor& layerFontColor, QColor& itemFontColor );
+    void legendParameters( double mmToPixelFactor, double fontOversamplingFactor, double& boxSpace, double& layerSpace, double& layerTitleSpace,
+                           double& symbolSpace, double& iconLabelSpace, double& symbolWidth, double& symbolHeight, QFont& layerFont, QFont& itemFont, QColor& layerFontColor, QColor& itemFontColor );
 
     QImage* printCompositionToImage( QgsComposition* c ) const;
 
@@ -164,6 +167,15 @@ class QgsWMSServer
     /**Clear all feature selections in the given layers*/
     void clearFeatureSelections( const QStringList& layerIds ) const;
 
+    /**Applies opacity on layer/group level*/
+    void applyOpacities( const QStringList& layerList, QList< QPair< QgsVectorLayer*, QgsFeatureRendererV2*> >& vectorRenderers,
+                         QList< QPair< QgsVectorLayer*, unsigned int> >& vectorOld,
+                         QList< QPair< QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers );
+
+    /**Restore original opacities*/
+    void restoreOpacities( QList< QPair  >& vectorRenderers, QList< QPair  >& vectorOld,
+                           QList< QPair < QgsRasterLayer*, QgsRasterRenderer* > >& rasterRenderers );
+
     void appendFormats( QDomDocument &doc, QDomElement &elem, const QStringList &formats );
 
     /**Checks WIDTH/HEIGHT values agains MaxWidth and MaxHeight
@@ -176,6 +188,9 @@ class QgsWMSServer
     /**Add ''. Some clients need an xml declaration (though it is not strictly required)*/
     void addXMLDeclaration( QDomDocument& doc ) const;
 
+    /**Converts a feature info xml document to SIA2045 norm*/
+    void convertFeatureInfoToSIA2045( QDomDocument& doc );
+
     /**Map containing the WMS parameters*/
     QMap mParameterMap;
     QgsConfigParser* mConfigParser;
diff --git a/src/plugins/coordinate_capture/CMakeLists.txt b/src/plugins/coordinate_capture/CMakeLists.txt
index cbc7f8a6d32f..cf8ac7b4fdd4 100644
--- a/src/plugins/coordinate_capture/CMakeLists.txt
+++ b/src/plugins/coordinate_capture/CMakeLists.txt
@@ -19,7 +19,7 @@ SET (coordinatecapture_RCCS  coordinatecapture.qrc)
 ########################################################
 # Build
 
-QT4_WRAP_UI (coordinatecapture_UIS_H  ${coordinatecapture_UIS}) 
+QT4_WRAP_UI (coordinatecapture_UIS_H  ${coordinatecapture_UIS})
 
 QT4_WRAP_CPP (coordinatecapture_MOC_SRCS  ${coordinatecapture_MOC_HDRS})
 
@@ -30,9 +30,9 @@ ADD_LIBRARY (coordinatecaptureplugin MODULE ${coordinatecapture_SRCS} ${coordina
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}/../../ui/
-     ../../core 
-     ../../core/raster 
-     ../../core/renderer 
+     ../../core
+     ../../core/raster
+     ../../core/renderer
      ../../core/symbology
      ../../gui
      ..
diff --git a/src/plugins/coordinate_capture/README b/src/plugins/coordinate_capture/README
index 1ed6b7e8a0de..09bb4e7f83e7 100644
--- a/src/plugins/coordinate_capture/README
+++ b/src/plugins/coordinate_capture/README
@@ -2,5 +2,5 @@ Coordinate Capture Plugin for Quantum GIS
 
        Tim Sutton 2008
 
-A simple plugin that allows you to copy the 
+A simple plugin that allows you to copy the
 coordinates of mouse clicks to the clipboard.
diff --git a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp
index b49d86b34ecc..b827b9432906 100644
--- a/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp
+++ b/src/plugins/coordinate_capture/coordinatecapturemaptool.cpp
@@ -33,7 +33,7 @@ CoordinateCaptureMapTool::CoordinateCaptureMapTool( QgsMapCanvas* thepCanvas )
   QPixmap myCursor = QPixmap(( const char ** ) capture_point_cursor );
   mCursor = QCursor( myCursor, 8, 8 ); //8,8 is the point in the cursor where clicks register
   mpMapCanvas = thepCanvas;
-  mpRubberBand = new QgsRubberBand( mpMapCanvas, true ); //true - its a polygon
+  mpRubberBand = new QgsRubberBand( mpMapCanvas, QGis::Polygon );
   mpRubberBand->setColor( Qt::red );
   mpRubberBand->setWidth( 1 );
 }
@@ -78,7 +78,7 @@ void CoordinateCaptureMapTool::canvasReleaseEvent( QMouseEvent * thepEvent )
   QgsPoint myPoint4 =
     mCanvas->getCoordinateTransform()->toMapCoordinates( thepEvent->x() - 1, thepEvent->y() + 1 );
 
-  mpRubberBand->reset( true );
+  mpRubberBand->reset( QGis::Polygon );
   // convert screen coordinates to map coordinates
   mpRubberBand->addPoint( myPoint1, false ); //true - update canvas
   mpRubberBand->addPoint( myPoint2, false ); //true - update canvas
@@ -90,6 +90,6 @@ void CoordinateCaptureMapTool::canvasReleaseEvent( QMouseEvent * thepEvent )
 
 void CoordinateCaptureMapTool::deactivate()
 {
-  mpRubberBand->reset( false );
+  mpRubberBand->reset( QGis::Line );
   QgsMapTool::deactivate();
 }
diff --git a/src/plugins/dxf2shp_converter/dxflib/confdefs.h b/src/plugins/dxf2shp_converter/dxflib/confdefs.h
index 8b137891791f..f74e15c125c7 100644
--- a/src/plugins/dxf2shp_converter/dxflib/confdefs.h
+++ b/src/plugins/dxf2shp_converter/dxflib/confdefs.h
@@ -1 +1,3 @@
-
+/*   This program is free software; you can redistribute it and/or modify *
+ *   it under the terms of the GNU General Public License as published by  *
+ *   the Free Software Foundation; version 2 of the License                */
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_attributes.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_attributes.h
index 2f0cb91f9dab..c7648b8297c4 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_attributes.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_attributes.h
@@ -10,6 +10,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h
index c04ebf50f698..4be58e2ee112 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_codes.h
@@ -11,6 +11,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h
index 4bfc0b0a2c04..e4785b5c7061 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_creationadapter.h
@@ -10,6 +10,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_creationinterface.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_creationinterface.h
index fac146157743..5676eae28e2f 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_creationinterface.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_creationinterface.h
@@ -10,6 +10,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp b/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp
index 27a2dbff82e4..a69962aa8f6d 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.cpp
@@ -10,6 +10,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h
index fb0ccf42fc34..f96c0ce2065d 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_dxf.h
@@ -10,6 +10,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
index b15c1bb6f5a1..cdefa6ca9ab4 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_entities.h
@@ -10,6 +10,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_exception.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_exception.h
index ee2298bc3e84..ceea48ea89a0 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_exception.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_exception.h
@@ -11,6 +11,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_extrusion.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_extrusion.h
index b8a6c4b35de3..3de840195cd5 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_extrusion.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_extrusion.h
@@ -9,6 +9,10 @@
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
+** 
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
 **
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
index a18a34ed90ed..c22d751b6940 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_writer.h
@@ -11,6 +11,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp b/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp
index 6fe9c0569026..59633227bd1b 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.cpp
@@ -11,6 +11,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h b/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h
index 01ff1537d296..06e2b7a7fb73 100644
--- a/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h
+++ b/src/plugins/dxf2shp_converter/dxflib/src/dl_writer_ascii.h
@@ -11,6 +11,10 @@
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
+** This program is free software; you can redistribute it and/or modify  
+** it under the terms of the GNU General Public License as published by
+** the Free Software Foundation; version 2 of the License
+**
 ** Licensees holding valid dxflib Professional Edition licenses may use
 ** this file in accordance with the dxflib Commercial License
 ** Agreement provided with the Software.
diff --git a/src/plugins/dxf2shp_converter/getInsertions.cpp b/src/plugins/dxf2shp_converter/getInsertions.cpp
index de94eb2973f5..d90e91140922 100644
--- a/src/plugins/dxf2shp_converter/getInsertions.cpp
+++ b/src/plugins/dxf2shp_converter/getInsertions.cpp
@@ -34,7 +34,7 @@
 //    http://www.happysquirrel.com/index.php?feature=hs_questions
 //
 // Thank you!
-// 
+//
 
 // getInsertions.cpp: The class which retrieves the block insertions from the DXF file
 
diff --git a/src/plugins/globe/CMakeLists.txt b/src/plugins/globe/CMakeLists.txt
index de315de41a44..d8967bccd666 100644
--- a/src/plugins/globe/CMakeLists.txt
+++ b/src/plugins/globe/CMakeLists.txt
@@ -50,6 +50,7 @@ ADD_LIBRARY (globeplugin MODULE ${globe_plugin_SRCS} ${globe_plugin_MOC_SRCS} ${
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_BINARY_DIR}
      ${OSGEARTH_INCLUDE_DIR}
+     ${OSG_INCLUDE_DIR}
      ${GEOS_INCLUDE_DIR}
      ../../core ../../core/raster ../../core/renderer ../../core/symbology
      ../../gui
diff --git a/src/plugins/globe/CMakeModules/FindOSG.cmake b/src/plugins/globe/CMakeModules/FindOSG.cmake
index c792d3bef1d2..efc8c7173f12 100644
--- a/src/plugins/globe/CMakeModules/FindOSG.cmake
+++ b/src/plugins/globe/CMakeModules/FindOSG.cmake
@@ -10,7 +10,7 @@
 # directory, and source directory, respectively
 # OSGDIR or OSG_SOURCE_DIR: osg source directory, typically OpenSceneGraph
 # OSG_DIR or OSG_BUILD_DIR: osg build directory, place in which you've
-#    built osg via cmake 
+#    built osg via cmake
 
 # Header files are presumed to be included like
 # #include 
diff --git a/src/plugins/globe/CMakeModules/FindOpenThreads.cmake b/src/plugins/globe/CMakeModules/FindOpenThreads.cmake
index ef0e5eb1d853..5c857cbfd22b 100644
--- a/src/plugins/globe/CMakeModules/FindOpenThreads.cmake
+++ b/src/plugins/globe/CMakeModules/FindOpenThreads.cmake
@@ -1,10 +1,10 @@
-# OpenThreads is a C++ based threading library. Its largest userbase 
+# OpenThreads is a C++ based threading library. Its largest userbase
 # seems to OpenSceneGraph so you might notice I accept OSGDIR as an
 # environment path.
-# I consider this part of the Findosg* suite used to find OpenSceneGraph 
+# I consider this part of the Findosg* suite used to find OpenSceneGraph
 # components.
 # Each component is separate and you must opt in to each module.
-# 
+#
 # Locate OpenThreads
 # This module defines
 # OPENTHREADS_LIBRARY
@@ -21,8 +21,8 @@
 # #include 
 
 # To make it easier for one-step automated configuration/builds,
-# we leverage environmental paths. This is preferable 
-# to the -DVAR=value switches because it insulates the 
+# we leverage environmental paths. This is preferable
+# to the -DVAR=value switches because it insulates the
 # users from changes we may make in this script.
 # It also offers a little more flexibility than setting
 # the CMAKE_*_PATH since we can target specific components.
@@ -75,7 +75,7 @@ IF(NOT OPENTHREADS_INCLUDE_DIR)
 ENDIF(NOT OPENTHREADS_INCLUDE_DIR)
 
 
-FIND_LIBRARY(OPENTHREADS_LIBRARY 
+FIND_LIBRARY(OPENTHREADS_LIBRARY
     NAMES OpenThreads OpenThreadsWin32
     PATHS
     $ENV{OPENTHREADS_LIBRARY_DIR}
@@ -90,15 +90,15 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY
 )
 
 IF(NOT OPENTHREADS_LIBRARY)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY 
-        NAMES OpenThreads OpenThreadsWin32 
+    FIND_LIBRARY(OPENTHREADS_LIBRARY
+        NAMES OpenThreads OpenThreadsWin32
         PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
         PATH_SUFFIXES lib64 lib
     )
 ENDIF(NOT OPENTHREADS_LIBRARY)
 
 IF(NOT OPENTHREADS_LIBRARY)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY 
+    FIND_LIBRARY(OPENTHREADS_LIBRARY
         NAMES OpenThreads OpenThreadsWin32
         PATHS
         ~/Library/Frameworks
@@ -121,7 +121,7 @@ IF(NOT OPENTHREADS_LIBRARY)
 ENDIF(NOT OPENTHREADS_LIBRARY)
 
 
-FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
     NAMES OpenThreadsd OpenThreadsWin32d
     PATHS
     $ENV{OPENTHREADS_DEBUG_LIBRARY_DIR}
@@ -140,7 +140,7 @@ FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
 )
 
 IF(NOT OPENTHREADS_LIBRARY_DEBUG)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
         NAMES OpenThreadsd OpenThreadsWin32d
         PATHS ${CMAKE_PREFIX_PATH} # Unofficial: We are proposing this.
         PATH_SUFFIXES lib64 lib
@@ -148,7 +148,7 @@ IF(NOT OPENTHREADS_LIBRARY_DEBUG)
 ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
 
 IF(NOT OPENTHREADS_LIBRARY_DEBUG)
-    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG 
+    FIND_LIBRARY(OPENTHREADS_LIBRARY_DEBUG
         NAMES OpenThreadsd OpenThreadsWin32d
         PATHS
         /usr/local/lib64
@@ -176,7 +176,7 @@ IF(OPENTHREADS_LIBRARY)
       SET(OPENTHREADS_LIBRARY_DEBUG "${OPENTHREADS_LIBRARY}" CACHE FILEPATH "Debug version of OpenThreads Library (use regular version if not available)" FORCE)
   ENDIF(NOT OPENTHREADS_LIBRARY_DEBUG)
 ENDIF(OPENTHREADS_LIBRARY)
-    
+
 SET(OPENTHREADS_FOUND "NO")
 IF(OPENTHREADS_INCLUDE_DIR AND OPENTHREADS_LIBRARY)
   SET(OPENTHREADS_FOUND "YES")
diff --git a/src/plugins/globe/globe_plugin.cpp b/src/plugins/globe/globe_plugin.cpp
index 17389cc331c7..663cd0b8d677 100644
--- a/src/plugins/globe/globe_plugin.cpp
+++ b/src/plugins/globe/globe_plugin.cpp
@@ -837,11 +837,13 @@ void GlobePlugin::elevationLayersChanged()
 
 void GlobePlugin::reset()
 {
-  if (mViewerWidget) {
+  if ( mViewerWidget )
+  {
     delete mViewerWidget;
     mViewerWidget = 0;
   }
-  if (mOsgViewer) {
+  if ( mOsgViewer )
+  {
     delete mOsgViewer;
     mOsgViewer = 0;
   }
diff --git a/src/plugins/globe/globe_plugin.h b/src/plugins/globe/globe_plugin.h
index 230d131db1eb..93b5bdf9851f 100644
--- a/src/plugins/globe/globe_plugin.h
+++ b/src/plugins/globe/globe_plugin.h
@@ -203,9 +203,9 @@ namespace osgEarth
   namespace Util
   {
 #ifdef USE_BACKPORTED_CONTROLS
-  namespace Controls21
+    namespace Controls21
 #else
-  namespace Controls
+    namespace Controls
 #endif
     {
       class NavigationControlHandler : public ControlEventHandler
diff --git a/src/plugins/globe/globe_plugin_dialog.cpp b/src/plugins/globe/globe_plugin_dialog.cpp
index be058c9d61ad..f9d70a09c928 100644
--- a/src/plugins/globe/globe_plugin_dialog.cpp
+++ b/src/plugins/globe/globe_plugin_dialog.cpp
@@ -255,10 +255,10 @@ void QgsGlobePluginDialog::resetElevationDatasources()
 {
   elevationDatasourcesWidget->clearContents();
   elevationDatasourcesWidget->setRowCount( 1 );
-  elevationDatasourcesWidget->setItem( 0, 0, new QTableWidgetItem("TMS") );
+  elevationDatasourcesWidget->setItem( 0, 0, new QTableWidgetItem( "TMS" ) );
   elevationDatasourcesWidget->setItem( 0, 1, new QTableWidgetItem() );
   //elevationDatasourcesWidget->item( 0, 1 )->setCheckState( Qt::Unchecked );
-  elevationDatasourcesWidget->setItem( 0, 2, new QTableWidgetItem("http://readymap.org/readymap/tiles/1.0.0/9/") );
+  elevationDatasourcesWidget->setItem( 0, 2, new QTableWidgetItem( "http://readymap.org/readymap/tiles/1.0.0/9/" ) );
 }
 
 void QgsGlobePluginDialog::readElevationDatasources()
diff --git a/src/plugins/gps_importer/CMakeLists.txt b/src/plugins/gps_importer/CMakeLists.txt
index 963e386992b6..acdd100d1c2e 100644
--- a/src/plugins/gps_importer/CMakeLists.txt
+++ b/src/plugins/gps_importer/CMakeLists.txt
@@ -37,8 +37,9 @@ ADD_LIBRARY (gpsimporterplugin MODULE ${GPS_SRCS} ${GPS_MOC_SRCS} ${GPS_RCC_SRCS
 INCLUDE_DIRECTORIES(
      ${CMAKE_CURRENT_SOURCE_DIR}
      ${CMAKE_CURRENT_BINARY_DIR}
-     ../../core ../../core/gps ../../core/gps/qextserialport
-
+     ${QEXTSERIALPORT_INCLUDE_DIR}
+     ../../core
+     ../../core/gps
      ../../gui
      ..
      ${EXPAT_INCLUDE_DIR}
@@ -49,7 +50,6 @@ TARGET_LINK_LIBRARIES(gpsimporterplugin
   qgis_gui
 )
 
-
 ########################################################
 # Install
 
diff --git a/src/plugins/gps_importer/README b/src/plugins/gps_importer/README
index e794b646a5e4..610f278a01fc 100644
--- a/src/plugins/gps_importer/README
+++ b/src/plugins/gps_importer/README
@@ -5,7 +5,7 @@
 ##############################################
 
 Please do not edit the files in this directory
-unless you know exactly what you are doing - 
+unless you know exactly what you are doing -
 these files are used as the basis for creating
 new plugins. Altering these files may break
 the automated plugin template generation process.
diff --git a/src/plugins/grass/modules/default.qgc b/src/plugins/grass/modules/default.qgc
index 699a238596a3..ba22ee2ba137 100644
--- a/src/plugins/grass/modules/default.qgc
+++ b/src/plugins/grass/modules/default.qgc
@@ -246,6 +246,7 @@
 			
 			
        
 				
+				
 				
 			
        
 			
        
diff --git a/src/plugins/grass/modules/r.aspect.qgm b/src/plugins/grass/modules/r.aspect.qgm
index 10a8e9054a75..509d77003d38 100644
--- a/src/plugins/grass/modules/r.aspect.qgm
+++ b/src/plugins/grass/modules/r.aspect.qgm
@@ -1,7 +1,7 @@
 
 
 
-
+
 	
diff --git a/src/plugins/grass/modules/r.average.qgm b/src/plugins/grass/modules/r.average.qgm
index 7222c5f69417..c39c86d65371 100644
--- a/src/plugins/grass/modules/r.average.qgm
+++ b/src/plugins/grass/modules/r.average.qgm
@@ -1,7 +1,8 @@
 
 
 
-
+
+