[QGIS Commit] r9601 - in trunk/code_examples/3_basic_labelling: .
cmake_find_rules
svn_qgis at osgeo.org
svn_qgis at osgeo.org
Sat Nov 8 14:59:16 EST 2008
Author: timlinux
Date: 2008-11-08 14:59:16 -0500 (Sat, 08 Nov 2008)
New Revision: 9601
Added:
trunk/code_examples/3_basic_labelling/CMakeLists.txt
trunk/code_examples/3_basic_labelling/COPYING
trunk/code_examples/3_basic_labelling/README
trunk/code_examples/3_basic_labelling/cmake_find_rules/
trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGDAL.cmake
trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGEOS.cmake
trunk/code_examples/3_basic_labelling/cmake_find_rules/FindQGIS.cmake
Removed:
trunk/code_examples/3_basic_labelling/3_basic_labelling.pro
Modified:
trunk/code_examples/3_basic_labelling/mainwindow.cpp
trunk/code_examples/3_basic_labelling/tutorial3.html
Log:
Updates for labelling tutorial to QGIS 1.0 API
Deleted: trunk/code_examples/3_basic_labelling/3_basic_labelling.pro
===================================================================
--- trunk/code_examples/3_basic_labelling/3_basic_labelling.pro 2008-11-08 19:06:55 UTC (rev 9600)
+++ trunk/code_examples/3_basic_labelling/3_basic_labelling.pro 2008-11-08 19:59:16 UTC (rev 9601)
@@ -1,42 +0,0 @@
-TEMPLATE = app
-TARGET = qgis_example3
-QT = qt3support sql opengl network svg gui core xml
-LANGUAGE= C++
-linux-g++{
- QGISDIR=[path to installed qgis]
- QGISLIBDIR=$${QGISDIR}/lib
- QGISSRCDIR=[path to qgis src directory]
- QGISPLUGINDIR=$${QGISLIBDIR}/qgis
- DEFINES += QGISPLUGINDIR=$${QGISPLUGINDIR}
- LIBS = -L$${QGISLIBDIR} -lqgis_core -lproj -lqgis_gui
-}
-macx{
- QGISDIR=/Users/timsutton/apps/qgis.app/Contents/MacOS/
- QGISLIBDIR=$${QGISDIR}/lib
- QGISSRCDIR=/Users/timsutton/dev/cpp/qgis/src/
- QGISPLUGINDIR=$${QGISLIBDIR}/qgis
- DEFINES += QGISPLUGINDIR=$${QGISPLUGINDIR}
- LIBS = -L$${QGISLIBDIR} -lqgis_core -lqgis_gui
- system(mkdir -p qgis_example3.app/Contents/MacOS/share/qgis/resources/)
- system(cp $${QGISDIR}/share/qgis/resources/srs.db qgis_example3.app/Contents/MacOS/share/qgis/resources/)
-}
-
-INCLUDEPATH = $${QGISDIR}/include/qgis \
- $${QGISSRCDIR}/core \
- $${QGISSRCDIR}/gui \
- $${QGISSRCDIR}/plugins \
- $${QGISSRCDIR}/providers \
- $${QGISSRCDIR}/raster \
- $${QGISSRCDIR}/ui
-
-CONFIG += qt gui exceptions stl warn_on debug thread
-
-RESOURCES += resources.qrc
-
-FORMS += mainwindowbase.ui
-
-HEADERS = mainwindow.h
-
-SOURCES = main.cpp \
- mainwindow.cpp
-
Added: trunk/code_examples/3_basic_labelling/CMakeLists.txt
===================================================================
--- trunk/code_examples/3_basic_labelling/CMakeLists.txt (rev 0)
+++ trunk/code_examples/3_basic_labelling/CMakeLists.txt 2008-11-08 19:59:16 UTC (rev 9601)
@@ -0,0 +1,116 @@
+PROJECT(timtut3)
+SET(CMAKE_COLOR_MAKEFILE ON)
+# set path to additional CMake modules
+SET(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake_find_rules ${CMAKE_MODULE_PATH})
+FIND_PACKAGE(QGIS REQUIRED)
+IF (NOT QGIS_FOUND)
+ MESSAGE (SEND_ERROR "QGIS dependency was not found!")
+ENDIF (NOT QGIS_FOUND)
+IF (WIN32)
+ # expect that classes are being imported by default
+ # Note: MSVC doesn't like when the macros are quotes
+ # and MSYS doesn't like them unqouted (bacause of braces)
+ # import qgis classes
+ IF (MSVC)
+ ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
+ ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
+ ELSE (MSVC)
+ ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
+ ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
+ ENDIF (MSVC)
+ELSE (WIN32)
+ ADD_DEFINITIONS(-DGUI_EXPORT=)
+ ADD_DEFINITIONS(-DCORE_EXPORT=)
+ENDIF (WIN32)
+
+FIND_PACKAGE(GDAL REQUIRED)
+IF (NOT GDAL_FOUND)
+ MESSAGE (SEND_ERROR "GDAL dependency was not found!")
+ENDIF (NOT GDAL_FOUND)
+
+FIND_PACKAGE(GEOS REQUIRED)
+IF (NOT GEOS_FOUND)
+ MESSAGE (SEND_ERROR "GEOS dependency was not found!")
+ENDIF (NOT GEOS_FOUND)
+
+IF (CMAKE_BUILD_TYPE MATCHES Debug)
+ ADD_DEFINITIONS(-Dtimtut3DEBUG=1)
+ENDIF (CMAKE_BUILD_TYPE MATCHES Debug)
+########################################################
+# Files
+
+SET (timtut3_SRCS
+ main.cpp
+ mainwindow.cpp
+)
+
+# This tut uses no UIs
+SET (timtut3_UIS
+ mainwindowbase.ui
+)
+
+# This tut needs no MOC
+SET (timtut3_MOC_HDRS
+ mainwindow.h
+)
+
+
+SET (timtut3_RCCS
+ resources.qrc
+)
+
+SET (QT_USE_QT3SUPPORT FALSE)
+SET (QT_USE_QTGUI TRUE)
+SET (QT_USE_QTSQL TRUE)
+SET (QT_USE_QTSVG TRUE)
+SET (QT_USE_QTXML TRUE)
+SET (QT_USE_QTNETWORK TRUE)
+FIND_PACKAGE(Qt4 REQUIRED)
+INCLUDE( ${QT_USE_FILE} )
+########################################################
+# Build
+
+QT4_WRAP_UI (timtut3_UIS_H ${timtut3_UIS})
+
+QT4_WRAP_CPP (timtut3_MOC_SRCS ${timtut3_MOC_HDRS})
+
+QT4_ADD_RESOURCES(timtut3_RCC_SRCS ${timtut3_RCCS})
+
+ADD_EXECUTABLE (timtut3 MODULE ${timtut3_SRCS} ${timtut3_MOC_SRCS} ${timtut3_RCC_SRCS} ${timtut3_UIS_H})
+
+INCLUDE_DIRECTORIES(
+ ${GDAL_INCLUDE_DIR}
+ ${GEOS_INCLUDE_DIR}
+ ${CMAKE_CURRENT_BINARY_DIR}
+ ${QT_INCLUDE_DIR}
+ ${QGIS_INCLUDE_DIR}
+ .
+)
+
+#This is probably no longer needed, but I will leave it in for Win machines for the moment
+IF(QT_QTSQL_FOUND)
+ FIND_LIBRARY(QT_QTSQL_LIBRARY NAMES QtSql QtSql4 PATHS ${QT_LIBRARY_DIR} NO_DEFAULT_PATH)
+ SET(QT_LIBRARIES ${QT_LIBRARIES} ${QT_QTSQL_LIBRARY})
+ENDIF(QT_QTSQL_FOUND)
+
+TARGET_LINK_LIBRARIES(timtut3
+ ${QT_LIBRARIES}
+ ${QGIS_CORE_LIBRARY}
+ ${QGIS_GUI_LIBRARY}
+ ${GEOS_LIBRARY}
+
+ ${GDAL_LIBRARY}
+)
+
+IF (MSVC)
+ # Very important or you get all kinds of odd side
+ #effects like app crash on start up saying qtgui.dll
+ TARGET_LINK_LIBRARIES( timtut3
+ qtmain
+ )
+ENDIF (MSVC)
+
+########################################################
+# Install
+
+
Added: trunk/code_examples/3_basic_labelling/COPYING
===================================================================
--- trunk/code_examples/3_basic_labelling/COPYING (rev 0)
+++ trunk/code_examples/3_basic_labelling/COPYING 2008-11-08 19:59:16 UTC (rev 9601)
@@ -0,0 +1,353 @@
+ GNU GENERAL PUBLIC LICENSE
+ Version 2, June 1991
+
+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
+ 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+ Preamble
+
+ The licenses for most software are designed to take away your
+freedom to share and change it. By contrast, the GNU General Public
+License is intended to guarantee your freedom to share and change free
+software--to make sure the software is free for all its users. This
+General Public License applies to most of the Free Software
+Foundation's software and to any other program whose authors commit to
+using it. (Some other Free Software Foundation software is covered by
+the GNU Library General Public License instead.) You can apply it to
+your programs, too.
+
+ When we speak of free software, we are referring to freedom, not
+price. Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+this service if you wish), that you receive source code or can get it
+if you want it, that you can change the software or use pieces of it
+in new free programs; and that you know you can do these things.
+
+ To protect your rights, we need to make restrictions that forbid
+anyone to deny you these rights or to ask you to surrender the rights.
+These restrictions translate to certain responsibilities for you if you
+distribute copies of the software, or if you modify it.
+
+ For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must give the recipients all the rights that
+you have. You must make sure that they, too, receive or can get the
+source code. And you must show them these terms so they know their
+rights.
+
+ We protect your rights with two steps: (1) copyright the software, and
+(2) offer you this license which gives you legal permission to copy,
+distribute and/or modify the software.
+
+ Also, for each author's protection and ours, we want to make certain
+that everyone understands that there is no warranty for this free
+software. If the software is modified by someone else and passed on, we
+want its recipients to know that what they have is not the original, so
+that any problems introduced by others will not reflect on the original
+authors' reputations.
+
+ Finally, any free program is threatened constantly by software
+patents. We wish to avoid the danger that redistributors of a free
+program will individually obtain patent licenses, in effect making the
+program proprietary. To prevent this, we have made it clear that any
+patent must be licensed for everyone's free use or not licensed at all.
+
+ The precise terms and conditions for copying, distribution and
+modification follow.
+
+ GNU GENERAL PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+ 0. This License applies to any program or other work which contains
+a notice placed by the copyright holder saying it may be distributed
+under the terms of this General Public License. The "Program", below,
+refers to any such program or work, and a "work based on the Program"
+means either the Program or any derivative work under copyright law:
+that is to say, a work containing the Program or a portion of it,
+either verbatim or with modifications and/or translated into another
+language. (Hereinafter, translation is included without limitation in
+the term "modification".) Each licensee is addressed as "you".
+
+Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope. The act of
+running the Program is not restricted, and the output from the Program
+is covered only if its contents constitute a work based on the
+Program (independent of having been made by running the Program).
+Whether that is true depends on what the Program does.
+
+ 1. You may copy and distribute verbatim copies of the Program's
+source code as you receive it, in any medium, provided that you
+conspicuously and appropriately publish on each copy an appropriate
+copyright notice and disclaimer of warranty; keep intact all the
+notices that refer to this License and to the absence of any warranty;
+and give any other recipients of the Program a copy of this License
+along with the Program.
+
+You may charge a fee for the physical act of transferring a copy, and
+you may at your option offer warranty protection in exchange for a fee.
+
+ 2. You may modify your copy or copies of the Program or any portion
+of it, thus forming a work based on the Program, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+ a) You must cause the modified files to carry prominent notices
+ stating that you changed the files and the date of any change.
+
+ b) You must cause any work that you distribute or publish, that in
+ whole or in part contains or is derived from the Program or any
+ part thereof, to be licensed as a whole at no charge to all third
+ parties under the terms of this License.
+
+ c) If the modified program normally reads commands interactively
+ when run, you must cause it, when started running for such
+ interactive use in the most ordinary way, to print or display an
+ announcement including an appropriate copyright notice and a
+ notice that there is no warranty (or else, saying that you provide
+ a warranty) and that users may redistribute the program under
+ these conditions, and telling the user how to view a copy of this
+ License. (Exception: if the Program itself is interactive but
+ does not normally print such an announcement, your work based on
+ the Program is not required to print an announcement.)
+
+These requirements apply to the modified work as a whole. If
+identifiable sections of that work are not derived from the Program,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works. But when you
+distribute the same sections as part of a whole which is a work based
+on the Program, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Program.
+
+In addition, mere aggregation of another work not based on the Program
+with the Program (or with a work based on the Program) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+ 3. You may copy and distribute the Program (or a work based on it,
+under Section 2) in object code or executable form under the terms of
+Sections 1 and 2 above provided that you also do one of the following:
+
+ a) Accompany it with the complete corresponding machine-readable
+ source code, which must be distributed under the terms of Sections
+ 1 and 2 above on a medium customarily used for software interchange; or,
+
+ b) Accompany it with a written offer, valid for at least three
+ years, to give any third party, for a charge no more than your
+ cost of physically performing source distribution, a complete
+ machine-readable copy of the corresponding source code, to be
+ distributed under the terms of Sections 1 and 2 above on a medium
+ customarily used for software interchange; or,
+
+ c) Accompany it with the information you received as to the offer
+ to distribute corresponding source code. (This alternative is
+ allowed only for noncommercial distribution and only if you
+ received the program in object code or executable form with such
+ an offer, in accord with Subsection b above.)
+
+The source code for a work means the preferred form of the work for
+making modifications to it. For an executable work, complete source
+code means all the source code for all modules it contains, plus any
+associated interface definition files, plus the scripts used to
+control compilation and installation of the executable. However, as a
+special exception, the source code distributed need not include
+anything that is normally distributed (in either source or binary
+form) with the major components (compiler, kernel, and so on) of the
+operating system on which the executable runs, unless that component
+itself accompanies the executable.
+
+If distribution of executable or object code is made by offering
+access to copy from a designated place, then offering equivalent
+access to copy the source code from the same place counts as
+distribution of the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+ 4. You may not copy, modify, sublicense, or distribute the Program
+except as expressly provided under this License. Any attempt
+otherwise to copy, modify, sublicense or distribute the Program is
+void, and will automatically terminate your rights under this License.
+However, parties who have received copies, or rights, from you under
+this License will not have their licenses terminated so long as such
+parties remain in full compliance.
+
+ 5. You are not required to accept this License, since you have not
+signed it. However, nothing else grants you permission to modify or
+distribute the Program or its derivative works. These actions are
+prohibited by law if you do not accept this License. Therefore, by
+modifying or distributing the Program (or any work based on the
+Program), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Program or works based on it.
+
+ 6. Each time you redistribute the Program (or any work based on the
+Program), the recipient automatically receives a license from the
+original licensor to copy, distribute or modify the Program subject to
+these terms and conditions. You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties to
+this License.
+
+ 7. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License. If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Program at all. For example, if a patent
+license would not permit royalty-free redistribution of the Program by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Program.
+
+If any portion of this section is held invalid or unenforceable under
+any particular circumstance, the balance of the section is intended to
+apply and the section as a whole is intended to apply in other
+circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system, which is
+implemented by public license practices. Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+ 8. If the distribution and/or use of the Program is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Program under this License
+may add an explicit geographical distribution limitation excluding
+those countries, so that distribution is permitted only in or among
+countries not thus excluded. In such case, this License incorporates
+the limitation as if written in the body of this License.
+
+ 9. The Free Software Foundation may publish revised and/or new versions
+of the General Public License from time to time. Such new versions will
+be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+Each version is given a distinguishing version number. If the Program
+specifies a version number of this License which applies to it and "any
+later version", you have the option of following the terms and conditions
+either of that version or of any later version published by the Free
+Software Foundation. If the Program does not specify a version number of
+this License, you may choose any version ever published by the Free Software
+Foundation.
+
+ 10. If you wish to incorporate parts of the Program into other free
+programs whose distribution conditions are different, write to the author
+to ask for permission. For software which is copyrighted by the Free
+Software Foundation, write to the Free Software Foundation; we sometimes
+make exceptions for this. Our decision will be guided by the two goals
+of preserving the free status of all derivatives of our free software and
+of promoting the sharing and reuse of software generally.
+
+ NO WARRANTY
+
+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
+REPAIR OR CORRECTION.
+
+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
+POSSIBILITY OF SUCH DAMAGES.
+
+ END OF TERMS AND CONDITIONS
+
+In addition, as a special exception, the QGIS Development Team gives
+permission to link the code of this program with the Qt library,
+including but not limited to the following versions (both free and
+commercial): Qt/Non-commerical Windows, Qt/Windows, Qt/X11, Qt/Mac, and
+Qt/Embedded (or with modified versions of Qt that use the same license
+as Qt), and distribute linked combinations including the two. You must
+obey the GNU General Public License in all respects for all of the code
+used other than Qt. If you modify this file, you may extend this
+exception to your version of the file, but you are not obligated to do
+so. If you do not wish to do so, delete this exception statement from
+your version.
+
+
+ How to Apply These Terms to Your New Programs
+
+ If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+ To do so, attach the following notices to the program. It is safest
+to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+ <one line to give the program's name and a brief idea of what it does.>
+ Copyright (C) <year> <name of author>
+
+ 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.
+
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program; if not, write to the Free Software
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+
+
+Also add information on how to contact you by electronic and paper mail.
+
+If the program is interactive, make it output a short notice like this
+when it starts in an interactive mode:
+
+ Gnomovision version 69, Copyright (C) year name of author
+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+ This is free software, and you are welcome to redistribute it
+ under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License. Of course, the commands you use may
+be called something other than `show w' and `show c'; they could even be
+mouse-clicks or menu items--whatever suits your program.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the program, if
+necessary. Here is a sample; alter the names:
+
+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
+
+ <signature of Ty Coon>, 1 April 1989
+ Ty Coon, President of Vice
+
+This General Public License does not permit incorporating your program into
+proprietary programs. If your program is a subroutine library, you may
+consider it more useful to permit linking proprietary applications with the
+library. If this is what you want to do, use the GNU Library General
+Public License instead of this License.
Added: trunk/code_examples/3_basic_labelling/README
===================================================================
--- trunk/code_examples/3_basic_labelling/README (rev 0)
+++ trunk/code_examples/3_basic_labelling/README 2008-11-08 19:59:16 UTC (rev 9601)
@@ -0,0 +1,3 @@
+This tutorial is copyright Tim Sutton, 2006, 2008.
+
+This work is licensed under the GPL version 2 - see COPYING file for more details.
Added: trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGDAL.cmake
===================================================================
--- trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGDAL.cmake (rev 0)
+++ trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGDAL.cmake 2008-11-08 19:59:16 UTC (rev 9601)
@@ -0,0 +1,129 @@
+## Once run this will define:
+##
+## GDAL_FOUND = system has GDAL lib
+##
+## GDAL_LIBRARY = full path to the library
+##
+## GDAL_INCLUDE_DIR = where to find headers
+##
+## Magnus Homann
+
+
+IF(WIN32)
+
+ IF (MINGW)
+ FIND_PATH(GDAL_INCLUDE_DIR gdal.h /usr/local/include /usr/include c:/msys/local/include)
+ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS /usr/local/lib /usr/lib c:/msys/local/lib)
+ ENDIF (MINGW)
+
+ IF (MSVC)
+ FIND_PATH(GDAL_INCLUDE_DIR gdal.h
+ "$ENV{LIB_DIR}/include/gdal"
+ )
+ FIND_LIBRARY(GDAL_LIBRARY NAMES gdal PATHS
+ "$ENV{LIB_DIR}/lib/"
+ )
+
+ # NOTE: under msvc you should add the following to your target link libraries
+ # list as they are required by gdal
+ #odbc32 odbccp32
+
+ ENDIF (MSVC)
+
+
+ELSE(WIN32)
+ IF(UNIX)
+
+ # try to use framework on mac
+ IF (APPLE)
+ SET (GDAL_MAC_PATH /Library/Frameworks/GDAL.framework/unix/bin)
+ ENDIF (APPLE)
+
+ SET(GDAL_CONFIG_PREFER_PATH "$ENV{GDAL_HOME}/bin" CACHE STRING "preferred path to GDAL (gdal-config)")
+ FIND_PROGRAM(GDAL_CONFIG gdal-config
+ ${GDAL_CONFIG_PREFER_PATH}
+ ${GDAL_MAC_PATH}
+ /usr/local/bin/
+ /usr/bin/
+ )
+ # MESSAGE("DBG GDAL_CONFIG ${GDAL_CONFIG}")
+
+ IF (GDAL_CONFIG)
+ # set INCLUDE_DIR to prefix+include
+ EXEC_PROGRAM(${GDAL_CONFIG}
+ ARGS --prefix
+ OUTPUT_VARIABLE GDAL_PREFIX)
+ #SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include CACHE STRING INTERNAL)
+ FIND_PATH(GDAL_INCLUDE_DIR
+ gdal.h
+ ${GDAL_PREFIX}/include/gdal
+ ${GDAL_PREFIX}/include
+ /usr/local/include
+ /usr/include
+ )
+
+ ## extract link dirs for rpath
+ EXEC_PROGRAM(${GDAL_CONFIG}
+ ARGS --libs
+ OUTPUT_VARIABLE GDAL_CONFIG_LIBS )
+
+ ## split off the link dirs (for rpath)
+ ## use regular expression to match wildcard equivalent "-L*<endchar>"
+ ## with <endchar> is a space or a semicolon
+ STRING(REGEX MATCHALL "[-][L]([^ ;])+"
+ GDAL_LINK_DIRECTORIES_WITH_PREFIX
+ "${GDAL_CONFIG_LIBS}" )
+ # MESSAGE("DBG GDAL_LINK_DIRECTORIES_WITH_PREFIX=${GDAL_LINK_DIRECTORIES_WITH_PREFIX}")
+
+ ## remove prefix -L because we need the pure directory for LINK_DIRECTORIES
+
+ IF (GDAL_LINK_DIRECTORIES_WITH_PREFIX)
+ STRING(REGEX REPLACE "[-][L]" "" GDAL_LINK_DIRECTORIES ${GDAL_LINK_DIRECTORIES_WITH_PREFIX} )
+ ENDIF (GDAL_LINK_DIRECTORIES_WITH_PREFIX)
+
+ ## split off the name
+ ## use regular expression to match wildcard equivalent "-l*<endchar>"
+ ## with <endchar> is a space or a semicolon
+ STRING(REGEX MATCHALL "[-][l]([^ ;])+"
+ GDAL_LIB_NAME_WITH_PREFIX
+ "${GDAL_CONFIG_LIBS}" )
+ # MESSAGE("DBG GDAL_LIB_NAME_WITH_PREFIX=${GDAL_LIB_NAME_WITH_PREFIX}")
+
+
+ ## remove prefix -l because we need the pure name
+
+ IF (GDAL_LIB_NAME_WITH_PREFIX)
+ STRING(REGEX REPLACE "[-][l]" "" GDAL_LIB_NAME ${GDAL_LIB_NAME_WITH_PREFIX} )
+ ENDIF (GDAL_LIB_NAME_WITH_PREFIX)
+
+ IF (APPLE)
+ SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.dylib CACHE STRING INTERNAL)
+ ELSE (APPLE)
+ SET(GDAL_LIBRARY ${GDAL_LINK_DIRECTORIES}/lib${GDAL_LIB_NAME}.so CACHE STRING INTERNAL)
+ ENDIF (APPLE)
+
+ ELSE(GDAL_CONFIG)
+ MESSAGE("FindGDAL.cmake: gdal-config not found. Please set it manually. GDAL_CONFIG=${GDAL_CONFIG}")
+ ENDIF(GDAL_CONFIG)
+
+ ENDIF(UNIX)
+ENDIF(WIN32)
+
+
+IF (GDAL_INCLUDE_DIR AND GDAL_LIBRARY)
+ SET(GDAL_FOUND TRUE)
+ENDIF (GDAL_INCLUDE_DIR AND GDAL_LIBRARY)
+
+IF (GDAL_FOUND)
+
+ IF (NOT GDAL_FIND_QUIETLY)
+ MESSAGE(STATUS "Found GDAL: ${GDAL_LIBRARY}")
+ ENDIF (NOT GDAL_FIND_QUIETLY)
+
+ELSE (GDAL_FOUND)
+
+ MESSAGE(GDAL_INCLUDE_DIR=${GDAL_INCLUDE_DIR})
+ MESSAGE(GDAL_LIBRARY=${GDAL_LIBRARY})
+ MESSAGE(FATAL_ERROR "Could not find GDAL")
+
+ENDIF (GDAL_FOUND)
Added: trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGEOS.cmake
===================================================================
--- trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGEOS.cmake (rev 0)
+++ trunk/code_examples/3_basic_labelling/cmake_find_rules/FindGEOS.cmake 2008-11-08 19:59:16 UTC (rev 9601)
@@ -0,0 +1,45 @@
+
+# CMake module to search for GEOS library
+#
+# If it's found it sets GEOS_FOUND to TRUE
+# and following variables are set:
+# GEOS_INCLUDE_DIR
+# GEOS_LIBRARY
+
+
+FIND_PATH(GEOS_INCLUDE_DIR geos.h
+ /usr/local/include
+ /usr/include
+ #MSVC
+ "$ENV{LIB_DIR}/include"
+ #mingw
+ c:/msys/local/include
+ )
+
+FIND_LIBRARY(GEOS_LIBRARY NAMES geos PATHS
+ /usr/local/lib
+ /usr/lib
+ #MSVC
+ "$ENV{LIB_DIR}/lib"
+ #mingw
+ c:/msys/local/lib
+ )
+
+IF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
+ SET(GEOS_FOUND TRUE)
+ENDIF (GEOS_INCLUDE_DIR AND GEOS_LIBRARY)
+
+
+IF (GEOS_FOUND)
+
+ IF (NOT GEOS_FIND_QUIETLY)
+ MESSAGE(STATUS "Found GEOS: ${GEOS_LIBRARY}")
+ ENDIF (NOT GEOS_FIND_QUIETLY)
+
+ELSE (GEOS_FOUND)
+
+ IF (GEOS_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find GEOS")
+ ENDIF (GEOS_FIND_REQUIRED)
+
+ENDIF (GEOS_FOUND)
Added: trunk/code_examples/3_basic_labelling/cmake_find_rules/FindQGIS.cmake
===================================================================
--- trunk/code_examples/3_basic_labelling/cmake_find_rules/FindQGIS.cmake (rev 0)
+++ trunk/code_examples/3_basic_labelling/cmake_find_rules/FindQGIS.cmake 2008-11-08 19:59:16 UTC (rev 9601)
@@ -0,0 +1,100 @@
+## Once run this will define:
+##
+## QGIS_FOUND = system has QGIS lib
+##
+## QGIS_CORE_LIBRARY = full path to the CORE library
+## QGIS_GUI_LIBRARY = full path to the GUI library
+## QGIS_PLUGIN_DIR = full path to where QGIS plugins are installed
+## QGIS_INCLUDE_DIR = where to find headers
+##
+## Tim Sutton
+
+#MESSAGE("Searching for QGIS")
+IF(WIN32)
+ #MESSAGE("Searching for QGIS in C:/program files/Quantum GIS")
+ IF (MINGW)
+ FIND_PATH(QGIS_PLUGIN_DIR libnortharrowplugin.dll
+ "C:/Program Files/Quantum GIS/plugins"
+ )
+ FIND_PATH(QGIS_INCLUDE_DIR qgsapplication.h
+ "C:/Program Files/Quantum GIS/include"
+ )
+ FIND_LIBRARY(QGIS_CORE_LIBRARY NAMES qgis_core PATHS
+ "C:/Program Files/Quantum GIS/"
+ )
+ FIND_LIBRARY(QGIS_GUI_LIBRARY NAMES qgis_gui PATHS
+ "C:/Program Files/Quantum GIS/"
+ )
+ ENDIF (MINGW)
+
+ IF (MSVC)
+ FIND_PATH(QGIS_PLUGIN_DIR libnortharrowplugin.dll
+ "C:/Program Files/Quantum GIS/lib/qgis"
+ )
+ FIND_PATH(QGIS_INCLUDE_DIR qgsapplication.h
+ "$ENV{LIB_DIR}/include/qgis"
+ )
+ FIND_LIBRARY(QGIS_CORE_LIBRARY NAMES qgis_core PATHS
+ "$ENV{LIB_DIR}/lib/"
+ )
+ FIND_LIBRARY(QGIS_GUI_LIBRARY NAMES qgis_gui PATHS
+ "$ENV{LIB_DIR}/lib/"
+ )
+ ENDIF (MSVC)
+
+ELSE(WIN32)
+ IF(UNIX)
+
+ # try to use bundle on mac
+ IF (APPLE)
+ #MESSAGE("Searching for QGIS in /Applications/QGIS.app/Contents/MacOS")
+ SET (QGIS_MAC_PATH /Applications/QGIS1.0.0.app/Contents/MacOS)
+ SET (QGIS_LIB_DIR ${QGIS_MAC_PATH}/lib)
+ SET (QGIS_PLUGIN_DIR ${QGIS_MAC_PATH}/lib/qgis CACHE STRING INTERNAL)
+ # set INCLUDE_DIR to prefix+include
+ SET(QGIS_INCLUDE_DIR ${QGIS_MAC_PATH}/include/qgis CACHE STRING INTERNAL)
+ ## extract link dirs
+ SET(QGIS_CORE_LIBRARY ${QGIS_LIB_DIR}/libqgis_core.dylib CACHE STRING INTERNAL)
+ SET(QGIS_GUI_LIBRARY ${QGIS_LIB_DIR}/libqgis_gui.dylib CACHE STRING INTERNAL)
+ ELSE (APPLE) # Unix / Linux
+ #MESSAGE("Searching for QGIS in /usr/bin; /usr/local/bin")
+ FIND_PATH(QGIS_PLUGIN_DIR libnortharrowplugin.so
+ /usr/lib/qgis
+ /usr/local/lib/qgis
+ "$ENV{LIB_DIR}/lib/qgis"
+ )
+ FIND_PATH(QGIS_INCLUDE_DIR qgis.h
+ /usr/include/qgis
+ /usr/local/include/qgis
+ "$ENV{LIB_DIR}/include/qgis"
+ )
+ FIND_LIBRARY(QGIS_CORE_LIBRARY NAMES qgis_core PATHS
+ /usr/lib
+ /usr/local/lib
+ "$ENV{LIB_DIR}/lib"
+ )
+ FIND_LIBRARY(QGIS_GUI_LIBRARY NAMES qgis_gui PATHS
+ /usr/lib
+ /usr/local/lib
+ "$ENV{LIB_DIR}/lib"
+ )
+ ENDIF (APPLE)
+ ENDIF(UNIX)
+ENDIF(WIN32)
+
+
+IF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY)
+ SET(QGIS_FOUND TRUE)
+ENDIF (QGIS_INCLUDE_DIR AND QGIS_CORE_LIBRARY AND QGIS_GUI_LIBRARY)
+
+IF (QGIS_FOUND)
+ IF (NOT QGIS_FIND_QUIETLY)
+ MESSAGE(STATUS "Found QGIS Core: ${QGIS_CORE_LIBRARY}")
+ MESSAGE(STATUS "Found QGIS Gui: ${QGIS_GUI_LIBRARY}")
+ MESSAGE(STATUS "Found QGIS Plugins Dir: ${QGIS_PLUGIN_DIR}")
+ ENDIF (NOT QGIS_FIND_QUIETLY)
+ELSE (QGIS_FOUND)
+ IF (QGIS_FIND_REQUIRED)
+ MESSAGE(FATAL_ERROR "Could not find QGIS")
+ ENDIF (QGIS_FIND_REQUIRED)
+ENDIF (QGIS_FOUND)
Modified: trunk/code_examples/3_basic_labelling/mainwindow.cpp
===================================================================
--- trunk/code_examples/3_basic_labelling/mainwindow.cpp 2008-11-08 19:06:55 UTC (rev 9600)
+++ trunk/code_examples/3_basic_labelling/mainwindow.cpp 2008-11-08 19:59:16 UTC (rev 9601)
@@ -23,6 +23,7 @@
//
#include <qgsapplication.h>
#include <qgsproviderregistry.h>
+#include <qgsvectordataprovider.h>
#include <qgssinglesymbolrenderer.h>
#include <qgsmaplayerregistry.h>
#include <qgsvectorlayer.h>
@@ -48,10 +49,6 @@
#include <qgslabelattributes.h>
#include <qgsfield.h>
-// Std Includes
-//
-#include <deque.h>
-
MainWindow::MainWindow(QWidget* parent, Qt::WFlags fl)
: QMainWindow(parent,fl)
{
@@ -69,9 +66,8 @@
// Create the Map Canvas
mpMapCanvas= new QgsMapCanvas(0, 0);
- qDebug(mpMapCanvas->extent().stringRep(2));
mpMapCanvas->enableAntiAliasing(true);
- mpMapCanvas->useQImageToRender(false);
+ mpMapCanvas->useImageToRender(false);
mpMapCanvas->setCanvasColor(QColor(255, 255, 255));
mpMapCanvas->freeze(false);
mpMapCanvas->setVisible(true);
@@ -129,7 +125,7 @@
}
void MainWindow::addLayer()
{
- QString myLayerPath = "data";
+ QString myLayerPath = "../data";
QString myLayerBaseName = "test";
QString myProviderName = "ogr";
@@ -146,8 +142,8 @@
}
//set up a renderer for the layer
- QgsSingleSymbolRenderer *mypRenderer = new QgsSingleSymbolRenderer(mypLayer->vectorType());
- std::deque<QString> myLayerSet;
+ QgsSingleSymbolRenderer *mypRenderer = new QgsSingleSymbolRenderer(mypLayer->geometryType());
+ QList<QgsMapCanvasLayer> myLayerSet;
mypLayer->setRenderer(mypRenderer);
//
@@ -163,14 +159,14 @@
//get the field list associated with the layer
//we'll print the names out to console for diagnostic purposes
- std::vector<QgsField> myFields = mypLayer->fields();
+ QgsFieldMap myFields = mypLayer->dataProvider()->fields();
for (unsigned int i = 0; i < myFields.size(); i++ )
{
- qDebug("Field Name: " + myFields[i].name().toLocal8Bit() );
+ qDebug("Field Name: " + QString(myFields[i].name()).toLocal8Bit() );
}
//just use the last field's name in the fields list as the label field!
- qDebug("set label field to " + myFields[myFields.size()-1].name());
- mypLabel->setLabelField( QgsLabel::Text, myFields[myFields.size()-1].name());
+ qDebug("set label field to " + QString(myFields[myFields.size()-1].name()).toLocal8Bit());
+ mypLabel->setLabelField( QgsLabel::Text, myFields.size()-1);
//set the colour of the label text
mypLabelAttributes->setColor(Qt::black);
//create a 'halo' effect around each label so it
@@ -199,14 +195,13 @@
*/
//lastly we enable labelling!
- mypLayer->setLabelOn(true);
+ mypLayer->enableLabels(true);
// Add the Vector Layer to the Layer Registry
QgsMapLayerRegistry::instance()->addMapLayer(mypLayer, TRUE);
// Add the Layer to the Layer Set
- myLayerSet.push_back(mypLayer->getLayerID());
- mypLayer->setVisible(TRUE);
+ myLayerSet.append(QgsMapCanvasLayer( mypLayer ) );
// set teh canvas to the extent of our layer
mpMapCanvas->setExtent(mypLayer->extent());
// Set the Map Canvas Layer Set
Modified: trunk/code_examples/3_basic_labelling/tutorial3.html
===================================================================
--- trunk/code_examples/3_basic_labelling/tutorial3.html 2008-11-08 19:06:55 UTC (rev 9600)
+++ trunk/code_examples/3_basic_labelling/tutorial3.html 2008-11-08 19:59:16 UTC (rev 9601)
@@ -1,8 +1,11 @@
<img src="images/tim50x50.png" align="left">In my last tutorial I briefly ran through using map tools to facilitate user interaction with the map canvas. Today we will take a brief look at labelling features.
+<strong>Updated November 2008 to use cmake build system and the updated QGIS 1.0.0 API. Tim</strong>
+
+<!--break-->
<img src="http://blog.qgis.org/files/tutorial3.jpg"/>
-<!--break-->
+
Before I carry on too far, note that QGIS's automatic labelling algorithm is very primative. Martin Dobias is planning to implement a much more useful label placement routine - but its not going to be available in QGIS 0.8. For the best label placement results you should defined fields in your attribute table for position, rotation etc of the label. Since this is only intended to be a 'get you started' introduction, I won't be doing all that here...
<p>The entire project can be checked out form the QGIS Subversion repository using the following command:</p>
@@ -50,26 +53,26 @@
Great now we have a handle on the QgsLabel and QgsLabelAttributes we can start to manipulate how the label will be displayed. Note that the mypLabel->layerAttributes() method is poorly named and will likely be changed (to labelAttributes()) before the final release of QGIS 1.0.
-Ok next lets ask the vector layer what attribute fields it has so that we can select one to be used for labelling:
+Ok next lets ask the vector layer's data provider what attribute fields it has so that we can select one to be used for labelling:
<pre>
//get the field list associated with the layer
//we'll print the names out to console for diagnostic purposes
- std::vector<QgsField> myFields = mypLayer->fields();
+ QgsFieldMap myFields = mypLayer->dataProvider()->fields();
for (unsigned int i = 0; i < myFields.size(); i++ )
{
- qDebug("Field Name: " + myFields[i].name().toLocal8Bit() );
+ qDebug("Field Name: " + QString(myFields[i].name()).toLocal8Bit() );
}
</pre>
-By the way - you can browse the code for field, label, lable attributes etc from <a href="https://svn.qgis.org/trac/browser/trunk/qgis/src/">the QGIS source browser</a>. Look in the 'core' and 'gui' subdirectories. Also for more implementation examples of how to set up labelling, it is worth taking a look at <a href="https://svn.qgis.org/trac/browser/trunk/qgis/src/gui/qgslabeldialog.cpp">qgslabeldialog.cpp</a>.
+By the way - you can browse the code for field, label, lable attributes etc from <a href="https://trac.osgeo.org/qgis/browser/trunk/qgis/src/">the QGIS source browser</a>. Look in the 'core' and 'gui' subdirectories. Also for more implementation examples of how to set up labelling, it is worth taking a look at <a href="https://trac.osgeo.org/qgis/browser/trunk/qgis/src/gui/qgslabeldialog.cpp">qgslabeldialog.cpp</a>.
With access to the list of fields in your vector layer, you can then for example present the user with a combo box to select a label field. In this simple tutorial though I am simply going to use the last field in the attribute table. Its a bit of a no brainer because our attribute table only has one field! But at least this way its soft coded...
<pre>
//just use the last field's name in the fields list as the label field!
qDebug("set label field to " + myFields[myFields.size()-1].name());
- mypLabel->setLabelField( QgsLabel::Text, myFields[myFields.size()-1].name());
+ mypLabel->setLabelField( QgsLabel::Text, myFields.size()-1);
</pre>
There are a bunch of other things we can do to manipulate the appearance of the label. Lets set the text colour to black and draw a yellow 1 point 'halo' buffer around it so the label won't get lost when there are black features behind it:
@@ -88,7 +91,7 @@
Finally we need to tell the layer that rendering of labels should be enabled:
<pre>
- mypLayer->setLabelOn(true);
+ mypLayer->enableLabels(true);
</pre>
For the absolute best labelling results, I advise you to store all the label properties you can inside your attribute table. Doing this will allow you to set rotation, placement etc on a per label basis. I left some comments in the tutorial source code that will get you started with this:
@@ -115,12 +118,28 @@
Well that wraps up this tutorial. One thing I noticed is that the canvas is not refreshing properly sometimes on the mac unless you cover the application briefly with another window. Ill post an update here if I figure out what is causing this.
+You can check out and build this tutorial using SVN and CMake using the following steps:
+
+<pre>
+svn co https://svn.osgeo.org/qgis/trunk/code_examples/3_basic_labelling
+cd 3_basic_labelling
+mkdir build
+#optionally specify where your QGIS is installed (should work on all platforms)
+#if your QGIS is installed to /usr or /usr/local you can leave this next step out
+export LIB_DIR=/home/timlinux/apps
+cmake ..
+make
+./timtut3
+</pre>
+
+
<h3>Mac Specific Notes</h3>
-After building the application bundle (qmake; make) you can copy the spatial reference system database into the bundle to avoid 'cant find resource' type errors:
+After building the application bundle (cmake; make) you can copy the spatial reference system database into the bundle to avoid 'cant find resource' type errors:
<pre>
mkdir -p qgis_example3.app/Contents/MacOS/share/qgis/resources/
cp -r /Applications/qgis.app/Contents/MacOS/share/qgis/resources/* \
qgis_example3.app/Contents/MacOS/share/qgis/resources/
</pre>
+
More information about the QGIS-commit
mailing list