3905 Commits

Author SHA1 Message Date
morb_au
a68f1e0058 Copying selected features, and starting editing, no longer force all geometries of the copied-from layer to be cached, which was an (in my opinion) unfortunate side-effect of r5489.
Instead, for copying, the geometry and attributes are now retrieved from the provider in a random-access fashion.

For starting editing, the behaviour is regressed to the pre-r5489 idiom of geometry being cached as part of the screen redraw in editing mode.

This returns to the much better response when copying from large layers, with the additional benefit of copying selected features that had been panned off the canvas (previously a bug).

However, only Postgres and OGR providers have been updated to suit.  Hopefully this is enough for a 0.8 release.

Bonus feature: The layer properties now shows what access method is used to access individual geometries (random or sequential)

Since this is a large change it would be appreciated if others can double checking my testing.  (I have tested against PostGIS and MapInfo tables, and many different geometry adding/vertex editing combinations.)



git-svn-id: http://svn.osgeo.org/qgis/trunk@5595 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 03:11:25 +00:00
morb_au
ca7064e1ca The Map Legend now has two more columns for Overview and Editing status. If the layer is in overview or editing modes, the appropriate icon will appear in the layer's file entry (you may need to enable "Show file groups" in the right-click menu of the layer in the legend to see file entries).
QGIS used to do this already before the move to Qt4 - however the new QIcon idiom only seems to allow for square icons, therefore it is easier to split the results out to several columns and give them their own QIcons.

I can see room for improvement after this commit:
1. Overview and Editing icons can be also shown beside the top-level layer name, to avoid having to enable "Show file groups".
2. There also seems to be a "projection not valid" icon floating around, however this hasn't been addressed in this commit. Perhaps we need to do something for it too.
3. The column sizes have been hard-coded to arbitrary values.  I have no problem if these get tweaked further.

This commit addresses trac ticket #117.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5594 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 02:22:29 +00:00
morb_au
8645462bf2 When in Editing mode, the overview window no longer shows vertex markers. It used to, which generally made it overcrowded. This commit now only shows the vertex markers on the main canvas. In theory, this should also mean that the map composer window also doesn't show vertex markers any more (which should be a good thing), though I haven't tested it.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5593 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 02:09:40 +00:00
morb_au
8c38434f4f In the Identify results window, derived attributes such as Length or Area are now placed in a subtree of the attributes list called "(Derived)". This distinguishes them from explicit attributes that are a part of the user's layer.
If programmers wish to add more derived attributes in future, they can use the new QgsIdentifyResults::addDerivedAttribute() function.

This commit should address trac ticket #100.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5592 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 01:22:34 +00:00
morb_au
4a6923ac2c When Stopping Editing and Saving Changes, if the commit was *unsuccessful*, retain the in-memory edits. Previously the in-memory edits would be erased anyway.
Note this is not a complete solution as commits are currently a 3- or 4-stage process, and if one stage fails the chain cannot always be rolled-back easily.  If this is the case then a detailed error message is given to the user to assist their understanding of the discrepency.

This commit should be a bug fix for trac #131, but I don't have the environment to test it fully - the bug submitter will have to assist there.

Bonus feature: Tidied up some variable names in QgsVectorLayer - makes it clearer what they contain.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5591 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 00:59:37 +00:00
morb_au
57b9c34cd0 Fix a silly memory leak, that was introduced in r5569's QgsGeometry::contains() function.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5590 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-13 23:06:26 +00:00
telwertowski
4a03bd0c34 Use QFile::encode to convert a QString containing a filename to a c-string. Mac expects Utf8 and *nix expects local8Bit. QFile will do the right thing for each platform and not mangle Mac non-ASCII filenames.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5589 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-13 17:31:17 +00:00
g_j_m
afff4af436 Bug fixes:
- Put in an explicit conversion from Qgis layer type enum to
  OGR layer type enum when creating a new layer

- When creating a new vector layer, and the user selected an existing
 file, delete that file. This was causing a problem when the new layer
 type was different to the selected layer type because the selected
 layer type was being used.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5588 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-13 10:04:47 +00:00
