Author: frankie
Date: 2007-06-28 11:02:43 +0000 (Thu, 28 Jun 2007)
New Revision: 947
Added:
packages/qgis/trunk/debian/patches/cmake.dpatch
packages/qgis/trunk/debian/patches/georef.dpatch
Modified:
packages/qgis/trunk/debian/changelog
packages/qgis/trunk/debian/control
packages/qgis/trunk/debian/libqgis1-dev.install
packages/qgis/trunk/debian/libqgis1.install
packages/qgis/trunk/debian/patches/00list
packages/qgis/trunk/debian/qgis-plugin-grass.install
packages/qgis/trunk/debian/qgis.install
packages/qgis/trunk/debian/rules
Log:
Fixes for 0.8.1
Modified: packages/qgis/trunk/debian/changelog
===================================================================
--- packages/qgis/trunk/debian/changelog 2007-06-28 10:57:00 UTC (rev
946)
+++ packages/qgis/trunk/debian/changelog 2007-06-28 11:02:43 UTC (rev
947)
@@ -1,3 +1,15 @@
+qgis (0.8.1-1) UNRELEASED; urgency=low
+
+ * New upstream release.
+ * Now the building system is based on cmake. Qt4 and SIP are required.
+ * Added cmake.dpatch new patch (to build-up consistently)
+ * Added georef.dpatch new patch (improvement of georeferencer)
+ * Removed obsolete postgresql-dev build-dep
+ (closes: #429984)
+ * Removed obsolete libmysqlclient14-dev build-dep
+
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Tue, 19 Jun 2007 18:28:05
+0200
+
qgis (0.8.0-5) unstable; urgency=low
* Added python-dev build-dep.
@@ -11,13 +23,14 @@
* Enabled python scripts support and changed build-dep and suggests as
consequence.
* Enabled WFS support.
+ (closes: #302618)
* Long description revised.
* Patch gcc43-fixes updated. Thanks again Martin Michlmayr.
(closes: #417522)
* Now installing missing binaries: msexport, qgis_help
(closes: #423989)
- -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Mon, 21 May 2007 17:28:17
+0200
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Tue, 22 May 2007 17:03:18
+0200
qgis (0.8.0-3) unstable; urgency=low
Modified: packages/qgis/trunk/debian/control
===================================================================
--- packages/qgis/trunk/debian/control 2007-06-28 10:57:00 UTC (rev 946)
+++ packages/qgis/trunk/debian/control 2007-06-28 11:02:43 UTC (rev 947)
@@ -3,9 +3,9 @@
Priority: extra
Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org>
Uploaders: Francesco Paolo Lovergine <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libqt4-dev, libpq-dev |
postgresql-dev, libgeos-dev (>= 2.0.1-1), dpatch,
- grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
libmysqlclient15-dev | libmysqlclient14-dev,
- flex, bison, python-dev, autoconf, automake
+Build-Depends: debhelper (>= 5.0.0), libgdal1-dev, libqt4-dev (>=4.2.0),
libpq-dev,
+ libgeos-dev (>= 2.0.1-1), dpatch, grass-dev, libsqlite3-dev, libgsl0-dev,
proj, libexpat1-dev,
+ libmysqlclient15-dev, flex, bison, python-dev, cmake (>=2.4.3) ,
python-sip4-dev, python-qt4-dev
Standards-Version: 3.7.2
Package: qgis
Modified: packages/qgis/trunk/debian/libqgis1-dev.install
===================================================================
--- packages/qgis/trunk/debian/libqgis1-dev.install 2007-06-28 10:57:00 UTC
(rev 946)
+++ packages/qgis/trunk/debian/libqgis1-dev.install 2007-06-28 11:02:43 UTC
(rev 947)
@@ -1,22 +1,22 @@
-usr/bin/qgis-config
-usr/lib/libqgis*a
+#usr/bin/qgis-config
+#usr/lib/libqgis*a
usr/include/qgis/*
-usr/share/aclocal/qgis.m4
-usr/lib/qgis/copyrightlabelplugin.a
-usr/lib/qgis/libqgsprojectionselector.a
-usr/lib/qgis/delimitedtextplugin.a
-usr/lib/qgis/northarrowplugin.a
-usr/lib/qgis/delimitedtextprovider.a
-usr/lib/qgis/ogrprovider.a
-usr/lib/qgis/georefplugin.a
-usr/lib/qgis/pggeoprocessingplugin.a
-usr/lib/qgis/gpsimporterplugin.a
-usr/lib/qgis/postgresprovider.a
-usr/lib/qgis/gpxprovider.a
-usr/lib/qgis/scalebarplugin.a
-usr/lib/qgis/grassplugin.a
-usr/lib/qgis/spitplugin.a
-usr/lib/qgis/grassprovider.a
-usr/lib/qgis/wmsprovider.a
-usr/lib/qgis/gridmakerplugin.a
+#usr/share/aclocal/qgis.m4
+#usr/lib/qgis/copyrightlabelplugin.a
+#usr/lib/qgis/libqgsprojectionselector.a
+#usr/lib/qgis/delimitedtextplugin.a
+#usr/lib/qgis/northarrowplugin.a
+#usr/lib/qgis/delimitedtextprovider.a
+#usr/lib/qgis/ogrprovider.a
+#usr/lib/qgis/georefplugin.a
+#usr/lib/qgis/pggeoprocessingplugin.a
+#usr/lib/qgis/gpsimporterplugin.a
+#usr/lib/qgis/postgresprovider.a
+#usr/lib/qgis/gpxprovider.a
+#usr/lib/qgis/scalebarplugin.a
+#usr/lib/qgis/grassplugin.a
+#usr/lib/qgis/spitplugin.a
+#usr/lib/qgis/grassprovider.a
+#usr/lib/qgis/wmsprovider.a
+#usr/lib/qgis/gridmakerplugin.a
Modified: packages/qgis/trunk/debian/libqgis1.install
===================================================================
--- packages/qgis/trunk/debian/libqgis1.install 2007-06-28 10:57:00 UTC (rev
946)
+++ packages/qgis/trunk/debian/libqgis1.install 2007-06-28 11:02:43 UTC (rev
947)
@@ -1,5 +1,5 @@
-usr/lib/libqgis_composer.so*
+#usr/lib/libqgis_composer.so*
usr/lib/libqgis_core.so*
-usr/lib/libqgis_gui.so*
-usr/lib/libqgis_legend.so*
-usr/lib/libqgis_raster.so*
+#usr/lib/libqgis_gui.so*
+#usr/lib/libqgis_legend.so*
+#usr/lib/libqgis_raster.so*
Modified: packages/qgis/trunk/debian/patches/00list
===================================================================
--- packages/qgis/trunk/debian/patches/00list 2007-06-28 10:57:00 UTC (rev
946)
+++ packages/qgis/trunk/debian/patches/00list 2007-06-28 11:02:43 UTC (rev
947)
@@ -1,4 +1,6 @@
-move-doc-dir
-gridmaker_bin
-gcc43-fixes
-ax_python
+cmake
+georef
+#move-doc-dir
+#gridmaker_bin
+#gcc43-fixes
+#ax_python
Added: packages/qgis/trunk/debian/patches/cmake.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/cmake.dpatch
(rev 0)
+++ packages/qgis/trunk/debian/patches/cmake.dpatch 2007-06-28 11:02:43 UTC
(rev 947)
@@ -0,0 +1,188 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## cmake.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad qgis~/cmake/FindGDAL.cmake qgis/cmake/FindGDAL.cmake
+--- qgis~/cmake/FindGDAL.cmake 2007-06-17 01:12:36.000000000 +0200
++++ qgis/cmake/FindGDAL.cmake 2007-06-17 01:12:38.000000000 +0200
+@@ -37,7 +37,7 @@
+ EXEC_PROGRAM(${GDAL_CONFIG}
+ ARGS --prefix
+ OUTPUT_VARIABLE GDAL_PREFIX)
+- SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include CACHE STRING INTERNAL)
++ SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include/gdal CACHE STRING INTERNAL)
+
+ ## extract link dirs for rpath
+ EXEC_PROGRAM(${GDAL_CONFIG}
+diff -urNad qgis~/src/plugins/grid_maker/CMakeLists.txt
qgis/src/plugins/grid_maker/CMakeLists.txt
+--- qgis~/src/plugins/grid_maker/CMakeLists.txt 2007-06-17
01:12:36.000000000 +0200
++++ qgis/src/plugins/grid_maker/CMakeLists.txt 2007-06-17 01:14:46.000000000
+0200
+@@ -1,82 +1,83 @@
+-
+-########################################################
+-# Files
+-
+-SET (GRID_COMMON_SRCS
+- plugingui.cpp
+- graticulecreator.cpp
+- utils.c
+- shpopen.c
+- dbfopen.c
+-)
+-
+-SET (GRID_SRCS
+- plugin.cpp
+- ${GRID_COMMON_SRCS}
+-)
+-
+-SET (GRID_BINARY_SRCS
+- main.cpp
+- ${GRID_COMMON_SRCS}
+-)
+-
+-SET (GRID_UIS pluginguibase.ui)
+-
+-SET (GRID_COMMON_MOC_HDRS plugingui.h)
+-
+-SET (GRID_MOC_HDRS plugin.h)
+-
+-SET (GRID_RCCS gridmaker_plugin.qrc)
+-
+-########################################################
+-# Build
+-
+-QT4_WRAP_UI (GRID_UIS_H ${GRID_UIS})
+-
+-QT4_WRAP_CPP (GRID_COMMON_MOC_SRCS ${GRID_COMMON_MOC_HDRS})
+-
+-QT4_WRAP_CPP (GRID_MOC_SRCS ${GRID_MOC_HDRS})
+-
+-QT4_ADD_RESOURCES(GRID_RCC_SRCS ${GRID_RCCS})
+-
+-ADD_LIBRARY (gridmakerplugin MODULE ${GRID_SRCS} ${GRID_MOC_SRCS}
${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H})
+-
+-INCLUDE_DIRECTORIES(
+- ${CMAKE_CURRENT_BINARY_DIR}
+- ../../core ../../core/raster ../../core/renderer ../../core/symbology
+- ../../gui
+- ${CMAKE_CURRENT_BINARY_DIR}/../../ui
+- ..
+- ${GEOS_INCLUDE_DIR}
+- ${PROJ_INCLUDE_DIR}
+- ${GDAL_INCLUDE_DIR}
+-)
+-
+-TARGET_LINK_LIBRARIES(gridmakerplugin
+- ${QT_LIBRARIES}
+- ${PROJ_LIBRARY}
+- ${GDAL_LIBRARIES}
+- qgis_core
+-)
+-
+-IF (PLUGINS_ALSO_BINARIES)
+-
+- ADD_EXECUTABLE (gridmaker ${GRID_BINARY_SRCS} ${GRID_COMMON_MOC_SRCS}
${GRID_RCC_SRCS})
+-
+- TARGET_LINK_LIBRARIES(gridmaker
+- ${QT_LIBRARIES}
+- qgis_core
+- )
+-
+-ENDIF (PLUGINS_ALSO_BINARIES)
+-
+-########################################################
+-# Install
+-
+-INSTALL(TARGETS gridmakerplugin
+- RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
+- LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
+-
+-IF (PLUGINS_ALSO_BINARIES)
+- INSTALL(TARGETS gridmaker RUNTIME DESTINATION ${QGIS_BIN_DIR})
+-ENDIF (PLUGINS_ALSO_BINARIES)
++
++########################################################
++# Files
++
++SET (GRID_COMMON_SRCS
++ plugingui.cpp
++ graticulecreator.cpp
++ utils.c
++ shpopen.c
++ dbfopen.c
++)
++
++SET (GRID_SRCS
++ plugin.cpp
++ ${GRID_COMMON_SRCS}
++)
++
++SET (GRID_BINARY_SRCS
++ main.cpp
++ ${GRID_COMMON_SRCS}
++)
++
++SET (GRID_UIS pluginguibase.ui)
++
++SET (GRID_COMMON_MOC_HDRS plugingui.h)
++
++SET (GRID_MOC_HDRS plugin.h)
++
++SET (GRID_RCCS gridmaker_plugin.qrc)
++
++########################################################
++# Build
++
++QT4_WRAP_UI (GRID_UIS_H ${GRID_UIS})
++
++QT4_WRAP_CPP (GRID_COMMON_MOC_SRCS ${GRID_COMMON_MOC_HDRS})
++
++QT4_WRAP_CPP (GRID_MOC_SRCS ${GRID_MOC_HDRS})
++
++QT4_ADD_RESOURCES(GRID_RCC_SRCS ${GRID_RCCS})
++
++ADD_LIBRARY (gridmakerplugin MODULE ${GRID_SRCS} ${GRID_MOC_SRCS}
${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H})
++
++INCLUDE_DIRECTORIES(
++ ${CMAKE_CURRENT_BINARY_DIR}
++ ../../core ../../core/raster ../../core/renderer ../../core/symbology
++ ../../gui
++ ../../ui
++ ${CMAKE_CURRENT_BINARY_DIR}/../../ui
++ ..
++ ${GEOS_INCLUDE_DIR}
++ ${PROJ_INCLUDE_DIR}
++ ${GDAL_INCLUDE_DIR}
++)
++
++TARGET_LINK_LIBRARIES(gridmakerplugin
++ ${QT_LIBRARIES}
++ ${PROJ_LIBRARY}
++ ${GDAL_LIBRARIES}
++ qgis_core
++)
++
++IF (PLUGINS_ALSO_BINARIES)
++
++ ADD_EXECUTABLE (gridmaker ${GRID_BINARY_SRCS} ${GRID_COMMON_MOC_SRCS}
${GRID_RCC_SRCS})
++
++ TARGET_LINK_LIBRARIES(gridmaker
++ ${QT_LIBRARIES}
++ qgis_core
++ )
++
++ENDIF (PLUGINS_ALSO_BINARIES)
++
++########################################################
++# Install
++
++INSTALL(TARGETS gridmakerplugin
++ RUNTIME DESTINATION ${QGIS_PLUGIN_DIR}
++ LIBRARY DESTINATION ${QGIS_PLUGIN_DIR})
++
++IF (PLUGINS_ALSO_BINARIES)
++ INSTALL(TARGETS gridmaker RUNTIME DESTINATION ${QGIS_BIN_DIR})
++ENDIF (PLUGINS_ALSO_BINARIES)
Property changes on: packages/qgis/trunk/debian/patches/cmake.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Added: packages/qgis/trunk/debian/patches/georef.dpatch
===================================================================
--- packages/qgis/trunk/debian/patches/georef.dpatch
(rev 0)
+++ packages/qgis/trunk/debian/patches/georef.dpatch 2007-06-28 11:02:43 UTC
(rev 947)
@@ -0,0 +1,692 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## georef.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
[EMAIL PROTECTED]@
+diff -urNad qgis~/src/core/CMakeLists.txt qgis/src/core/CMakeLists.txt
+--- qgis~/src/core/CMakeLists.txt 2007-06-22 21:31:12.000000000 +0200
++++ qgis/src/core/CMakeLists.txt 2007-06-22 21:32:27.000000000 +0200
+@@ -41,6 +41,7 @@
+ ../gui/qgsmaprender.cpp
+ ../gui/qgsmaptoolcapture.cpp
+ ../gui/qgsmaptool.cpp
++../gui/qgsmaptoolemitpoint.cpp
+ ../gui/qgsmaptoolidentify.cpp
+ ../gui/qgsmaptoolpan.cpp
+ ../gui/qgsmaptoolselect.cpp
+@@ -142,6 +143,7 @@
+ ../gui/qgsmapoverviewcanvas.h
+ ../gui/qgsmaplayer.h
+ ../gui/qgsmaplayerregistry.h
++../gui/qgsmaptoolemitpoint.h
+ ../gui/qgsmaptoolidentify.h
+ ../gui/qgspointstylewidget.h
+ ../widgets/projectionselector/qgsprojectionselector.h
+@@ -403,6 +405,7 @@
+ ../gui/qgsmaprender.h
+ ../gui/qgsmaptoolcapture.h
+ ../gui/qgsmaptool.h
++../gui/qgsmaptoolemitpoint.h
+ ../gui/qgsmaptoolidentify.h
+ ../gui/qgsmaptoolpan.h
+ ../gui/qgsmaptoolselect.h
+diff -urNad qgis~/src/gui/Makefile.am qgis/src/gui/Makefile.am
+--- qgis~/src/gui/Makefile.am 2007-06-22 21:31:12.000000000 +0200
++++ qgis/src/gui/Makefile.am 2007-06-22 21:32:27.000000000 +0200
+@@ -109,6 +109,7 @@
+ qgsmapserverexport.h \
+ qgsmaptool.h \
+ qgsmaptoolcapture.h \
++ qgsmaptoolemitpoint.h \
+ qgsmaptoolidentify.h \
+ qgsmaptoolpan.h \
+ qgsmaptoolselect.h \
+@@ -178,6 +179,7 @@
+ qgsmapoverviewcanvas.moc.cpp \
+ qgsmaprender.moc.cpp \
+ qgsmapserverexport.moc.cpp \
++ qgsmaptoolemitpoint.moc.cpp \
+ qgsmaptoolidentify.moc.cpp \
+ qgsmarkerdialog.moc.cpp \
+ qgsmeasure.moc.cpp \
+@@ -240,6 +242,7 @@
+ qgsmapserverexport.cpp \
+ qgsmaptool.cpp \
+ qgsmaptoolcapture.cpp \
++ qgsmaptoolemitpoint.cpp \
+ qgsmaptoolidentify.cpp \
+ qgsmaptoolpan.cpp \
+ qgsmaptoolselect.cpp \
+diff -urNad qgis~/src/gui/pencil.png qgis/src/gui/pencil.png
+--- qgis~/src/gui/pencil.png 1970-01-01 01:00:00.000000000 +0100
++++ qgis/src/gui/pencil.png 2007-06-22 21:33:47.000000000 +0200
+@@ -0,0 +1,5 @@
++�PNG
++
++
+IHDR szz� gAMA ��7�� tEXtSoftware Adobe
ImageReadyq�e<[EMAIL
PROTECTED]@� � b�1)3IV��AJ��� ��_� �_� ��2���b`������3` ����
r�b���ع�.�~��j�N����b�?���Z��b�ՀK�20�����O�b.��=�^)01�}���C�#��u�M
�X00���i [EMAIL PROTECTED]) ���`�l ?Jh~.
+��� &����WVn�o �"\ �̂ ��?X
+>03�fl�i ң�����T�������7�rf�� ����f�=�Ҟ2pp�����2���3��1���g��t� ��
�0Z�� � �� �ڙY���?� �O�5�N�M��^00131�� �俟 2� �"� � � ?Y�2�``�u
�`߽��� "[EMAIL PROTECTED] ����=�� �t�^*;��F/��ߌ ��bP��Z��
¦�p��*��'60l�(����ۉ o�� � ��s`b�
+��180���J/[EMAIL PROTECTED]>Vq�3��3�ܻ�a�Tq��W^�0||[EMAIL
PROTECTED]&� 0R�ꌿ��L�h����6����� [EMAIL PROTECTED]
[EMAIL PROTECTED]
+-)�2�0s������QA�+�r&PI��`� �`"�j >�2,^}���b�� � $0|�� [EMAIL
PROTECTED] �,�j�=�2�+����4ؘ��" B~1|[EMAIL PROTECTED]|�< �Bq �|�
_�0�x�ϰ`�k�{[�/2ܽ ����u|� [EMAIL PROTECTED]
[EMAIL PROTECTED] Mp`�K-_�
�͚��3'0V�AE�rn)�`��gx��$��kS������ �*�OS�9�31
��f&:�����,�4d ��7M�o [EMAIL PROTECTED]|J [EMAIL
PROTECTED],�UsY� �3����"��?�/ �p� 0���T��� *�5�~+/[EMAIL PROTECTED]
��-bظ����5 �>��Z��L���t;P��__.~6�_��� +3��b� �i r<� ��/`X�o
+���<?�������� r�5� BԆ��P���Kj�|\�����t���=C�r.�$�
É��&o^��m>���G?��k9 "�B|����U����5ñw� ��v �j� �l, �^�0,�~���&�G
�?F2|�s��&[EMAIL PROTECTED])���x3
I + ��V6�9����k� �1��z���N` ?��ǿ��6� �LM����3�20�k>f?�`��f(\W�������8�1�� ���Q�9
[EMAIL PROTECTED] 9�/��� ��p�ҹ�o���iÃ��5�g*� b���3
+~��bx&���� �&��`x��<�}�� [EMAIL PROTECTED] �M�����y�̤e�
��.�F�!����(�J� �^� b ��)@
+x� �� Q�pԌ�s IEND�B`�
+\ No newline at end of file
+diff -urNad qgis~/src/gui/qgsmaptool.cpp qgis/src/gui/qgsmaptool.cpp
+--- qgis~/src/gui/qgsmaptool.cpp 2007-06-22 21:31:12.000000000 +0200
++++ qgis/src/gui/qgsmaptool.cpp 2007-06-22 21:32:27.000000000 +0200
+@@ -1,5 +1,5 @@
+ /***************************************************************************
+- qgsmaptool.h - base class for map canvas tools
++ qgsmaptool.cpp - base class for map canvas tools
+ ----------------------
+ begin : January 2006
+ copyright : (C) 2006 by Martin Dobias
+@@ -21,9 +21,10 @@
+ #include "qgsmaptopixel.h"
+ #include "qgsproject.h"
+ #include <QAction>
++#include <QAbstractButton>
+
+ QgsMapTool::QgsMapTool(QgsMapCanvas* canvas)
+- : mCanvas(canvas), mCursor(Qt::CrossCursor), mAction(NULL)
++ : mCanvas(canvas), mCursor(Qt::CrossCursor), mAction(NULL), mButton(NULL)
+ {
+ }
+
+@@ -74,9 +75,11 @@
+
+ void QgsMapTool::activate()
+ {
+- // make action active
++ // make action and/or button active
+ if (mAction)
+ mAction->setChecked(true);
++ if (mButton)
++ mButton->setChecked(true);
+
+ // set cursor (map tools usually set it in constructor)
+ mCanvas->setCursor(mCursor);
+@@ -88,4 +91,17 @@
+ {
+ if (mAction)
+ mAction->setChecked(false);
++ if (mButton)
++ mButton->setChecked(false);
+ }
++
++void QgsMapTool::setButton(QAbstractButton* button)
++{
++ mButton = button;
++}
++
++QAbstractButton* QgsMapTool::button()
++{
++ return mButton;
++}
++
+diff -urNad qgis~/src/gui/qgsmaptool.h qgis/src/gui/qgsmaptool.h
+--- qgis~/src/gui/qgsmaptool.h 2007-06-22 21:31:12.000000000 +0200
++++ qgis/src/gui/qgsmaptool.h 2007-06-22 21:32:27.000000000 +0200
+@@ -26,7 +26,7 @@
+ class QgsPoint;
+ class QPoint;
+ class QAction;
+-
++class QAbstractButton;
+
+ class QgsMapTool
+ {
+@@ -47,15 +47,24 @@
+ //! Called when rendering has finished
+ virtual void renderComplete() {}
+
+- /** Use this to associate a button, toolbutton, menu entry etc
+- * that inherits qaction to this maptool. Then when the setMapTool
++
++ /** Use this to associate a QAction to this maptool. Then when the
setMapTool
+ * method of mapcanvas is called the action state will be set to on.
+ * Usually this will cause e.g. a toolbutton to appear pressed in and
+ * the previously used toolbutton to pop out. */
+ void setAction(QAction* action) { mAction = action; }
+
++ /** Return associated action with map tool or NULL if no action is
associated */
+ QAction* action() { return mAction; }
+
++ /** Use this to associate a button to this maptool. It has the same
meaning
++ * as setAction() function except it works with a button instead of an
QAction. */
++ void setButton(QAbstractButton* button);
++
++ /** Return associated button with map tool or NULL if no button is
associated */
++ QAbstractButton* button();
++
++
+ /** Check whether this MapTool performs a zoom or pan operation.
+ * If it does, we will be able to perform the zoom and then
+ * resume operations with the original / previously used tool.*/
+@@ -91,6 +100,10 @@
+ //! which will be used to set that action as active
+ QAction* mAction;
+
++ //! optionally map tool can have pointer to a button
++ //! which will be used to set that action as active
++ QAbstractButton* mButton;
++
+ };
+
+ #endif
+diff -urNad qgis~/src/gui/qgsmaptoolemitpoint.cpp
qgis/src/gui/qgsmaptoolemitpoint.cpp
+--- qgis~/src/gui/qgsmaptoolemitpoint.cpp 1970-01-01 01:00:00.000000000
+0100
++++ qgis/src/gui/qgsmaptoolemitpoint.cpp 2007-06-22 21:32:59.000000000
+0200
+@@ -0,0 +1,39 @@
++/***************************************************************************
++ qgsmaptoolemitpoint.cpp - map tool that emits a signal on click
++ ---------------------
++ begin : June 2007
++ copyright : (C) 2007 by Martin Dobias
++ email : wonder.sk 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. *
++ * *
++ ***************************************************************************/
++/* $Id$ */
++
++
++#include "qgsmaptoolemitpoint.h"
++#include "qgsmapcanvas.h"
++
++
++QgsMapToolEmitPoint::QgsMapToolEmitPoint(QgsMapCanvas* canvas)
++ : QgsMapTool(canvas)
++{
++}
++
++void QgsMapToolEmitPoint::canvasMoveEvent(QMouseEvent * e)
++{
++}
++
++void QgsMapToolEmitPoint::canvasPressEvent(QMouseEvent * e)
++{
++ QgsPoint pnt = toMapCoords(e->pos());
++ emit gotPoint(pnt, e->button());
++}
++
++void QgsMapToolEmitPoint::canvasReleaseEvent(QMouseEvent * e)
++{
++}
+diff -urNad qgis~/src/gui/qgsmaptoolemitpoint.h
qgis/src/gui/qgsmaptoolemitpoint.h
+--- qgis~/src/gui/qgsmaptoolemitpoint.h 1970-01-01 01:00:00.000000000
+0100
++++ qgis/src/gui/qgsmaptoolemitpoint.h 2007-06-22 21:33:05.000000000 +0200
+@@ -0,0 +1,49 @@
++/***************************************************************************
++ qgsmaptoolemitpoint.h - map tool that emits a signal on click
++ ---------------------
++ begin : June 2007
++ copyright : (C) 2007 by Martin Dobias
++ email : wonder.sk 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. *
++ * *
++ ***************************************************************************/
++/* $Id$ */
++
++#ifndef QGSMAPTOOLEMITPOINT_H
++#define QGSMAPTOOLEMITPOINT_H
++
++#include "qgspoint.h"
++#include "qgsmaptool.h"
++class QgsMapCanvas;
++
++#include <QObject>
++
++class QgsMapToolEmitPoint : public QObject, public QgsMapTool
++{
++ Q_OBJECT
++
++ public:
++ //! constructor
++ QgsMapToolEmitPoint(QgsMapCanvas* canvas);
++
++ //! Overridden mouse move event
++ virtual void canvasMoveEvent(QMouseEvent * e);
++
++ //! Overridden mouse press event - emits the signal
++ virtual void canvasPressEvent(QMouseEvent * e);
++
++ //! Overridden mouse release event
++ virtual void canvasReleaseEvent(QMouseEvent * e);
++
++ signals:
++
++ //! signal emitted on canvas click
++ void gotPoint(QgsPoint& point, Qt::MouseButton button);
++};
++
++#endif
+diff -urNad qgis~/src/plugins/georeferencer/georeferencer.qrc
qgis/src/plugins/georeferencer/georeferencer.qrc
+--- qgis~/src/plugins/georeferencer/georeferencer.qrc 2007-06-22
21:31:12.000000000 +0200
++++ qgis/src/plugins/georeferencer/georeferencer.qrc 2007-06-22
21:32:27.000000000 +0200
+@@ -1,6 +1,7 @@
+ <RCC>
+ <qresource prefix="/" >
+- <file>icon.png</file>
+ <file>georef.png</file>
++ <file>icon.png</file>
++ <file>pencil.png</file>
+ </qresource>
+ </RCC>
+diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialog.cpp
qgis/src/plugins/georeferencer/mapcoordsdialog.cpp
+--- qgis~/src/plugins/georeferencer/mapcoordsdialog.cpp 2007-06-22
21:31:12.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialog.cpp 2007-06-22
21:32:27.000000000 +0200
+@@ -1,24 +1,34 @@
++
+ #include <QValidator>
+ #include <mapcoordsdialog.h>
+
++#include <qgsmapcanvas.h>
++#include <qgsmaptoolemitpoint.h>
+
+ MapCoordsDialog::MapCoordsDialog() {
+
+ }
+
+
+-MapCoordsDialog::MapCoordsDialog(const QgsPoint& pixelCoords,
++MapCoordsDialog::MapCoordsDialog(const QgsPoint& pixelCoords, QgsMapCanvas*
qgisCanvas,
+ QWidget* parent, Qt::WFlags fl)
+ : QDialog(parent, fl) {
+ setupUi(this);
+ mPixelCoords = pixelCoords;
++ mQgisCanvas = qgisCanvas;
+ leXCoord->setValidator(new QDoubleValidator(this));
+ leYCoord->setValidator(new QDoubleValidator(this));
++
++ mToolEmitPoint = new QgsMapToolEmitPoint(qgisCanvas);
++ mToolEmitPoint->setButton(btnPointFromCanvas);
++ connect((QgsMapToolEmitPoint*)mToolEmitPoint,
SIGNAL(gotPoint(QgsPoint&,Qt::MouseButton)),
++ this, SLOT(setXY(QgsPoint&)));
+ }
+
+
+ MapCoordsDialog::~MapCoordsDialog() {
+
++ delete mToolEmitPoint;
+ }
+
+
+@@ -32,3 +42,20 @@
+ {
+ reject();
+ }
++
++void MapCoordsDialog::setXY(QgsPoint & xy)
++{
++ leXCoord->clear();
++ leYCoord->clear();
++ leXCoord->insert(QString::number(xy.x(),'f',7));
++ leYCoord->insert(QString::number(xy.y(),'f',7));
++
++ mQgisCanvas->setMapTool(mPrevMapTool);
++}
++
++void MapCoordsDialog::on_btnPointFromCanvas_clicked()
++{
++ mPrevMapTool = mQgisCanvas->mapTool();
++ mQgisCanvas->setMapTool(mToolEmitPoint);
++}
++
+diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialog.h
qgis/src/plugins/georeferencer/mapcoordsdialog.h
+--- qgis~/src/plugins/georeferencer/mapcoordsdialog.h 2007-06-22
21:31:12.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialog.h 2007-06-22
21:32:27.000000000 +0200
+@@ -14,6 +14,9 @@
+
+ #include <qgspoint.h>
+
++class QgsMapCanvas;
++class QgsMapTool;
++
+ #include <ui_mapcoordsdialogbase.h>
+ #include <QDialog>
+ class MapCoordsDialog : public QDialog, private Ui::MapCoordsDialogBase
+@@ -21,7 +24,7 @@
+ Q_OBJECT
+ public:
+ MapCoordsDialog();
+- MapCoordsDialog(const QgsPoint& pixelCoords,
++ MapCoordsDialog(const QgsPoint& pixelCoords, QgsMapCanvas* qgisCanvas,
+ QWidget* parent = 0, Qt::WFlags fl = 0);
+ ~MapCoordsDialog();
+
+@@ -30,9 +33,18 @@
+ void on_buttonOk_clicked();
+ void on_buttonCancel_clicked();
+
++ void on_btnPointFromCanvas_clicked();
++
++ void setXY(QgsPoint &);
++
+ private:
+
+ QgsPoint mPixelCoords;
++
++ QgsMapTool* mToolEmitPoint;
++ QgsMapTool* mPrevMapTool;
++
++ QgsMapCanvas* mQgisCanvas;
+
+ signals:
+
+diff -urNad qgis~/src/plugins/georeferencer/mapcoordsdialogbase.ui
qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui
+--- qgis~/src/plugins/georeferencer/mapcoordsdialogbase.ui 2007-06-22
21:31:12.000000000 +0200
++++ qgis/src/plugins/georeferencer/mapcoordsdialogbase.ui 2007-06-22
21:32:27.000000000 +0200
+@@ -1,15 +1,12 @@
+ <ui version="4.0" >
+- <author></author>
+- <comment></comment>
+- <exportmacro></exportmacro>
+ <class>MapCoordsDialogBase</class>
+ <widget class="QDialog" name="MapCoordsDialogBase" >
+ <property name="geometry" >
+ <rect>
+ <x>0</x>
+ <y>0</y>
+- <width>290</width>
+- <height>110</height>
++ <width>389</width>
++ <height>203</height>
+ </rect>
+ </property>
+ <property name="windowTitle" >
+@@ -18,77 +15,187 @@
+ <property name="sizeGripEnabled" >
+ <bool>true</bool>
+ </property>
+- <layout class="QGridLayout" >
++ <layout class="QVBoxLayout" >
+ <property name="margin" >
+- <number>10</number>
++ <number>9</number>
+ </property>
+ <property name="spacing" >
+ <number>6</number>
+ </property>
+- <item row="0" column="0" >
+- <widget class="QLabel" name="textLabel1" >
++ <item>
++ <widget class="QLabel" name="label" >
+ <property name="text" >
+- <string>X:</string>
++ <string>Enter X and Y coordinates 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.</string>
+ </property>
+- </widget>
+- </item>
+- <item row="1" column="0" >
+- <widget class="QLabel" name="textLabel2" >
+- <property name="text" >
+- <string>Y:</string>
++ <property name="wordWrap" >
++ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+- <item row="1" column="1" colspan="3" >
+- <widget class="QLineEdit" name="leYCoord" />
+- </item>
+- <item row="0" column="1" colspan="3" >
+- <widget class="QLineEdit" name="leXCoord" />
+- </item>
+- <item row="2" column="0" colspan="2" >
++ <item>
+ <spacer>
+ <property name="orientation" >
+- <enum>Qt::Horizontal</enum>
++ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeType" >
+- <enum>QSizePolicy::Expanding</enum>
++ <enum>QSizePolicy::Fixed</enum>
+ </property>
+ <property name="sizeHint" >
+ <size>
+- <width>90</width>
+- <height>20</height>
++ <width>20</width>
++ <height>10</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+- <item row="2" column="3" >
+- <widget class="QPushButton" name="buttonOk" >
+- <property name="text" >
+- <string>&OK</string>
++ <item>
++ <layout class="QGridLayout" >
++ <property name="margin" >
++ <number>0</number>
+ </property>
+- <property name="shortcut" >
+- <string/>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+- <property name="autoDefault" >
+- <bool>true</bool>
++ <item row="0" column="1" >
++ <widget class="QLabel" name="textLabel1" >
++ <property name="text" >
++ <string>X:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="1" column="1" >
++ <widget class="QLabel" name="textLabel2" >
++ <property name="text" >
++ <string>Y:</string>
++ </property>
++ </widget>
++ </item>
++ <item row="0" column="2" >
++ <widget class="QLineEdit" name="leXCoord" />
++ </item>
++ <item row="1" column="2" >
++ <widget class="QLineEdit" name="leYCoord" />
++ </item>
++ <item rowspan="2" row="0" column="3" >
++ <spacer>
++ <property name="orientation" >
++ <enum>Qt::Horizontal</enum>
++ </property>
++ <property name="sizeType" >
++ <enum>QSizePolicy::Minimum</enum>
++ </property>
++ <property name="sizeHint" >
++ <size>
++ <width>40</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ <item rowspan="2" row="0" column="0" >
++ <spacer>
++ <property name="orientation" >
++ <enum>Qt::Horizontal</enum>
++ </property>
++ <property name="sizeType" >
++ <enum>QSizePolicy::Minimum</enum>
++ </property>
++ <property name="sizeHint" >
++ <size>
++ <width>40</width>
++ <height>20</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ </layout>
++ </item>
++ <item>
++ <spacer>
++ <property name="orientation" >
++ <enum>Qt::Vertical</enum>
+ </property>
+- <property name="default" >
+- <bool>true</bool>
++ <property name="sizeHint" >
++ <size>
++ <width>20</width>
++ <height>21</height>
++ </size>
+ </property>
+- </widget>
++ </spacer>
+ </item>
+- <item row="2" column="2" >
+- <widget class="QPushButton" name="buttonCancel" >
+- <property name="text" >
+- <string>&Cancel</string>
+- </property>
+- <property name="shortcut" >
+- <string/>
++ <item>
++ <layout class="QHBoxLayout" >
++ <property name="margin" >
++ <number>0</number>
+ </property>
+- <property name="autoDefault" >
+- <bool>true</bool>
++ <property name="spacing" >
++ <number>6</number>
+ </property>
+- </widget>
++ <item>
++ <widget class="QPushButton" name="btnPointFromCanvas" >
++ <property name="text" >
++ <string> from map canvas</string>
++ </property>
++ <property name="icon" >
++ <iconset resource="georeferencer.qrc" >:/pencil.png</iconset>
++ </property>
++ <property name="iconSize" >
++ <size>
++ <width>18</width>
++ <height>18</height>
++ </size>
++ </property>
++ <property name="checkable" >
++ <bool>true</bool>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <spacer>
++ <property name="orientation" >
++ <enum>Qt::Horizontal</enum>
++ </property>
++ <property name="sizeType" >
++ <enum>QSizePolicy::Expanding</enum>
++ </property>
++ <property name="sizeHint" >
++ <size>
++ <width>21</width>
++ <height>27</height>
++ </size>
++ </property>
++ </spacer>
++ </item>
++ <item>
++ <widget class="QPushButton" name="buttonCancel" >
++ <property name="text" >
++ <string>&Cancel</string>
++ </property>
++ <property name="shortcut" >
++ <string/>
++ </property>
++ <property name="autoDefault" >
++ <bool>true</bool>
++ </property>
++ </widget>
++ </item>
++ <item>
++ <widget class="QPushButton" name="buttonOk" >
++ <property name="text" >
++ <string>&OK</string>
++ </property>
++ <property name="shortcut" >
++ <string/>
++ </property>
++ <property name="autoDefault" >
++ <bool>true</bool>
++ </property>
++ <property name="default" >
++ <bool>true</bool>
++ </property>
++ </widget>
++ </item>
++ </layout>
+ </item>
+ </layout>
+ </widget>
+@@ -100,6 +207,8 @@
+ <tabstop>buttonCancel</tabstop>
+ <tabstop>buttonOk</tabstop>
+ </tabstops>
+- <resources/>
++ <resources>
++ <include location="georeferencer.qrc" />
++ </resources>
+ <connections/>
+ </ui>
+diff -urNad qgis~/src/plugins/georeferencer/qgspointdialog.cpp
qgis/src/plugins/georeferencer/qgspointdialog.cpp
+--- qgis~/src/plugins/georeferencer/qgspointdialog.cpp 2007-06-22
21:31:12.000000000 +0200
++++ qgis/src/plugins/georeferencer/qgspointdialog.cpp 2007-06-22
21:32:27.000000000 +0200
+@@ -127,6 +127,7 @@
+ mToolDeletePoint = new QgsGeorefTool(mCanvas, this, FALSE /* addPoint */);
+ mToolDeletePoint->setAction(mActionDeletePoint);
+
++
+ // open raster layer
+ QgsRasterLayer* layer = new QgsRasterLayer(layerPath, "Raster");
+ mLayer = layer;
+@@ -191,6 +192,7 @@
+ delete mToolPan;
+ delete mToolAddPoint;
+ delete mToolDeletePoint;
++
+ }
+
+
+@@ -436,7 +438,7 @@
+
+ void QgsPointDialog::showCoordDialog(QgsPoint& pixelCoords)
+ {
+- MapCoordsDialog* mcd = new MapCoordsDialog(pixelCoords, this);
++ MapCoordsDialog* mcd = new MapCoordsDialog(pixelCoords,
mIface->getMapCanvas(), this);
+ connect(mcd, SIGNAL(pointAdded(const QgsPoint&, const QgsPoint&)),
+ this, SLOT(addPoint(const QgsPoint&, const QgsPoint&)));
+ mcd->show();
+diff -urNad qgis~/src/plugins/georeferencer/qgspointdialog.h
qgis/src/plugins/georeferencer/qgspointdialog.h
+--- qgis~/src/plugins/georeferencer/qgspointdialog.h 2007-06-22
21:31:12.000000000 +0200
++++ qgis/src/plugins/georeferencer/qgspointdialog.h 2007-06-22
21:32:27.000000000 +0200
+@@ -80,6 +80,7 @@
+ QgsMapTool* mToolAddPoint;
+ QgsMapTool* mToolDeletePoint;
+
++
+ // std::vector<QgsPoint> mPixelCoords, mMapCoords;
+ // std::vector<QString> mAcetateIDs;
+ std::vector<QgsGeorefDataPoint*> mPoints;
Property changes on: packages/qgis/trunk/debian/patches/georef.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/qgis/trunk/debian/qgis-plugin-grass.install
===================================================================
--- packages/qgis/trunk/debian/qgis-plugin-grass.install 2007-06-28
10:57:00 UTC (rev 946)
+++ packages/qgis/trunk/debian/qgis-plugin-grass.install 2007-06-28
11:02:43 UTC (rev 947)
@@ -1,4 +1,4 @@
-usr/lib/libqgisgrass.so.*
-usr/lib/qgis/grassplugin.so
-usr/lib/qgis/grassprovider.so
+usr/lib/libqgisgrass.so*
+usr/lib/qgis/libgrassplugin.so
+usr/lib/qgis/libgrassprovider.so
usr/share/qgis/grass/*
Modified: packages/qgis/trunk/debian/qgis.install
===================================================================
--- packages/qgis/trunk/debian/qgis.install 2007-06-28 10:57:00 UTC (rev
946)
+++ packages/qgis/trunk/debian/qgis.install 2007-06-28 11:02:43 UTC (rev
947)
@@ -1,24 +1,26 @@
-usr/bin/gridmaker
+#usr/bin/gridmaker
usr/bin/qgis
usr/bin/qgis_help
usr/bin/msexport
-usr/lib/qgis/copyrightlabelplugin.so
-usr/lib/qgis/delimitedtextplugin.so
-usr/lib/qgis/delimitedtextprovider.so
-usr/lib/qgis/georefplugin.so
-usr/lib/qgis/gpsimporterplugin.so
-usr/lib/qgis/gpxprovider.so
-usr/lib/qgis/gridmakerplugin.so
-usr/lib/qgis/libqgsprojectionselector.so
-usr/lib/qgis/northarrowplugin.so
-usr/lib/qgis/ogrprovider.so
-usr/lib/qgis/pggeoprocessingplugin.so
-usr/lib/qgis/postgresprovider.so
-usr/lib/qgis/scalebarplugin.so
-usr/lib/qgis/spitplugin.so
-usr/lib/qgis/wmsprovider.so
-usr/share/doc/*
-usr/share/man/*
+usr/lib/qgis/libcopyrightlabelplugin.so
+usr/lib/qgis/libdelimitedtextplugin.so
+usr/lib/qgis/libdelimitedtextprovider.so
+usr/lib/qgis/libgeorefplugin.so
+usr/lib/qgis/libgpsimporterplugin.so
+usr/lib/qgis/libgpxprovider.so
+usr/lib/qgis/libgridmakerplugin.so
+usr/lib/qgis/liblauncherplugin.so
+usr/lib/qgis/libnortharrowplugin.so
+usr/lib/qgis/libogrprovider.so
+usr/lib/qgis/libpggeoprocessingplugin.so
+usr/lib/qgis/libpostgresprovider.so
+usr/lib/qgis/libscalebarplugin.so
+usr/lib/qgis/libspitplugin.so
+usr/lib/qgis/libwfsplugin.so
+usr/lib/qgis/libwfsprovider.so
+usr/lib/qgis/libwmsprovider.so
+usr/share/qgis/doc/* usr/share/doc/qgis
+#usr/share/man/*
usr/share/pixmaps/*
usr/share/qgis/doc/*
usr/share/qgis/i18n/*
Modified: packages/qgis/trunk/debian/rules
===================================================================
--- packages/qgis/trunk/debian/rules 2007-06-28 10:57:00 UTC (rev 946)
+++ packages/qgis/trunk/debian/rules 2007-06-28 11:02:43 UTC (rev 947)
@@ -25,10 +25,10 @@
INSTALL_PROGRAM += -s
endif
-config.status: configure
+CMakeCache.txt: CMakeLists.txt
dh_testdir
# Add here commands to configure the package.
- CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) \
+# CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE)
--build=$(DEB_BUILD_GNU_TYPE) \
--prefix=/usr \
--mandir=\$${prefix}/share/man \
--infodir=\$${prefix}/share/info \
@@ -39,10 +39,11 @@
--with-wfs \
--with-python \
--disable-debug
+ cmake -D CMAKE_INSTALL_PREFIX=/usr .
build: patch build-stamp
-build-stamp: config.status
+build-stamp: CMakeCache.txt
dh_testdir
# Add here commands to compile the package.
@@ -60,15 +61,16 @@
rm -rf debian/tmp
# Add here commands to clean up after the build process.
- -$(MAKE) distclean
-ifneq "$(wildcard /usr/share/misc/config.sub)" ""
- cp -f /usr/share/misc/config.sub config.sub
-endif
-ifneq "$(wildcard /usr/share/misc/config.guess)" ""
- cp -f /usr/share/misc/config.guess config.guess
-endif
- rm -f config.status config.log
+ -$(MAKE) clean
+#ifneq "$(wildcard /usr/share/misc/config.sub)" ""
+# cp -f /usr/share/misc/config.sub config.sub
+#endif
+#ifneq "$(wildcard /usr/share/misc/config.guess)" ""
+# cp -f /usr/share/misc/config.guess config.guess
+#endif
+# rm -f config.status config.log
+ rm -f CMakeCache.txt
dh_clean
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
