39966 Commits

Author SHA1 Message Date
Nyall Dawson
b2a01d84a3 Add layout view to layout designer 2017-07-11 11:06:35 +10:00
Nyall Dawson
4c2447fd89 Add shell for QgsLayoutView 2017-07-11 11:06:35 +10:00
Nyall Dawson
67c6e8f2b8 Merge pull request #4834 from mhugo/fix_attribute_element_sip
Fix QgsAttributeEditorContainer SIP
2017-07-11 11:02:25 +10:00
Nyall Dawson
726936eee2 Merge pull request #4831 from nyalldawson/processing_alg_config2
Minor refactoring to processing algorithms, future proofing some API
2017-07-11 10:59:08 +10:00
Hugo Mercier
224c4c1313 Fix QgsAttributeEditorContainer SIP 2017-07-10 17:02:54 +02:00
Mathieu Pellerin
1693873e8a Merge pull request #4782 from nirvn/shapefile_wkbtype 2017-07-10 16:50:21 +07:00
Nyall Dawson
2b8e06719e Add sip subclass code for QgsProcessingAlgorithm 2017-07-10 17:09:42 +10:00
Nyall Dawson
326d6f5fc7 Allow child algorithm configuration to be stored and handled by models 2017-07-10 17:02:23 +10:00
Nyall Dawson
9e8a114553 Allow specifying algorithm configuration when calling create 2017-07-10 16:41:35 +10:00
Nyall Dawson
1e13d733c2 Move declaration of algorithm parameters/outputs to a new virtual
initAlgorithm() method