g_j_m
53bd594111 Fix for ticket #184. Also includes some tweaks to resolve some
compiler warnings, and to avoid flushing cout unnecessarily.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5587 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-12 09:48:06 +00:00
mhugent
863c74a385 Legend: allow swapping of legend layers between toplevel layers and layers in a group (motivated by ticket #148 'Legend groups capture legend items')
git-svn-id: http://svn.osgeo.org/qgis/trunk@5586 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-12 09:32:58 +00:00
telwertowski
9712510d9b Use QFile::encode to convert a QString containing a filename to a c-string. Mac expects Utf8 and *nix expects local8Bit. QFile will do the right thing for each platform and not mangle Mac non-ASCII filenames.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5585 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-12 04:40:29 +00:00
morb_au
1a25348833 In the Attributes Table, the Copy button is now hooked up to the same editCopy() procedure that the main application uses. The copySelectedRowsToClipboard() procedure that was used in QgsAttributeTableDisplay is no longer referenced.
As part of this "merge", the main application copy will now precede its results with a row of attribute headers.

Also, the editCopy() procedure and friends (editCut() and editPaste()) can now take the layer to act on, thus allowing the Attribute Table to work on a different layer to the Current Layer in the Legend.

This change was done so that the Copy button in the main application AND the Copy button on the attribute table works consistently.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5584 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-11 23:36:01 +00:00
mhugent
af33fb9a98 do not consider layer extents containing 'inf' or 'nan' for wms bounding box calculation
git-svn-id: http://svn.osgeo.org/qgis/trunk@5583 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-10 13:32:31 +00:00
mhugent
42d814ec16 in QgsWmsProvider: clear the style list after one top level <Layer> element such that the layer/style list is also correct if there are several <Layer> elements without a parent layer
git-svn-id: http://svn.osgeo.org/qgis/trunk@5582 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-10 12:06:31 +00:00
telwertowski
91f234818d For Mac OS X, use the standard Ctrl+? instead of F1 for the primary help shortcut. Don't use Ctrl+H for anything since it will shadow the systemwide shortcut to hide the application.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5581 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-10 07:15:56 +00:00
telwertowski
09d8277008 For Mac OS X, if the GDAL plugins are bundled with the application, set an environment variable to search the bundle before searching the GDAL prefix path hardcoded into the library.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5580 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-10 06:58:03 +00:00
g_j_m
f8025fd641 Remember the last directory used for the composer image select file
dialog box


git-svn-id: http://svn.osgeo.org/qgis/trunk@5579 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 10:10:24 +00:00
g_j_m
b7682ce877 Tweak the line thicknesses so that the various boxes and frames in
the map composer always appear.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5578 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 09:59:05 +00:00
g_j_m
27acc8fea8 Fix for ticket #171. The default symbol scale is now 0.5 - not sure
why it needs to be that to get symbols of a similar size to the map
canvas, but it works fine.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5577 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 09:28:39 +00:00
g_j_m
865a2b4107 Remove some code inside am #ifdef QT < 0x4
git-svn-id: http://svn.osgeo.org/qgis/trunk@5576 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 09:17:29 +00:00
g_j_m
ed44feec5b Fix for ticket #174 (graduated colours for vectors in legend were
missing the upper value of the range)


git-svn-id: http://svn.osgeo.org/qgis/trunk@5575 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 09:07:25 +00:00
g_j_m
6538908d44 Fix a mistake in the previous commit (r5573)
git-svn-id: http://svn.osgeo.org/qgis/trunk@5574 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 06:29:12 +00:00
g_j_m
fa5948c82e - Fix a missing slot warning
- Tidy up #ifdef QGISDEBUGs
- Replace some qt3 compabitilty code with the 'qt4 way'
- Use a default label buffer size of 1 instead of 0 to reduce user confusion


git-svn-id: http://svn.osgeo.org/qgis/trunk@5573 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 06:12:24 +00:00
g_j_m
1d4d6377aa Change an assert to an error message to avoid any future crashes like
that in ticket #136


git-svn-id: http://svn.osgeo.org/qgis/trunk@5572 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-09 05:16:19 +00:00
g_j_m
bca2e9c37d Further mods to work-around the problem in ticket #83
git-svn-id: http://svn.osgeo.org/qgis/trunk@5571 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-08 21:28:50 +00:00
mhugent
9d4766b319 when capturing line and polygons: don't place a vertex at the position where the right click appears (the right click is now just to finish the line/polygon as suggested by Luca)
git-svn-id: http://svn.osgeo.org/qgis/trunk@5570 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-08 15:01:11 +00:00
morb_au
dc63a47a42 In Vertex editing, if editing a polygon, preference is now given to editing the polygon that the mouse is in (as opposed to an adjacent polygon whose edge passes equally close to the mouse). Previously the polygon choice was essentially random (being which one had the lower feature ID).
This is solving a similar problem to the linestring case in r5550.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5569 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-08 02:13:22 +00:00
morb_au
002e57a020 * In Vertex editing, restore the rubberbanding to moving verticies, which was broken in r5550.
* Bonus bugfix: If two adjacent verticies were moved in succession, the second vertex would show a rubberband from the *old* position of the first vertex instead of the moved-to position of the first vertex.  This should now be fixed.

