42 Commits

Author SHA1 Message Date
telwertowski
3e473c4ccd Replace all non-image hard-coded paths in src/ with calls to new QgsApplication path accessor mathods. This minimizes platform-specific #ifdefs. Image paths still to be done.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4465 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-01-04 07:05:58 +00:00
gsherman
481eb106fa Merge UI conversion branch to HEAD. UI branch is now deprecated.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4409 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-12-30 04:56:31 +00:00
mcoletti
31afaefecd Now properly clean MOC and UIC files with make clean.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4281 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-29 00:20:42 +00:00
timlinux
3e7e345dab Fix qt4 build errors in projection selector
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4242 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-20 02:58:13 +00:00
gsherman
4f92277e47 Qt4 port using Qt3 compatibility library. Note - not all files compile yet.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4234 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-11-19 23:35:22 +00:00
timlinux
82f8c1e64d Apply warnings for unused vars patch from karl
[ 1325870 ] removing trivial warnings (unused variables)


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@4088 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-10-16 18:30:07 +00:00
timlinux
961ac9068f Merged in some projection stuff from 0.7 to hopefully help stabilise head a little. There is still stuff in canvas etc that needs to come in I think. I tried to test with Radims plugin, but cant find how to get the screen with the projection selector like he had in his screenies.
With apologies to Brendan if I broke any of his qt4 compat edits...


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3999 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-28 00:50:13 +00:00
g_j_m
2069ffaeca Apply patch 1305149, with some additional mods, to get qgis head to compile from a fresh cvs checkout
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3987 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 23:04:13 +00:00
timlinux
f7775a6789 Emit signal with srid of selected srs (as a string) as per Radims request.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3978 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-25 09:20:34 +00:00
morb_au
7f5677d2aa More changes for Qt4 porting readiness.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3948 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-21 21:11:18 +00:00
timlinux
aaa93894e3 Apply patch
[ 1274887 ] Added tr()


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3922 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-17 10:15:54 +00:00
morb_au
969fbf24a1 More changes in preparation for building against Qt4:
* src/Makefile.am now has different build instructions for Qt3 vs Qt4.
* qgsprojectionselector more compatible with either Qt3 or Qt4.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3846 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-08-18 20:25:32 +00:00
morb_au
251716ab04 Merged changes in the 0.7 release candidate branch (as at "Release-0_7-candidate-pre1") back into the trunk.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3691 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-07-03 00:18:14 +00:00
gsherman
4b1899b78d Changed to embedded XPM instead of PNG to preserve Qt 3.2.x compatibility
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3435 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-23 05:18:02 +00:00
gsherman
1b5087d9c2 Backport to Qt 3.2
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3392 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-14 16:39:12 +00:00
timlinux
7d3f39a3ff Fix bug where proj4 string was not being written to project file properly
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3389 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-14 15:59:18 +00:00
jobi
f7fdd30fe4 Tweak of makefiles and prepared for a release.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3376 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-13 21:39:20 +00:00
timlinux
f59b4d291a Added checks to use appropriate databases for either system or user srs db
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3341 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-08 22:27:22 +00:00
mhugent
34e74af6d6 set tab focus to the ok button in QgsDlgVectorLayerProperties (bug 1195779), changed include in qgsprojectionselector such that qgis builds on my pc
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3336 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-08 05:52:55 +00:00
gsherman
a6afcbea35 Fix for compile error. Makefile.am is still not consistent with others.
WIN32 #ifdef has been temporarily removed.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3335 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-08 03:46:40 +00:00
timlinux
0c35108367 Moved const declaratins into qgis.h
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3332 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-07 18:10:54 +00:00
timlinux
88ff44cd05 Gui enhancements for search by srid or epsg
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3328 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-07 07:11:19 +00:00
gsherman
81ab40470b Standardized rules to match those used elsewhere in qgis
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3327 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-07 06:07:36 +00:00
timlinux
d6edb2b7a6 Added options to search/select projections by srid and epsg (whihc in most cases are the same anyway).
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3324 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-06 02:31:35 +00:00
timlinux
708809bca7 Minor changes to comments
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3323 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-05 23:53:36 +00:00
timlinux
f5e4f23ec2 Read user proj list from resructured qgis.db
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3293 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-02 11:13:40 +00:00
timlinux
92e78103d8 Added logic so when a user clicks on a user defined srs, its proj string is shown in the text window. Cant test until qgis.db works for me too...
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3292 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-02 11:04:05 +00:00
timlinux
2e342e8e66 Added a couple of debug lines so I can see why its not working on Garys pc.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3287 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-01 20:26:06 +00:00
timlinux
8407b9e39a Converted project projection state handling to use qgis SRSID rather than WKT format.
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3283 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-01 02:01:52 +00:00
gsherman
830dbca9fe Win32 .pro files for qmake
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3282 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-05-01 00:15:20 +00:00
timlinux
200d7b73ad Show human readable projection family names in proj selector. Speedups in proj selector (which populates very quickly now). Added view for proj selector to srs_db
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3281 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-30 12:49:00 +00:00
timlinux
6ff668a071 Updates for projection selecto - not properly returns proj strings and wired into to new tbl_srs table. I still need to make a view and bind it to the view rather than the table so I can show projection names in user freingly format. Other bug fixes and dethunking. Projection is working with ogr layers but I notice that projection projection setting is not persisting...will hunt that down....
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3280 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-30 12:27:02 +00:00
timlinux
1b15b88f8f Added helper to proj selector to build sql to populate proj and ellps acronym fields in srs db (in progress). Removed unneeded postgis tables from srs.db.
XXX NOTE: Please hold off updating from CVS head for the next 24 hours if you can help it unless you intend to actively work on projection stuff! XXX


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3278 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-30 04:14:11 +00:00
timlinux
a7e0445b67 Added a validator to the qgsspatialrefsys that checks the state of the SRS and forces it into a valid state (as a last ditch it will set it to hard coded geocs:wgs84). Before doing that it will first follow the behaviour rules defined in Settings->prefs->projection. This will mean that providers no longer need to handl this and can simply try to set the srs then call validate() on it to make sure its in a valid state. Is valid also not properly checks if the srs is valid.
So you can do something like:

QgsCoordinateTransform * myCS = new QgsCoordinateTransform(srs,srs);
if (!myCS->getSourceSrs()->isValid()) myCs->getSourceSrs->validate();

And you can be sure that the srs will be set. This is not wired into vector or raster layer yet.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3258 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-28 11:28:42 +00:00
timlinux
d108b0b098 User projections now shown in projection selector but are still not useable
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3179 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-17 22:19:11 +00:00
g_j_m
ee5a8ef061 Remove those pesky ? cvs messages when doing an update
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3163 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-15 05:18:45 +00:00
telwertowski
2e99595690 Add HAVE_QTMAC conditional to configure. Use it to suppress compile-time
paths which cause errors when building with Qt/Mac which obtains paths
from qApp->applicationDirPath() at runtime.


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3142 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-13 07:16:57 +00:00
gsherman
a05ea0293a Applied patches from Markus Neteler to allow compilation on Qt 3.1
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3139 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-13 05:04:18 +00:00
gsherman
50d9c25814 Applied patches from Markus Neteler to allow compilation on Qt 3.2
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3128 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-11 23:35:07 +00:00
timlinux
906ef71810 Cleaned out some duplicate includes from widgets/projectionselector/qgsprojectionselector.cpp
Added initial start of user custom projection dialog (doesnt do anything much yet and not wired into gui yet)


git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3118 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-10 23:50:32 +00:00
timlinux
07a3b797f7 Fix windows ifdef
git-svn-id: http://svn.osgeo.org/qgis/trunk/qgis@3116 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-10 12:22:44 +00:00
gsherman
86c976272f ** 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/qgis@3112 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-04-10 07:04:07 +00:00