This allows 2 benefits:
- algorithms can be subclassed and have subclasses add additional
parameters/outputs to the algorithm. With the previous approach
of declaring parameters/outputs in the constructor, it's not
possible to call virtual methods to add additional parameters/
outputs (since you can't call virtual methods from a constructor).

- initAlgorithm takes a variant map argument, allowing the algorithm
to dynamically adjust its declared parameters and outputs according
to this configuration map. This potentially allows model algorithms which
can be configured to have variable numbers of parameters and
outputs at run time. E.g. a "router" algorithm which directs
features to one of any number of output sinks depending on some
user configured criteria.
2017-07-10 16:31:14 +10:00
nirvn
5b149fb389 [ogr] return multipart geometry for multipart datasets in feature iterator 2017-07-10 13:26:45 +07:00
nirvn
1aa0091e7a [ogr] return multi{linestring,polygon} type for shapefile driver 2017-07-10 13:26:45 +07:00
Nyall Dawson
fc221a6ebe Add sip VirtualCatcherCode to avoid algorithm copies being
destroyed by the python garbage collector

The code generated with the /Factory/ annotation was not sufficient
to correctly transfer the ownership of objects created in Python
back to c++ (despite mailing list messages which hint that it
is).

Anyway, this awful abomination works. Let's all move on to more
useful ways to spend our time...
2017-07-10 15:51:02 +10:00
Harrissou Sant-anna
18c36346ef Use the same icon for the reset button (#4747) 2017-07-10 09:46:37 +07:00
Nyall Dawson
03275bbace Split QgsProcessingAlgorithm::create into non virtual-create
and pure virtual createInstance

Allows us to add logic which always need applying within
create(), leaving createInstance() free to just return a
raw new instance of the class
2017-07-10 10:07:32 +10:00
Nyall Dawson
61bb2ac0b3 Merge pull request #4828 from nyalldawson/fix_16820
Fix incorrect area calculation in corner cases (fix #16820)
2017-07-10 10:06:41 +10:00
Nyall Dawson
d85039363a Fix incorrect area calculation in corner cases (fix #16820)
In certain circumstances very proximal nodes could cause instability
in the ellipsoidal area calculation.

Port (slightly tweaked) fix from grass changeset 71167 for same issue,
and add a unit test
2017-07-10 09:31:16 +10:00
Matthias Kuhn
dae0bf854f Fix with_variable expression isStatic 2017-07-09 17:53:19 +02:00
Nyall Dawson
7753ba11f7 Model child algorithms store a copy of the algorithm itself
Instead of always retrieving it from the registry
2017-07-09 17:17:29 +10:00
Nyall Dawson
cd6e7d78cf Add method to processing registry to create a new instance of an algorithm directly 2017-07-09 17:14:45 +10:00
Nyall Dawson
ad3108780a Merge pull request #4827 from DelazJ/num_selected
Simplify the error message
2017-07-09 10:49:46 +10:00
Harrissou Sant-anna
ec40783b5a Simplify the error message 2017-07-09 00:49:15 +02:00
Nyall Dawson
745da0f367 Merge pull request #4813 from DelazJ/layout_extent
Fix Layout extents dialog title
2017-07-09 07:19:10 +10:00
Even Rouault
7d67b02ae4 [OGR] Use OGR_F_SetFieldNull() with GDAL >= 2.2 to avoid GeoJSON fields to be unset (fixes #16812) 2017-07-08 14:01:10 +02:00
Nyall Dawson
40d833ff5f Merge pull request #4826 from nyalldawson/processing_cleanups
Some more cleanups and misc fixes to processing code
2017-07-08 21:57:58 +10:00
Nyall Dawson
fedf88ea3d Remove redundant sip file 2017-07-08 20:53:02 +10:00
Nyall Dawson
f49b603443 Split QgsProcessingModelAlgorithm into separate components
The cpp/h file was getting too large, so split off the individual
subcomponents into their own h/cpp files to keep code
maintainable.
2017-07-08 20:49:17 +10:00
Nyall Dawson
cfa18039af Fix incorrect icon size in processing windows
Well... kind of. It fixes the toolbar button size, but for some
reason the actual icon content itself isn't being resized. I can't
work out why this is...
2017-07-08 20:49:17 +10:00
Nyall Dawson
a3fdb95d0a Update model input type names 2017-07-08 20:49:17 +10:00
Nyall Dawson
7db1a9dfd3 Save and restore window geometry for modeler dialogs 2017-07-08 20:49:17 +10:00
Nyall Dawson
3665e462c8 Use a filter line edit for outputs 2017-07-08 20:49:17 +10:00
Nyall Dawson
0836c60712 Make model editor dialog more robust while loading models 2017-07-08 20:49:17 +10:00
Nyall Dawson
9d04f87249 Rename "output" style parameters for clarity
The previous naming was too easily confused with processing outputs.
Rename them to QgsProcessingParameterFileDestination, etc... to
make it clearer what they are used for.
2017-07-08 20:49:17 +10:00
Nyall Dawson
f82b41e001 Move an enum to new QgsProcessing class 2017-07-08 20:49:17 +10:00
Nyall Dawson
febf0a0e6e Rename method to more generic name - it's usable by vector layer outputs too 2017-07-08 20:49:17 +10:00
Nyall Dawson
d443bb3cbe Expose compatible vector layer parameter evaluation to QgsProcessingAlgorithm 2017-07-08 20:49:17 +10:00
Nyall Dawson
9e184feaed Add method to evaluate parameters to compatible vector layers
of a specified type
2017-07-08 20:49:17 +10:00
Nyall Dawson
f8e37aa7cb Fix some processing algorithm exception handling 2017-07-08 20:49:17 +10:00
Matthias Kuhn
e2c84f1a50 Merge pull request #4669 from nyalldawson/spinbox_ctrl
When holding ctrl while mouse wheeling on spin box, increase in smaller amounts
2017-07-08 10:37:00 +02:00
Matthias Kuhn
8f8cb67370 Merge pull request #4803 from DelazJ/polygon_symbol
Reorganize Polygon symbol dialogs
2017-07-08 10:22:28 +02:00
Matthias Kuhn
875a5d6d9d Merge pull request #4818 from DelazJ/spelling
Fix some spelling issues
2017-07-08 10:20:40 +02:00
Matthias Kuhn
ada9ce4dcf Merge pull request #4825
Various new expression functions and possibilities
2017-07-08 10:18:10 +02:00
Matthias Kuhn
89a06f6907 No need to set limit with setFilterFid 2017-07-08 09:51:14 +02:00
Matthias Kuhn
eb8eb59680 Code dedup 2017-07-08 09:51:14 +02:00
Matthias Kuhn
66d562a336 Fix leak 2017-07-08 08:26:47 +02:00
rldhont
6b6a52be49 Merge pull request #4823 from rldhont/fix-qgis3-asgml2
Fix GML2 after GML3 improvements
2017-07-07 15:32:33 +02:00
Matthias Kuhn
d28296f27f Get rid of the comment about getting rid of the qgseditorwidgetregistry 2017-07-07 15:12:43 +02:00
Blottiere Paul
e6de737fad Add unit tests 2017-07-07 14:35:08 +02:00
Blottiere Paul
162063be1b [bugfix] Fixes relation widget when switching between layer styles #16100 2017-07-07 14:35:08 +02:00
Matthias Kuhn
4a16b3a1c5 Drop gui dependency from server 2017-07-07 13:15:27 +02:00