2823 Commits

Author SHA1 Message Date
telwertowski
551163deac Merge from 0.7 release branch:
Remove empty font property tag which was causing an oversize button
on Mac OS X.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4011 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-30 03:17:30 +00:00
telwertowski
ef633f242a Merge from 0.7 release branch:
Changes to fix display anomalies on OS X and Linux. All toggle buttons
for selecting line or fill type are now QToolButton widgets. Adjusted
the graphics displayed on each button to make it easier to distinguish
which is active.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4008 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-30 02:16:24 +00:00
rabla
8c5e1b5f26 module options separated into new class
git-svn-id: http://svn.osgeo.org/qgis/trunk@4007 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-29 12:39:19 +00:00
g_j_m
03578fe35f Tell cvs to ignore some files
git-svn-id: http://svn.osgeo.org/qgis/trunk@4006 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-29 01:07:10 +00:00
timlinux
7201066aa0 Just some minor update to the splash screen...
git-svn-id: http://svn.osgeo.org/qgis/trunk@4005 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-29 00:43:44 +00:00
timlinux
d243ac8b75 Fix typo in variable name in new stuff mark committed.
git-svn-id: http://svn.osgeo.org/qgis/trunk@4004 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-29 00:27:03 +00:00
timlinux
771970e931 Applied patch from Karl
[ 1305377 ] constructor initialization order warnings


git-svn-id: http://svn.osgeo.org/qgis/trunk@4003 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-29 00:07:22 +00:00
timlinux
b7a9443c8a Applied patch from Karl
[ 1305377 ] constructor initialization order warnings


git-svn-id: http://svn.osgeo.org/qgis/trunk@4002 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-28 23:59:13 +00:00
mcoletti
59b13e5618 qgsdataprovider :
- added fileVectorFilters() and fileRasterFilters() virtual functions that
   return an empty string by default

qgsproviderregistry :

 - now stores vector file filter strings

 - builds the file filter string upon construction by concatenating strings
   returned from successive calls to all data provider fileVectorFilter()s

 - added fileVectorFilters() member that returns QFileDialog friendly filter
   string built as described in previous item

qgisapp :

 - now uses vector file filter string returned from QgsProviderRegistry
   vectorFileFilters() call


Note that currently only OGR data provider builds and returns this vector file
filter string.  Maintainers of other vector data providers should also
implement vector file filter functions as necessary.  Please see
QgsOgrDataProvider source for examples.


git-svn-id: http://svn.osgeo.org/qgis/trunk@4001 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-28 20:17:44 +00:00
timlinux
23d7e7a806 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@3999 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-28 00:50:13 +00:00
g_j_m
0bd539c298 tell cvs to ignore some files
git-svn-id: http://svn.osgeo.org/qgis/trunk@3998 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 18:04:45 +00:00
rabla
4b27033180 <br> must be at the end of line?
git-svn-id: http://svn.osgeo.org/qgis/trunk@3997 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 16:22:34 +00:00
rabla
0e0f3b1dcc create new vector
git-svn-id: http://svn.osgeo.org/qgis/trunk@3996 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 16:14:53 +00:00
rabla
f3a2ad6c65 static list of vector layers
git-svn-id: http://svn.osgeo.org/qgis/trunk@3995 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 16:12:59 +00:00
rabla
0a39086292 fix bug in select vector/raster
git-svn-id: http://svn.osgeo.org/qgis/trunk@3994 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 15:36:23 +00:00
telwertowski
f1697c66cc applicationDirPath is in class QApplication (which is not a superclass of QgisApp)
git-svn-id: http://svn.osgeo.org/qgis/trunk@3993 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 14:29:29 +00:00
rabla
a87298048a new/updated tools
git-svn-id: http://svn.osgeo.org/qgis/trunk@3992 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 10:16:22 +00:00
rabla
dc5d1590b0 new/updated tools
git-svn-id: http://svn.osgeo.org/qgis/trunk@3991 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 10:09:02 +00:00
rabla
855c728075 open/new/close mapset
git-svn-id: http://svn.osgeo.org/qgis/trunk@3990 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 09:43:08 +00:00
rabla
b5ec809614 deleted ui.h
git-svn-id: http://svn.osgeo.org/qgis/trunk@3989 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 09:42:30 +00:00
rabla
11480d04dd open/close mapset
git-svn-id: http://svn.osgeo.org/qgis/trunk@3988 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-27 09:17:41 +00:00
g_j_m
15abbd08a9 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@3987 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 23:04:13 +00:00
gsherman
3782ad2d06 Fix for HEAD compile
git-svn-id: http://svn.osgeo.org/qgis/trunk@3986 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 04:51:22 +00:00
gsherman
9876abdc08 Makefile.am fix to allow compile
git-svn-id: http://svn.osgeo.org/qgis/trunk@3985 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 04:38:38 +00:00
g_j_m
0ee731580c fix a little typo
git-svn-id: http://svn.osgeo.org/qgis/trunk@3984 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 04:05:59 +00:00
g_j_m
ba3e41ec25 Oops. Done right this time.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3983 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 03:44:51 +00:00
g_j_m
4828c91c00 qgsvectordataprovider shouldn't be in the list of files to run moc against.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3982 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 03:44:17 +00:00
g_j_m
bbf9ffd04c Modify Makefile.am files to get qgis to compile from a clean cvs checkout. No guarantees that it actually will compile yet, but here's hoping (to test a clean
checkout, I need to commit the changes, so that I can do a clean checkout to test if it works).


