3932 Commits

Author SHA1 Message Date
gsherman
5b38ad3460 Updated context help database. New items are just stubbed in so more
content is forthcoming.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5622 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-21 05:38:11 +00:00
gsherman
4117a1170b Change to use new schema in the qgis_help.db database
git-svn-id: http://svn.osgeo.org/qgis/trunk@5621 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-21 05:37:22 +00:00
gsherman
768b8ad1f4 Enabled help button for WMS dialog
git-svn-id: http://svn.osgeo.org/qgis/trunk@5620 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-21 05:25:12 +00:00
gsherman
aee073ca84 New context_ids for context help.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5619 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-21 05:22:38 +00:00
morb_au
095e37fe45 Settings -> Project Properties -> Projections now shows, as selected, the current projection. Previously nothing was selected, making it difficult to determine what the current projection actually was.
This is because QgsProjectionSelector::setSelectedSRSID() now works as advertised when called externally.

It didn't work before, because setSelectedSRSID() did not make sure the tree widget was pre-populated with the projection list.

This commit is a pre-requisite to fixing #11.  This is so that we can actually perform the experiment to prove future bug fixes against #11.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5618 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-21 03:11:11 +00:00
g_j_m
6cf9f114db eliminate the OGR message about not being able to open a read-only
.shp file (if it is read-only, qgis then tries to open it read-only,
so the OGR error message is unnecessary).


git-svn-id: http://svn.osgeo.org/qgis/trunk@5617 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-21 00:36:58 +00:00
g_j_m
443e85bfb6 Use icon overlays for the editable and overview status of a layer
instead of separate icons in separate columns. Still only applies to
the actual layer file entry in the legend, but removes the need for
the extra columns. However, I'm hopeless at icon drawing...
These changes are a variation on the suggestions in ticket #191.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5616 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-20 09:34:04 +00:00
g_j_m
536daaebf9 Remove a redundant connect call for the help button (it's done
somewhere else)


git-svn-id: http://svn.osgeo.org/qgis/trunk@5615 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-20 09:00:27 +00:00
g_j_m
cf3fdb8973 Fix for ticket #197. The tab order is now set by the .ui file rather
than explicit code in the .cpp file.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5614 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-20 08:54:54 +00:00
morb_au
3b840fbe40 When loading a project file, restore the canvas extent to that provided in the project file (i.e. the extent in existence when the project file was saved). Previously the extent was the maximum extent across all layers.
I'm not sure why this functionality hasn't been done before, as it seemed so trivial to implement?

The main benefit to its implementation is that in large layers, the user doesn't have to wait for the whole layer to draw before he can restart work on a project (which is particularly important since we currently can no longer hit Esc to halt a redraw).



git-svn-id: http://svn.osgeo.org/qgis/trunk@5613 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-20 01:17:51 +00:00
g_j_m
79023aa089 Fix for ticket #193. Added in a clip region when drawing to a QImage
to prevent draws outside the QImage.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5612 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-19 22:23:18 +00:00
morb_au
264a408c91 Fix an Q_ASSERT failure in the Print Composer when "Adding new vect legend" and then clicking it into place on the composer canvas.
This appears to be because of the use of QWidget::removeChild in QgsComposer::removeWidgetChildren, which is a Qt3 idiom (it doesn't appear in the Qt4.1 API).  A QWidget::setParent(0) idiom is now used instead.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5611 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-19 01:05:31 +00:00
g_j_m
269d4ef559 Give a default value to mValid for all constructors
git-svn-id: http://svn.osgeo.org/qgis/trunk@5610 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-18 10:16:00 +00:00
g_j_m
d454fdbebb Remove an unnecessary \0 pad to the end of the wkb char*. Also fix a
bug whereby the first byte after the wkb array was being set to \0


git-svn-id: http://svn.osgeo.org/qgis/trunk@5609 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-17 09:18:14 +00:00
g_j_m
452f1668bc Remove lines inside #ifdef QT_VERSION < 0x0400000
git-svn-id: http://svn.osgeo.org/qgis/trunk@5608 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-17 05:26:48 +00:00
g_j_m
9597bcde35 Comment out a slot connect to a slot that no longer exists
git-svn-id: http://svn.osgeo.org/qgis/trunk@5607 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-17 04:28:21 +00:00
morb_au
2b799141a8 Fix for trac ticket #4. (Tested on DEMIS site.)
With the Identify tool on a WMS layer, now send a query to the WMS server *only* on those layers that the WMS server had already declared queryable.  This avoids the server returning an error on un-queryable layers.

Also, QgsWmsProvider::identifyAsHtml() is renamed to QgsWmsProvider::identifyAsText() to better identify what it does.  Commentary, and other dependent variable and function names have also been updated to suit.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5606 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-17 00:50:54 +00:00
morb_au
838b262737 In WMS, use a more robust method of passing the WMS proxy information to the provider. For instance if there is a space in the proxy password, it should now pass-through OK.
Unfortunately I don't have access to a proxy to test, so if I could get some independent verification it would be appreciated.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5605 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-16 23:19:04 +00:00
morb_au
300c6e61f8 Tidy-up of r5603: improve the commentary of QgsWmsProvider::subLayerStyles().
git-svn-id: http://svn.osgeo.org/qgis/trunk@5604 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-16 22:46:56 +00:00
morb_au
3916b1ccc3 Partial fix for #38 (Saved WMS layers do not reload).
Now, the fact the WMS raster provider was used, the layer names, layer styles and image formatting is stored in the project file (and restores OK).  However upon initial testing the extent doesn't appear to be restored.  I will need to address that later.



git-svn-id: http://svn.osgeo.org/qgis/trunk@5603 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-16 13:00:57 +00:00
g_j_m
e06bdcec65 Fix for the rest of ticket #130 (show the actual column default values
when getting the user to fill in the column values for a just digitised
feature).

Also add tr() to some user visible text.


git-svn-id: http://svn.osgeo.org/qgis/trunk@5602 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 22:26:11 +00:00
g_j_m
034609617c Fix for ticket #161. Always quote the value in an 'UPDATE ... SET = value'
SQL statement - the database will ccorrectly interpret the quoted
text based on the data type of the column (e.g., text or numeric).


git-svn-id: http://svn.osgeo.org/qgis/trunk@5601 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 09:39:13 +00:00
g_j_m
93730af57c Remove unnecessary Q3 headers
git-svn-id: http://svn.osgeo.org/qgis/trunk@5600 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 08:59:55 +00:00
mhugent
8455d609cb Fix for postgis edits not commited, fix for ticket #162 'crash when you select 'delete attribute' at attribute table'
git-svn-id: http://svn.osgeo.org/qgis/trunk@5599 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 08:13:51 +00:00
g_j_m
f71e6c997b Save and restore the size and geometry of the edit attribute dialog
box, and always resize the column widths to fit the data. Fixes ticket
#97. 


git-svn-id: http://svn.osgeo.org/qgis/trunk@5598 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 07:53:44 +00:00
telwertowski
d3252533cd Take endianness of feature type into account in GPX provider.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5597 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 06:48:21 +00:00
g_j_m
bf4ca6f93b g++ 3.2.2 didn't like isfinite() without the std::, so these have been added.
git-svn-id: http://svn.osgeo.org/qgis/trunk@5596 c8812cc2-4d05-0410-92ff-de0c093fc19c
2006-07-14 05:19:58 +00:00
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