349 Commits

Author SHA1 Message Date
Juergen E. Fischer
ea1aaeae01 cleanup style to db:
- add sip bindings to new methods
- table name, sql queries and constants should not be translated
- replace QVector<QString> with QStringList
2013-05-03 00:25:39 +02:00
Juergen E. Fischer
d4542feedf another indention update 2013-05-03 00:25:39 +02:00
Emilio Loi
280922a383 [FEATURE] Load and Save SLD & QML styles to DB
Work done for ARPA Piemonte - Dipartimento Tematico Geologia e Dissesto
2013-04-26 11:56:22 +02:00
Emilio Loi
b4b779cdf4 Merge branch 'master' of git://github.com/qgis/Quantum-GIS into styles_to_db
Conflicts:
	src/ui/qgsvectorlayerpropertiesbase.ui
2013-04-22 12:20:17 +02:00
Emilio Loi
ea382d1af2 Now if style the style already exists on the db it will be updated (Same layer, same style name) 2013-04-17 15:12:45 +02:00
Emilio Loi
6e9de00189 Now also "Restore Default Style" works 2013-04-17 14:38:08 +02:00
Emilio Loi
37e3035a3a Now "Save as Default" button ask where to save the style 2013-04-17 12:50:07 +02:00
Emilio Loi
ef2d5320c8 Added controls on style table consistency and named style validity 2013-04-16 12:17:31 +03:00
Emilio Loi
fcb27d2d4a Loading from db now works. Still missing a lot of controls and info about errors 2013-04-14 12:35:50 +03:00
Emilio Loi
002eb0d537 First attempt to create a load style ui 2013-04-13 17:50:46 +03:00
Emilio Loi
8694c19f23 Now you can add ui files 2013-04-13 16:14:19 +03:00
Juergen E. Fischer
3a7a8972e8 fix #7560 2013-04-13 15:02:17 +02:00
Emilio Loi
4e52a8a355 Added QMenu on loadStyle button with 2 options (load from filesystem, load from db) 2013-04-13 13:03:16 +03:00
Emilio Loi
e21ace654f Added feature to save vector layers styles to postgis (when provider is postgre$ 2013-04-12 19:05:37 +03:00
Emilio Loi
c3bbfeecaa Added feature to save vector layers styles to postgis (when provider is postgres) and load one of them adding a new postgis vector layer 2013-04-12 19:05:37 +03:00
Emilio Loi
41f7418fe2 Added new option for saving styles on db for vector layers with postgres provider 2013-04-12 19:05:37 +03:00
Juergen E. Fischer
04d1611eb4 [FEATURE] allow non-numeric keys in postgres and oracle views 2013-03-31 21:15:07 +02:00
Juergen E. Fischer
2c4ac0807b [FEATURE] attribute editing extension
- allow resetting of fields to NULL by button
- use user defined date formats in forms, identify results and attribute table
- add support for date type in postgres provider
2013-03-13 23:35:07 +01:00
Denis Rouzaud
8176da04f2 added hstore and inet fields to postgres provider 2013-02-21 17:02:40 +01:00
Sandro Santilli
314c783b21 Revert "Enable topological editing on first TopoGeometry layer creation"
This reverts commit edecf385fddd7d166e134023057998612af6ad58.

The correct way to do this is by hooking on the editingStarted slot
(thanks jef for pointing that out)
2013-02-19 12:09:54 +01:00
Sandro Santilli
edecf385fd Enable topological editing on first TopoGeometry layer creation
I'm not sure this is an acceptable behavior, but I'm sure users
do want to edit TopoGeometry layers in a topological way.
The problem with this implementation is that topological editing
is enabled for editing of every layer, not just the TopoGeometry
one.
2013-02-19 11:10:57 +01:00
Larry Shaffer
fbf999190c Update QgsPalLabeling to work with new vector api
- Switch data defined properties from field index- to name-based
- Add routine to migrate properties to new keys:  labeling/dataDefined/[enum name]
- Add QHash containing old-style data provider mapping of index to name for use in properties migration
- Update QgsLabelingGui, QgsMapToolLabel, QgsLabelPropertyDialog to work with name-based properties
2013-02-07 14:49:56 -07:00
Juergen E. Fischer
f00d004104 fix attribute mapping in vector layer import 2013-01-30 23:20:37 +01:00
Martin Dobias
985468e461 Merge remote-tracking branch 'jef/oraclespatial-nva' into new_vector_api
Conflicts:
	doc/TRANSLATORS
	i18n/qgis_de.ts
	src/app/qgisapp.cpp
	src/core/qgis.cpp
	src/core/qgsvectorlayerimport.cpp
	src/providers/oracle/CMakeLists.txt
	src/providers/oracle/qgsoracleprovider.cpp
	src/providers/oracle/qgsoracleprovider.h
2013-01-24 00:45:01 +01:00
Martin Dobias
5f304b34a1 Merge remote-tracking branch 'origin/master' into new_vector_api
Conflicts:
	python/core/qgsvectordataprovider.sip
	src/app/legend/qgslegendlayer.cpp
	src/app/qgisapp.cpp
	src/app/qgsmergeattributesdialog.cpp
	src/core/qgsvectordataprovider.cpp
	src/core/qgsvectordataprovider.h
	src/core/qgsvectorlayer.cpp
	src/gui/qgssearchquerybuilder.cpp
	src/providers/postgres/qgspostgresprovider.cpp
	src/providers/wfs/CMakeLists.txt
2013-01-23 23:46:56 +01:00
Juergen E. Fischer
0ccff602e2 port oracle provider to new_vector_api
+ progress dialog in progress dialog
+ fix for feature form from attribute table
2013-01-23 01:11:14 +01:00
Martin Dobias
a6c5fd875b Update of providers' feature iterators
Currently providers do not support concurrent access of more iterators at once, so keep pointer to the currently active iterator and auto-close previous iterator when a new one is requested.
Auto-close iterators when all features have been set.
Auto-close iterators when the provider is deleted.
2013-01-16 23:50:27 +01:00
Juergen E. Fischer
831f99a401 oracle provider improvements:
- improve srs lookup
- insert crs to oracle table on import, if not existent (requires INSERT privilege on MDSYS.SDO_COORD_REF_SYSTEM)
- move table lookup into thread
- use QgsMessageOutput for import errors (also in postgres and spatialite)
- german translation update
2013-01-14 01:35:34 +01:00
Juergen E. Fischer
2fc799b98c [FEATURE] add oracle provider 2013-01-09 16:47:01 +01:00
Juergen E. Fischer
460f578d93 - [API] add optional progress dialog to QgsVectorLayerImport
- postgres/mssql: fix primary key generation on import (fixes #6907)
- fix crash on browser refresh after vector layer import
2013-01-07 01:01:27 +01:00
Martin Dobias
9317ffd89a Merge remote-tracking branch 'origin/master' into new_vector_api
Also disabled mapserver until compilation is fixed.
Fixed tests.

Conflicts:
	src/app/legend/qgslegendlayer.cpp
	src/app/qgsattributedialog.cpp
	src/app/qgsattributedialog.h
	src/app/qgslabelpropertydialog.cpp
	src/app/qgsmaptoollabel.cpp
	src/app/qgsvectorlayerproperties.cpp
	src/core/CMakeLists.txt
	src/core/composer/qgsatlascomposition.cpp
	src/core/qgsexpression.cpp
	src/core/qgspallabeling.cpp
	src/core/qgsvectorlayer.cpp
	src/core/qgsvectorlayer.h
	src/core/qgsvectorlayerimport.cpp
	src/mapserver/qgsprojectparser.cpp
	src/mapserver/qgswfsserver.cpp
	src/mapserver/qgswfsserver.h
	src/mapserver/qgswmsserver.cpp
	src/providers/postgres/qgspostgresprovider.cpp
	src/providers/spatialite/qgsspatialiteprovider.h
	tests/src/core/testqgsexpression.cpp
	tests/src/python/test_qgsmemoryprovider.py
2012-12-18 01:35:06 +01:00
Sandro Santilli
eedd891513 Drop orphaned TopoGeometry objects on deleteFeatures 2012-12-07 23:40:28 +01:00
Sandro Santilli
bfa124f55e Fetch topological layer info at construction time
Simplify addFeatures and changeGeometryValues accordingly
2012-12-06 12:57:44 +01:00
Giuseppe Sucameli
6ed8a2349a fix fields creation importing layers to PG 2012-12-06 01:51:14 +01:00
Juergen E. Fischer
1dc75f3561 fix #6800 (introduced with 0dc01f5ff) 2012-12-03 11:09:54 +01:00
Sandro Santilli
5cf1c77574 Initial support for adding new TopoGeometry objects 2012-12-02 17:24:44 +01:00
Juergen E. Fischer
368146c177 allow saving single geometries as multi geometries 2012-11-05 12:09:08 +01:00
Sandro Santilli
8c391922a6 Only change the TopoGeometry definition, not its reference, on edit
Refactor the TopoGeometry editor to avoid touching the edited table
and directly act on the topology relation instead. Fixes #6621 but
also generally makes less writes to the database.
2012-11-05 11:42:32 +01:00
Sandro Santilli
83f2b2db42 Add alias to pk query, fixing ambiguous "ctid" reference (#6620) 2012-11-05 11:10:09 +01:00
Juergen E. Fischer
33682f2df4 fix warnings 2012-11-03 21:51:21 +01:00
Juergen E. Fischer
35646bbc18 partly fix #6610 2012-11-03 21:51:21 +01:00
Sandro Santilli
af8f9c9fd5 Retain old TopoGeometry id on editing
Avoids leaving orphaned TopoGeometry objects and breaking
upper hirearchical  layers
2012-11-02 17:28:14 +01:00
Juergen E. Fischer
42104d7f3d show filled attribute table again (partly reverts 779e16603) 2012-11-01 22:54:43 +01:00
Sandro Santilli
0dc01f5fff Do not drop schema name from URI, even if it's the same as current
The dropping was done in 2007 to workaround a bug which was elsewhere
(in OGR usage, as reported in #843). I guess by now everything
would work transparently, but if it doesn't it'd be time to fix it
for real.

This commit fixes bug #6599, making life harder for NON-BOGUS code
which isn't confused by schemas...

Please test !
2012-11-01 17:52:16 +01:00
Juergen E. Fischer
98e8ba484b indentation update 2012-10-31 23:47:29 +01:00
Juergen E. Fischer
62ebf88974 extent b47b43997 2012-10-31 23:36:50 +01:00
Sandro Santilli
bbecffdb65 Add initial support for editing TopoGeometry objects
This is pretty hackish in that it basically creates a new TopoGeometry
on every edit, leaving loads of orphaned ones around.
2012-10-31 23:34:21 +01:00
Sandro Santilli
bd8237f648 Drop mIsGeography member from QgsPostgresProvider
... now replaced by mSpatialColType
2012-10-31 21:09:36 +01:00
Sandro Santilli
b47b43997e Add mSpatialColType member in QgsPostgresProvider
This member tells us if a spatial column is of type Geometry,
Geography or TopoGeometry. The member is currently unused but
will eventually be used for specially handling TopoGeometry.
It could replace the mIsGeography bool, but replacement isn't
done by this commit.

Incidentally, this commit also adds SRID and type detection
for TopoGeometry columns
2012-10-31 20:35:16 +01:00
Martin Dobias
51122d263a Store attributes and fields in vectors instead of maps 2012-10-20 22:19:55 +02:00