Skip to content
Permalink
Browse files
** Merged Projections_Branch into HEAD
   Problems:
      Polygon outlines are not drawn. This was checked twice and no cause
      was found.

      Projections do not work in all circumstances

      Note that both the proj4 library and sqlite3 are now required. The
      build system has not been modified to test for these yet.

      Qt 3.3.x is required to build this source tree.

      Make sure to increment the EXTRA_VERSION in configure.in when
      committing changes.

      Make sure to update the Changelog with each commit


git-svn-id: http://svn.osgeo.org/qgis/trunk@3112 c8812cc2-4d05-0410-92ff-de0c093fc19c
  • Loading branch information
gsherman committed Apr 10, 2005
1 parent 3bbf810 commit 8c64ebf68404f655a12bf4c95ae419b79b6ff1ac
Showing with 11,379 additions and 6,975 deletions.
  1. +27 −8 ChangeLog
  2. +1 −2 Makefile.am
  3. +3 −1 configure.in
  4. +11 −6 designer_plugins/Makefile.am
  5. +95 −0 designer_plugins/qgsprojectionselectorplugin.cpp
  6. +17 −0 designer_plugins/qgsprojectionselectorplugin.h
  7. +1 −1 doCheckInstall.sh
  8. +2 −0 i18n/Makefile.am
  9. +3 −1 plugins/gps_importer/Makefile.am
  10. +1,678 −1,678 plugins/grass/qgsgrassedit.cpp
  11. +355 −355 plugins/grass/qgsgrassplugin.cpp
  12. +32 −16 plugins/grid_maker/graticulecreator.cpp
  13. +9 −0 providers/delimitedtext/qgsdelimitedtextprovider.h
  14. +7 −7 providers/gpx/Makefile.am
  15. +31 −31 providers/gpx/gpsdata.cpp
  16. +2 −0 providers/grass/qgsgrassprovider.h
  17. +6 −0 providers/ogr/qgsogrprovider.cpp
  18. +471 −472 providers/postgres/qgspostgresprovider.cpp
  19. +380 −364 providers/postgres/qgspostgresprovider.h
  20. +35 −58 qgis.kdevelop
  21. +88 −67 src/Makefile.am
  22. +1 −1 src/main.cpp
  23. +8 −0 src/qgis.h
  24. +101 −72 src/qgisapp.cpp
  25. +1 −0 src/qgisapp.h
  26. +21 −0 src/qgisappbase.ui
  27. +6 −0 src/qgisappbase.ui.h
  28. +90 −90 src/qgsattributetable.h
  29. +99 −99 src/qgsattributetabledisplay.cpp
  30. +15 −15 src/qgsattributetabledisplay.h
  31. +539 −539 src/qgscomposer.cpp
  32. +136 −136 src/qgscomposermap.cpp
  33. +332 −332 src/qgscomposervectorlegend.cpp
  34. +4 −1 src/qgscomposervectorlegend.h
  35. +598 −597 src/qgscomposition.cpp
  36. +234 −56 src/qgscoordinatetransform.cpp
  37. +107 −344 src/qgscoordinatetransform.h
  38. +50 −50 src/qgsdbsourceselect.cpp
  39. +78 −77 src/qgsdlgvectorlayerproperties.cpp
  40. +57 −57 src/qgsidentifyresults.cpp
  41. +2 −2 src/qgsidentifyresults.h
  42. +49 −0 src/qgslayerprojectionselector.cpp
  43. +47 −0 src/qgslayerprojectionselector.h
  44. +95 −0 src/qgslayerprojectionselectorbase.ui
  45. +17 −0 src/qgslayerprojectionselectorbase.ui.h
  46. +231 −207 src/qgsmapcanvas.cpp
  47. +144 −21 src/qgsoptions.cpp
  48. +15 −5 src/qgsoptions.h
  49. +90 −4 src/qgsoptionsbase.ui
  50. +7 −48 src/qgsoptionsbase.ui.h
  51. +19 −14 src/qgspgquerybuilder.cpp
  52. +1 −2 src/qgsproject.cpp
  53. +153 −403 src/qgsprojectproperties.cpp
  54. +19 −28 src/qgsprojectproperties.h
  55. +234 −202 src/qgsprojectpropertiesbase.ui
  56. +4 −13 src/qgsprojectpropertiesbase.ui.h
  57. +10 −1 src/qgsrasterlayer.cpp
  58. +1 −1 src/qgsrasterlayer.h
  59. +0 −1 src/qgsrasterlayerproperties.cpp
  60. +1 −1 src/qgsrasterlayerpropertiesbase.ui
  61. +100 −23 src/qgssinglesymrenderer.cpp
  62. +135 −0 src/qgsspatialreferences.cpp
  63. +67 −0 src/qgsspatialreferences.h
  64. +64 −0 src/qgsspatialrefsys.cpp
  65. +135 −0 src/qgsspatialrefsys.h
  66. +6 −6 src/qgsvectordataprovider.cpp
  67. +44 −0 src/qgsvectordataprovider.h
  68. +616 −443 src/qgsvectorlayer.cpp
  69. +8 −1 src/qgsvectorlayer.h
  70. +1 −1 src/resources/Makefile.am
  71. +2,672 −0 src/resources/spatial_ref_sys.txt
  72. BIN src/resources/srs.db
  73. +54 −14 tests/projections/projectioncshandlingtest.h
  74. +2 −1 tests/projections/projections.pro
  75. +4 −0 widgets/Makefile.am
  76. +51 −0 widgets/projectionselector/Makefile.am
  77. +343 −0 widgets/projectionselector/qgsprojectionselector.cpp
  78. +67 −0 widgets/projectionselector/qgsprojectionselector.h
  79. +116 −0 widgets/projectionselector/qgsprojectionselectorbase.ui
  80. +24 −0 widgets/projectionselector/qgsprojectionselectorbase.ui.h