git-svn-id: http://svn.osgeo.org/qgis/trunk@3981 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-26 03:32:16 +00:00
timlinux
c39c7e4074 First draft of raster file format converter. Adds a 'convert to' option to raster context menu. At the moment its just hard coded to convert to .tif format and also hard coded to write output into /tmp.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3979 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-25 23:45:57 +00:00
timlinux
416fab46f4 Emit signal with srid of selected srs (as a string) as per Radims request.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3978 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-25 09:20:34 +00:00
g_j_m
84f816b79d Bug fix. Compiling under QT3 didn't work. The changes here are an attempt to fix the problem, but need reviewing by morb_au first before they are applied to all of the other directories that have the same problem.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3976 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-25 05:09:03 +00:00
mcoletti
e8678ed379 Rolled forward {get,set}DataSourceUri() member function changes from
QgsDataProvider base class.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3971 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 21:25:03 +00:00
mcoletti
3485b65b08 qgsdataprovider :
- ctor QString argument now passed by const reference instead of wasteful
   copy

 - added mDataSourceURI private data member

 - setDataSourceUri() and getDataSourceUri() now refer to new data member

(All this because most every data provider was doing the same thing over and
over and over and over again -- a sure need for generalization.)

qgsproviderregistry :

 - now returns null if a data provider was unable to load a given source

 - now also unloads the data provider if there was an error instead of
   wastefully keeping it around in memory

qgsrasterdataprovider :

 - added ctor for URI parameter

qgsvectordataprovider :

 - added ctor for URI parameter

qgsvectorlayer.cpp :

 - added simple debugging probe; was having problems whereby loading projects
   where data has subsequently moved was causing core dumps


git-svn-id: http://svn.osgeo.org/qgis/trunk@3970 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 21:23:08 +00:00
mcoletti
d34af57995 - rolled forward named() and description() member changes
git-svn-id: http://svn.osgeo.org/qgis/trunk@3967 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 14:08:35 +00:00
mcoletti
1e33c258a5 qgisapp.cpp
- merged from branch 0.7

qgsdataprovider.h

 - added name() and description() pure virtual members

qgspluginmanager.cpp

 - plugin directory path now used

qgsproviderregistry.cpp

 - member names now compliant with coding standard

 - limited reformatting and clean-up

qgsvectordataprovider

 - no longer uses Q_OBJECT since it doesn't provide signals or slots

qgsvectorfilewriter.cpp

 - 0.7 branch merge


git-svn-id: http://svn.osgeo.org/qgis/trunk@3966 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 14:08:02 +00:00
gsherman
8ce79779b1 Moved qgsscangeometries.ui.h out of SPIT_UI to prevent its deletion when
doing a make clean. Files ending in ui.h are not generated; they are original
source files and should not be included in BUILT_SOURCES.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3964 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 13:56:36 +00:00
mcoletti
8f27a114d6 - by golly, someone moved QgsScaleCalculator units to QGis
- using the various *config utils generates -I strings that apparently flummox
  qmake; so now strip those out before appending the include strings generated
  from config script invocations

The test suite now runs again successfully.  Go me.  Or something.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3959 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 02:24:56 +00:00
mcoletti
ac25acd51f - dump() now checks to see if properties_ is empty before dumping properties
- qDebug() would abort because someone forgot that QString::local8bit()
  _doesn't_ return a C-style string; it returns QCString which will cause
  qDebug() calls to blow up; if you insist on using QString::local8bit() in
  qDebug() then use it this way:

  qDebug( "%s", myQString.local8bit().data() );

Please do pay attention to compiler warnings.  The warnings generated by
mis-using local8bit _do_ _say_ that the program will likely abort when
execution gets to those statements.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3958 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 02:22:41 +00:00
mcoletti
d259a84a49 Synched with latest snapshot of dependent object files. Also now depend on
qgis library.  Also use cppunit configure script for command line options.

Sadly, QgsProject seems to be broken, though that may have more to do with
local state of source than anything else.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3957 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-23 01:13:12 +00:00
mcoletti
2931de407e Stomping link errors and superfluous builds
git-svn-id: http://svn.osgeo.org/qgis/trunk@3956 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-22 22:50:42 +00:00
mcoletti
bf70730553 future means of adding and managing data
git-svn-id: http://svn.osgeo.org/qgis/trunk@3955 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-22 21:34:18 +00:00
mcoletti
3814ea0099 Eliminated annoying linker issues.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3954 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-22 21:21:17 +00:00
timlinux
7df47fe582 Every new version needs some nice splashyness :-)
git-svn-id: http://svn.osgeo.org/qgis/trunk@3953 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-22 12:39:05 +00:00
telwertowski
cf37d2bcaa Remove duplicate files from qgis app which were also being compiled by libqgis.
Suppress distribution of generated uic.h files.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3952 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-22 07:36:45 +00:00
timlinux
68790f9230 [ 1294894 ] measure distances using geodetic distance
Committing wonder's patch for measuring areas.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3949 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-21 21:46:17 +00:00
morb_au
0468ae83d8 More changes for Qt4 porting readiness.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3948 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-21 21:11:18 +00:00
mhugent
9dce781105 bugfixes for the legend
git-svn-id: http://svn.osgeo.org/qgis/trunk@3947 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-21 16:18:48 +00:00
timlinux
739871f42c Fix small bug in select using epsg spotted by Radim
git-svn-id: http://svn.osgeo.org/qgis/trunk@3940 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-21 00:53:36 +00:00
telwertowski
e888202007 Move catch outside #ifdef to balance try
git-svn-id: http://svn.osgeo.org/qgis/trunk@3938 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-21 00:43:05 +00:00
timlinux
6a4221c204 [ 1246882 ] warnings cleanup - missing returns
Applied and tested Karls retrun type warnings patch.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3937 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-09-20 23:29:18 +00:00