* Bonus function: New "get_at()" function in QgsGeometryVertexIndex.  Should be fairly self-explanitory.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5568 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-08 01:32:45 +00:00
g_j_m
6abc64b58f Possible workaround for ticket #83. Adds a new toggle to the option
dialog that lets the user swap between using a QImage or a QPixmap for
rendering the map. May or may not fix things. Committed so that others
can try it out.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5567 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-07 23:19:13 +00:00
g_j_m
4dd9a2b77e Fix for the bug mentioned in ticket #177
git-svn-id: http://svn.osgeo.org/qgis/trunk@5566 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-07 10:31:45 +00:00
g_j_m
52293bfae2 Fix for ticket #178. The default value of the scale bar border line
was 0.01, which in most cases was too small to generate a visible line
in the print composer window. Default is now 2.0


git-svn-id: http://svn.osgeo.org/qgis/trunk@5565 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-07 09:16:02 +00:00
g_j_m
a12ef19862 Apply patch in ticket #166 to remove warnings about unknown vector drivers
git-svn-id: http://svn.osgeo.org/qgis/trunk@5564 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-07 08:34:01 +00:00
g_j_m
d4662e8f9b Downgrade the QgsLogger::warning 'fileVectorFilters, unknown driver"
to a QgsLogger::debug, as the messages are confusing the users, and
don't impact on Qgis's ability to load such files.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5563 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-06 09:09:17 +00:00
mhugent
7272974e5a fix for bug #172 'Labels appear as default'
git-svn-id: http://svn.osgeo.org/qgis/trunk@5562 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-06 06:30:42 +00:00
mhugent
54cd327abd Add the possibility to set a different pkgdatapath at runtime. This is not used by the normal qgis gui application (only by the server application i'm currently developing)
git-svn-id: http://svn.osgeo.org/qgis/trunk@5561 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-04 09:44:51 +00:00
gsherman
49baafa8f5 Removed doc/README from Makefile.am. Removal of the empty README caused build to fail
git-svn-id: http://svn.osgeo.org/qgis/trunk@5560 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-02 18:23:38 +00:00
shalasz
61bc4a0d08 Remove empty README file
git-svn-id: http://svn.osgeo.org/qgis/trunk@5559 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-01 14:38:09 +00:00
shalasz
35e726c454 Remove extra slashes from paths. I patched the debian package for this because it caused some kind of problem, but I've forgotten what it
was.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5558 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-01 14:35:49 +00:00
gsherman
1ed0915dd0 Makefiles for building win32 version
git-svn-id: http://svn.osgeo.org/qgis/trunk@5557 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-01 06:07:01 +00:00
gsherman
5068f3abaa Changes related to windows build
git-svn-id: http://svn.osgeo.org/qgis/trunk@5556 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-01 05:53:38 +00:00
telwertowski
ef5c1311c6 Add $(EXTRA_CXXFLAGS) which is useful for a Mac universal binary compile. Also clean up the flag symbols so they are arranged more like the other plugins.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5555 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-01 05:51:28 +00:00
timlinux
c6dd1556a6 Translation updates from Stephan Holl
git-svn-id: http://svn.osgeo.org/qgis/trunk@5554 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-28 14:36:35 +00:00
g_j_m
814974bfe3 The real fix for ticket #153. Not sure what I was thinking when I did
r5552.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5553 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-28 08:55:14 +00:00
g_j_m
c8e57255b1 Fix for ticket #153.
The attribute table was failing to display the contents of the last column
in a table for tables where the geometry column was not the last
in the table.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5552 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-27 10:31:11 +00:00
morb_au
36c5e22063 In the vector symbology dialog, add a tooltip to the "no fill" button
to more clearly indicate what that button does.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5551 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-27 03:24:08 +00:00
morb_au
36b0a6caed In Vertex editing, when doing a mousedown to choose which geometry to
edit, the closest geometry will be selected (not just the first within
snapping range), 

AND then the closest vertex *on that geometry* will be
selected.  

This disambiguates between the same vertex shared amongst
multiple geometries.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5550 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-27 02:00:09 +00:00
morb_au
c59ea1d602 In the PostGIS provider, restored the ability to save added and
changed geometries to pre-1.0 PostGIS servers (pre-r3907).  This also now includes
the ability to sniff the PostGIS version.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5549 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-27 00:56:31 +00:00
g_j_m
e2faa857f1 Only display some debugging output when debugging is turned on
git-svn-id: http://svn.osgeo.org/qgis/trunk@5548 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-25 10:12:45 +00:00
g_j_m
2b3d499ad7 Remove unnecessary connect() calls - they were generating a warning on stdout
git-svn-id: http://svn.osgeo.org/qgis/trunk@5547 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-25 09:43:38 +00:00
g_j_m
07e02c9edc Moved a std::cerr debug line into #ifdef QGISDEDUG
git-svn-id: http://svn.osgeo.org/qgis/trunk@5546 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-06-25 09:33:46 +00:00