@@ -1,20 +1,39 @@
/* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
------------------------------------------------------------------------------
Version 0.6 'Simon' .... development version
QGIS Change Log
2005-01-29 [gsherman] 0.6.0devel5
** Applied patches from M. Loskot for a build error and missing Q_OBJECT
macros in qgsspit.h and qgsattributetable.h
2005-01-01 [larsl] 0.6.0devel4
2005-04-09 [ges] 0.6.0devel7
** Merged Projections_Branch into HEAD
Problems:
Polygon outlines are not drawn. This was checked twice and no cause
was found.

Projections do not work in all circumstances

Note that both the proj4 library and sqlite3 are now required. The
build system has not been modified to test for these yet.

Qt 3.3.x is required to build this source tree.

Make sure to increment the EXTRA_VERSION in configure.in when
committing changes.

Make sure to update the Changelog with each commit

2005-03-13 [jobi] 0.6.0devel6
- fix for building on 64bit architecture
- fixed dependencies of designer-plugin/stuff

2005-01-29 [gsherman] 0.6.0devel5
** Applied patches from M. Loskot for a build error and missing Q_OBJECT
macros in qgsspit.h and qgsattributetable.h

2005-01-01 [larsl] 0.6.0devel4
** Fixed a bug that crashed QGIS when loading rasters from a project file, pt 2
QGIS Change Log

2005-01-01 [larsl] 0.6.0devel3
** Fixed a bug that crashed QGIS when loading rasters from a project file
QGIS Change Log
/* ChangeLog,v 1.214 2004/11/12 00:42:21 gsherman Exp */
------------------------------------------------------------------------------
Version 0.6 'Simon' .... development version

2004-12-30 [mcoletti] 0.6.0devel2
*** Re-factored endian-handling in data providers
@@ -31,8 +31,7 @@ docdatadir = $(datadir)/$(PACKAGE)/doc
docdata_DATA = AUTHORS


SUBDIRS = src providers plugins doc tools i18n

SUBDIRS = src widgets providers plugins doc tools i18n designer_plugins
pkginclude_HEADERS = qgsconfig.h

UIcheck:
@@ -26,7 +26,7 @@ dnl ---------------------------------------------------------------------------
MAJOR_VERSION=0
MINOR_VERSION=6
MICRO_VERSION=0
EXTRA_VERSION=6
EXTRA_VERSION=7
if test $EXTRA_VERSION -eq 0; then
VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}
else
@@ -314,6 +314,8 @@ AC_CONFIG_FILES([
plugins/north_arrow/Makefile
plugins/copyright_label/Makefile
plugins/scale_bar/Makefile
widgets/Makefile
widgets/projectionselector/Makefile
designer_plugins/Makefile
plugins/community_reg_plugin/Makefile
])
@@ -17,15 +17,20 @@ plugindir = ${pkglibdir}/designer
$(MOC) -o $@ $<

# name of the designer plugin
plugin_LTLIBRARIES = qgsdesignerwidgets.la
plugin_LTLIBRARIES = qgisdesignerwidgets.la

plugin_MOC = qgsdesignerwidgets.moc.cpp
plugin_MOC = qgsprojectionselectorplugin.moc.cpp


qgsdesignerwidgets_la_SOURCES = qgsdesignerwidgets.cpp \


qgisdesignerwidgets_la_SOURCES = qgsprojectionselectorplugin.cpp \
$(plugin_MOC)
BUILT_SOURCES = $(plugin_MOC)

qgsdesignerwidgets_la_LIBADD = $(QT_LDADD) ../src/libqgis.la $(GDAL_LDADD)
qgsdesignerwidgets_la_LDFLAGS = -avoid-version -module
qgsdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../src/
#projectionselector_la_LIBADD = ../src/libqgis.la $(QT_LDADD)
qgisdesignerwidgets_la_LIBADD = $(QT_LDADD) ../widgets/projectionselector/libqgsprojectionselector.la
qgisdesignerwidgets_la_LDFLAGS = -avoid-version -module
qgisdesignerwidgets_la_CXXFLAGS = $(CXXFLAGS) $(EXTRA_CXXFLAGS) $(QT_CXXFLAGS) $(DEBUG_QGIS) -I../src/

