47 Commits

Author SHA1 Message Date
gsherman
8c64ebf684 ** 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
2005-04-10 07:04:07 +00:00
gsherman
204c1d1f32 Changes to fix qt 3.1.2 incompatibility.
git-svn-id: http://svn.osgeo.org/qgis/trunk@3021 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-03-25 16:27:06 +00:00
gsherman
0910cdcd8a QGIS now fails gracefully when started from the build (src) directory rather
than being started from a properly installed location.


git-svn-id: http://svn.osgeo.org/qgis/trunk@3016 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-03-24 19:46:51 +00:00
timlinux
b79696557b Better description of why app launch failed if no DISPLAY var set
git-svn-id: http://svn.osgeo.org/qgis/trunk@2844 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-02-19 00:40:54 +00:00
timlinux
4a2f0af821 Fix segfault if no DISPLAY var set
git-svn-id: http://svn.osgeo.org/qgis/trunk@2842 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-02-18 22:42:27 +00:00
gsherman
4f3ab62f47 Added ability to pass a .qgs project file as an argument without using the
--project switch. This is necessary to allow using QGIS to open .qgs files in a desktop environment where a mime type has been established. The --project switch still works, but QGIS will now load .qgs, .shp, and .tif files specified on the command line.


git-svn-id: http://svn.osgeo.org/qgis/trunk@2801 c8812cc2-4d05-0410-92ff-de0c093fc19c
2005-02-14 18:30:42 +00:00
gsherman
fcf4f353bb Merged changes from the 0.6.0 release branch
git-svn-id: http://svn.osgeo.org/qgis/trunk@2526 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-12-20 07:13:35 +00:00
gsherman
28381cebf7 Fixed bug that displays bogus raster warning message box when loading a
vector layer from the command line (bug 1068369)


git-svn-id: http://svn.osgeo.org/qgis/trunk@2362 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-11-28 16:56:19 +00:00
gsherman
ecba5c0a32 Fixed PKGDATAPATH for WIN32 in main.cpp
Updated Whats New section for 0.6 in qgisapp.cpp


git-svn-id: http://svn.osgeo.org/qgis/trunk@2260 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-11-16 06:57:43 +00:00
telwertowski
cec6a093f4 Skip command line argument processing on Mac OS X if argv[1] is -psn_*
git-svn-id: http://svn.osgeo.org/qgis/trunk@2252 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-11-14 09:01:45 +00:00
telwertowski
3be0826be2 Prefix all paths to supporting files on Mac OS X with qApp->applicationDirPath()
git-svn-id: http://svn.osgeo.org/qgis/trunk@2251 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-11-14 08:42:46 +00:00
mcoletti
c149b14a7c Merged in qgsproject-branch changes.
Also made QgsRasterLayer more robust in light of files with poor "no data" and
"min/max" value information.

Note that this hasn't been tested with windows versions.


git-svn-id: http://svn.osgeo.org/qgis/trunk@2156 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-10-21 17:27:38 +00:00
gsherman
c8b7210469 Fix for bogus error message when loading a shapefile from the cmd line
(bug 1043464)


git-svn-id: http://svn.osgeo.org/qgis/trunk@2114 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-10-09 15:18:23 +00:00
gsherman
aa04b4759e Massive changes to provide Windows support. This is a work in progress but
has been tested and it compiles under unix. Future changes to the code must
be aware of multiplatform issues.


git-svn-id: http://svn.osgeo.org/qgis/trunk@1563 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-06-12 18:27:11 +00:00
mcoletti
dd2ff5ef0c Fixed bug whereby project files specified on the qgis command line would be
loaded twice.


git-svn-id: http://svn.osgeo.org/qgis/trunk@1333 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-05-06 22:42:24 +00:00
jobi
be979ccc46 ** added install routine for svg files
** added new translations
** adjusted paths in the cpp files


git-svn-id: http://svn.osgeo.org/qgis/trunk@1236 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-04-22 08:10:41 +00:00
jobi
89c2a8d4b0 ** Added internationalisations stuff
Needs some documentation and more translations :-)


git-svn-id: http://svn.osgeo.org/qgis/trunk@1207 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-04-17 22:07:13 +00:00
timlinux
e7a153e9f5 Added ifdefs to check if DISPLAY var is set and create qapp accordingly. Still need to implement a version of qgisapp that has no qwidget derived classes for non-interactive mode to work correctly.
git-svn-id: http://svn.osgeo.org/qgis/trunk@1113 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-03-28 00:44:52 +00:00
timlinux
760892cdbb Fix for snapshot mode. Liberal application of processEvents() seems to do the trick. Note that snapshot mode still requires a DISPLAY even though no gui stuff is actually shown. In the future snapshot should be implemented using non-interactive mode if possible.
git-svn-id: http://svn.osgeo.org/qgis/trunk@1111 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-03-28 00:00:04 +00:00
mcoletti
27740e4155 - s/config.h/qgsconfig.h [0]
- qgsconfig.h now has header sentinals

- now will install headers in $(prefix)/qgis/include and libqis.* library in
  $(prefix)/lib [1]

- "src/Makefile" no longer relies on explicit dependencies and uses better
  naming scheme for created source files [2]

Notes:

[0] To eliminate any file namespace collisions.  Unfortunately there will
    still be some macro name collisions.  These are harmless, though annoying.
    What needs to happen is that all header file references to "qgsconfig.h"
    be moved to implementation files, thus breaking any include dependencies
    for external software.

[1] There currently does not exist a way to make this optional; these will
    always install.  In the future, this might be something toggleable by a
    configure script option.  Moreover, there does not currently exist a
    "qgis-config" script for getting command line options for external,
    dependant software; there might be one in a future release.

    I decided to err on including too many header files; almost certainly some
    of the header files that are currently installed can be culled from the
    "to install" list.

    The new make file has two targets: the old qgis application target, and a
    second one for the library.  As plug-ins are developed, there may be a
    need to add more source files to the library to link against.  I just
    added in the bare minimum for the current set of plug-ins.  If more
    sources need to be added, just add them to libqgis_la_SOURCES, near the
    bottom of  "src/Makefile.am".

[2] All *.ui files will create corresponding *.uic.h and *.uic.cpp files.
    Since these also need MOC files, *.moc.uic.cpp files are also
    automatically created.


git-svn-id: http://svn.osgeo.org/qgis/trunk@1056 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-03-22 20:00:55 +00:00
timlinux
21cc2901bc Completed session management - loaded plugins are remembered when qgis is closed and reloaded next time qgis is opened.
git-svn-id: http://svn.osgeo.org/qgis/trunk@995 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-03-09 12:25:03 +00:00
jobi
adf8745e87 - Changed configure stuff to write DEFINES in config.h.
Postgresql stuff needs testing as I commented the compileflags in src/Makefile.am
- Infos will be posted on the devel mailinglist


git-svn-id: http://svn.osgeo.org/qgis/trunk@983 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-03-05 23:30:29 +00:00
mcoletti
0de5bec56c main.cpp:
- now complains if unable to load project [0]

qgsprojectio.cpp:

  - in read(), potential resource leak with QDomDocument plugged by using
    std::auto_ptr<QDomDocument> [1]

  - also in read(), now properly complain and exit if there was a problem
    opening a layer; e.g., the specified URI doesn't exist

Notes:

  [0] Though the complaint is currently written to cerr, and even then only if
      QGISDEBUG is defined; eventually we should be better at handling broken
      qgis project files.

  [1] We should use at least std::auto_ptr for dynamically created objects
      that shouldn't live outside the scope of the function.  That way we
      don't have to worry about deleting said objects; that'll happen
      automatically if std::auto_ptrs are used.  Moreover, if we eventually
      use exceptions, these objects will also be properly deleted if
      std::auto_ptrs are used.


git-svn-id: http://svn.osgeo.org/qgis/trunk@979 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-03-04 20:58:13 +00:00
timlinux
f4bde67073 More work to get --snapshot command line parameter working properly. Still need to resolve issue with unwanted splashscreen.
git-svn-id: http://svn.osgeo.org/qgis/trunk@969 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-29 23:11:49 +00:00
timlinux
24bb981c5a Changes for --snapshot
git-svn-id: http://svn.osgeo.org/qgis/trunk@968 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-29 16:10:58 +00:00
mcoletti
cddbc1b2c8 configure.in :
- 0.1.0.4

main.cpp :

  - cleaned up help text a bit


git-svn-id: http://svn.osgeo.org/qgis/trunk@958 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-28 00:46:38 +00:00
gsherman
41cd5c408d Corrected debug statements in main.cpp and added a bit of verbiage to the
help text


git-svn-id: http://svn.osgeo.org/qgis/trunk@955 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-27 17:41:29 +00:00
timlinux
a23416a6ef Changed cl parser to getopt
Moved project loading out of loop that loads layers - you now need to specify --project filename to load a filename. This ensures that you only try to load one project file.
Added --snapshot filename parameter that will load layers and project files specified, take a screenie of the map view and save it to disk as filename - this is under construction still.
Added saveMapAsImage(QString) to qgisapp so above cl option can be used.