EXTRA_DIST = $(plugin_UIC)
@@ -0,0 +1,95 @@
#include "qgsprojectionselectorplugin.h"
#include "../widgets/projectionselector/qgsprojectionselector.h"

static const char *projectionselector_pixmap[] = {
"22 22 8 1",
" c Gray100",
". c Gray97",
"X c #4f504f",
"o c #00007f",
"O c Gray0",
"+ c none",
"@ c Gray0",
"# c Gray0",
"++++++++++++++++++++++",
"++++++++++++++++++++++",
"++++++++++++++++++++++",
"++++++++++++++++++++++",
"+OOOOOOOOOOOOOOOOOOOO+",
"OOXXXXXXXXXXXXXXXXXXOO",
"OXX. O",
"OX. ooooooooo O",
"OX. o o .O",
"OX o o O",
"OX o o O",
"O o o O",
"OX o o o O",
"OX o o o O",
"OX o o O",
"OX ooooooooo o O",
"OO..................OO",
"+OOOOOOOOOOOOOOOOOOOO+",
"++++++++++++++++++++++",
"++++++++++++++++++++++",
"++++++++++++++++++++++",
"++++++++++++++++++++++"
};

QgsProjectionSelectorPlugin::QgsProjectionSelectorPlugin()
{
}

QStringList QgsProjectionSelectorPlugin::keys() const
{
QStringList list;
list << "QgsProjectionSelector";
return list;
}

QWidget* QgsProjectionSelectorPlugin::create( const QString &key, QWidget* parent, const char* name )
{
if ( key == "QgsProjectionSelector" )
return new QgsProjectionSelector( parent, name );
return 0;
}

QString QgsProjectionSelectorPlugin::group( const QString& feature ) const
{
if ( feature == "QgsProjectionSelector" )
return "QGIS";
return QString::null;
}

QIconSet QgsProjectionSelectorPlugin::iconSet( const QString& ) const
{
return QIconSet( QPixmap( projectionselector_pixmap ) );
}

QString QgsProjectionSelectorPlugin::includeFile( const QString& feature ) const
{
if ( feature == "QgsProjectionSelector" )
return "qgsprojectionselector.h";
return QString::null;
}

QString QgsProjectionSelectorPlugin::toolTip( const QString& feature ) const
{
if ( feature == "QgsProjectionSelector" )
return "QGIS Projection Selector Widget";
return QString::null;
}

QString QgsProjectionSelectorPlugin::whatsThis( const QString& feature ) const
{
if ( feature == "QgsProjectionSelector" )
return "A widget to choose a projection name from a list";
return QString::null;
}

bool QgsProjectionSelectorPlugin::isContainer( const QString& ) const
{
return FALSE;
}


Q_EXPORT_PLUGIN( QgsProjectionSelectorPlugin )
@@ -0,0 +1,17 @@
#include <qwidgetplugin.h>

class QgsProjectionSelectorPlugin : public QWidgetPlugin
{
Q_OBJECT
public:
QgsProjectionSelectorPlugin();

QStringList keys() const;
QWidget* create( const QString &classname, QWidget* parent = 0, const char* name = 0 );
QString group( const QString& ) const;
QIconSet iconSet( const QString& ) const;
QString includeFile( const QString& ) const;
QString toolTip( const QString& ) const;
QString whatsThis( const QString& ) const;
bool isContainer( const QString& ) const;
};
@@ -10,5 +10,5 @@
# Set software group
# The package maintainer (.deb)

checkinstall --default --pkgname=qgis --pkgversion=0.7.0pre --pkggroup=GIS --maintainer=tim@linfiniti.com
checkinstall --exclude ~/.ccache/stats --default --pkgname=qgis --pkgversion=0.7.0pre --pkggroup=GIS --maintainer=tim@linfiniti.com

@@ -17,6 +17,7 @@ nodist_i18n_DATA = \
qgis_fr.qm \
qgis_it.qm \
qgis_nl.qm \
qgis_pl_PL.qm \
qgis_pt_BR.qm \
qgis_ru.qm \
qgis_se.qm \
@@ -28,6 +29,7 @@ i18n_SOURCES = \
qgis_fr.ts \
qgis_it.ts \
qgis_nl.ts \
qgis_pl_PL.ts \
qgis_pt_BR.ts \
qgis_ru.ts \
qgis_se.ts \
@@ -81,4 +81,6 @@ EXTRA_DIST = $(plugin_UIC) icon.xpm \
qgsgpsdevicedialog.h


endif


endif

0 comments on commit 8c64ebf

Please sign in to comment.