git-svn-id: http://svn.osgeo.org/qgis/trunk@953 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-27 08:37:24 +00:00
gsherman
5c9752585d fixed typo in a comment
git-svn-id: http://svn.osgeo.org/qgis/trunk@889 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-22 06:54:47 +00:00
gsherman
511274d7fa changes to support project loading from command line, plus fix that prevented ogr layers from loading at all from command line
git-svn-id: http://svn.osgeo.org/qgis/trunk@880 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-21 20:54:26 +00:00
gsherman
7ca45080b6 added iostream include
git-svn-id: http://svn.osgeo.org/qgis/trunk@879 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-21 07:02:43 +00:00
mcoletti
ba833cdfbb - fixed command line raster layer bug
main.cpp :

 - greatly simplified main()

 - now will try to load a command line argument first as raster, then
   vector; if it succeeds at the first, it won't try the second

qgisapp.{h,cpp} :

 - added addLayer(QFileInfo const &) [0]

 - added addRasterLayer(QFileInfo const &) [0]

 - do a little better checking for null pointers and freeing up
   resources when an error occurs

Notes:

Also, multiple rasters and vectors should be able to be specified on
the command line without problems.

[0] These will return true if successfully loaded the given file,
otherwise false.


git-svn-id: http://svn.osgeo.org/qgis/trunk@878 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-21 06:27:11 +00:00
gsherman
f5337a7d69 changed #ifdef DEBUG to #ifdef QGISDEBUG to fix rh/fedora problem
git-svn-id: http://svn.osgeo.org/qgis/trunk@873 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-20 17:17:36 +00:00
gsherman
76bc3b18ad indented code using GNU indent and .indent.pro file
git-svn-id: http://svn.osgeo.org/qgis/trunk@812 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-13 06:04:13 +00:00
timlinux
7d32c1b9e2 Reversed order so rasters are added first then vectors. TODO: change so that layers are added in same order specified in argv.
git-svn-id: http://svn.osgeo.org/qgis/trunk@714 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-06 09:56:20 +00:00
timlinux
98346d1a33 Simplified the command line parser - all file type checking for passed in file names is now down automagically in qgisapp.
git-svn-id: http://svn.osgeo.org/qgis/trunk@713 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-06 09:48:52 +00:00
timlinux
0b9c2debd9 Patch by Didge to load files on application startup by specifying a space separated list of filenames. Vectors supported now, rasters will come tomorrow.
git-svn-id: http://svn.osgeo.org/qgis/trunk@697 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-02-05 01:41:04 +00:00
gsherman
d3bc661ce2 changes to support compilation under Qt 3.1.x
git-svn-id: http://svn.osgeo.org/qgis/trunk@594 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-01-26 03:00:49 +00:00
timlinux
6f478a7869 Moved splashscreen to constructor of qgisapp
git-svn-id: http://svn.osgeo.org/qgis/trunk@527 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-01-19 22:58:20 +00:00
gsherman
de9b73000f merge with datasource branch
git-svn-id: http://svn.osgeo.org/qgis/trunk@517 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-01-19 17:59:42 +00:00
timlinux
d738ab9af3 Added a splashscreen to on application startup.
git-svn-id: http://svn.osgeo.org/qgis/trunk@448 c8812cc2-4d05-0410-92ff-de0c093fc19c
2004-01-10 02:58:47 +00:00
gsherman
7163fe27e7 minor housekeeping
git-svn-id: http://svn.osgeo.org/qgis/trunk@246 c8812cc2-4d05-0410-92ff-de0c093fc19c
2003-08-24 22:14:42 +00:00
gsherman
65bf4c43ae changes to plugin interface api
git-svn-id: http://svn.osgeo.org/qgis/trunk@212 c8812cc2-4d05-0410-92ff-de0c093fc19c
2003-05-14 02:25:36 +00:00
gsherman
50602c9628 header template update
git-svn-id: http://svn.osgeo.org/qgis/trunk@184 c8812cc2-4d05-0410-92ff-de0c093fc19c
2003-01-27 00:35:50 +00:00
gsherman
88503f1e43 code reformatting
git-svn-id: http://svn.osgeo.org/qgis/trunk@97 c8812cc2-4d05-0410-92ff-de0c093fc19c
2002-08-13 04:47:18 +00:00
gsherman
daacd827cb ogr support for vector data formats
git-svn-id: http://svn.osgeo.org/qgis/trunk@84 c8812cc2-4d05-0410-92ff-de0c093fc19c
2002-08-03 04:01:26 +00:00
gsherman
40ef8c3ee6 Initial revision
git-svn-id: http://svn.osgeo.org/qgis/trunk@4 c8812cc2-4d05-0410-92ff-de0c093fc19c
2002-07-06 00:33:05 +00:00