27 Commits

Author SHA1 Message Date
Matthias Kuhn
cea65ba9b2 Cleanup naming mess 2020-08-09 14:49:06 +02:00
Long Huan
f53cb64a65 Use CMake's AUTOCC function instead of QT5_ADD_RESOURCES 2020-04-24 14:46:06 +10:00
Nyall Dawson
a8adb2d6c2 Code shuffle: move all labeling related code into src/core/labeling
So that these files are all grouped together, making it easier to locate
all the components of the labeling engine and hopefully making things
easier to navigate
2019-12-11 14:05:44 +10:00
Matthias Kuhn
31e74e1342
Merge pull request #32602 from m-kuhn/automoc
Widespread use of AUTOMOC
2019-11-04 07:42:42 +01:00
Matthias Kuhn
e32f4dca3c No reason to set AUTOMOC on individual targets, it's global 2019-11-03 21:51:27 +01:00
Matthias Kuhn
81b49ce1bb Fixup 2019-11-02 15:12:23 +01:00
Denis Rouzaud
8ef8efa7fb
include nlohmann/json_fwd.hpp in core source headers (#32294)
the file was manually added later to the installted headers, but not on mac

it is not possible to install a file in a Headers subfolder within a framework if the original header is not in the same cmake current directory

installing a header in a subdirectory is achieved by setting the MACOSX_PACKAGE_LOCATION property of the source file
but setting a property can only be achieved if it is in the same cmake directory (from the docs: Source file properties are visible only to targets added in the same directory [0])

[0] https://cmake.org/cmake/help/latest/command/set_source_files_properties.html
2019-10-18 09:08:12 +02:00
Juergen E. Fischer
bc1aea62df osgeo4w: switch nightly to GDAL3 and PROJ6 nightlies 2019-08-09 21:32:19 +02:00
sklencar
f5fe4cb010 [QgsQuick] Custom filepaths for external resource widget (#30929)
* Enabled using default path for external resources.
Value (filepath) can be relative to either project path or default root according field setup/config

* [QgsQuick] Added signal of event when a captured photo is confirmed. That enables custom handling of the action by externalResourceHandler.
Renamed Ok Button of PhotoPanel.

* [QgsQuick] Cleaning source of preview image after closing it
It was causing unpleasant effect when last taken photo has been shown for a short while before previewing another.

* [QgsQuick]
Evaluate and use defaultRootPath in a config of the external resource widget.
Added a function to evaluate expressions for QgsQuick

* [QgsQuick] Use Loader to load photo panel only when its going to be used.
Also prevents for asking camera permissions on form open, when photo panel was initialized as well.

* [QgsQuick] Better wrapping of a long filenames text in the external source widget if an image is not available.

* [QgsQuick] Use canonical path in function
Symlinks are used a lot on Android, therefore its better to use canonical paths.

* [QgsQuick] formatted code.

* [QgsQuick] External source widget - changes requested in review
Fixed test and added one test case for getting relative path.

* [QgsQuick] External widget update
Added function that returns absolute path of image according widget's config - takes into account relative/absolute setting for value and default path.
Added docs about how a path can be configured and used.

* [QgsQuick] External widget update
* removed lefover property
* corrected getAbsolutePath function

* [QgsQuick] Corrected function and fixed test
Do not use canonical path for non-existing file while getting relative path.
2019-08-02 13:30:11 +02:00
Peter Petrik
62d615c2cd [QEP 149] Introduce static data providers [API BREAK]
- adds QgsProviderGuiRegistry and QgsProviderGuiMetadata
- adds QgsProjectStorageGuiRegistry
- requires providerMetadataFactory for dynamic data providers
- requires providerMetadataGuiFactory for dynamic data providers (GUI only)
- removes QgsProviderRegistry::WidgetMode
2019-06-18 15:15:36 +02:00
Alessandro Pasotti
bbd836f4d3 Update tests for geometry classes 2019-05-02 13:52:46 +02:00
sklencar
77f500b12e [QgsQuick] - externalResource widget handler (#9232)
* [QgsQuick] - extended externalResource widget

Added removeFile function and modified fileName function - former has been missing and photoPanel is using it. The latter needed modification due to a new option to choose image from a gallery.
Added externalResource handler for externalResource widget which enables following features:
* option to choose an image from a gallery - selected image is copied to projects folder, if it doesnt exists there. Added "ic_gallery" icon.
* ability to remove value for externalResource field. Optionally removes referenced image as well ("Ok" option in dialog)
* ability to interact with image preview onClick - the main idea is to have ability to enlarge preview image. Currently its possible only in edit state of the form since the whole field is disabled otherwise.

Fixed resizing of icon/previewImage and component itself as well.

* [QgsQuick] - extended externalResource widget
Commit contains following fixes/changes/additions after review:
* Added QgsQuickUtils::getRelativePath which replaced QgsQuickUtils::getFileName + related changes in photoPanel
* Added test for new QgsQuickUtils functionality
* fixed weird or redundant size definitions in externalResource widget
* Some changes in docs.

* [QgsQuick] Changed "default" case result for QgsQuickUtils::getRelativePath

* [QgsQuick] Fixed test after changed functionality in QgsQuickUtils
2019-02-25 14:49:00 +01:00
Martin Dobias
6fab904cc9 Fix tests due to updated tolerance 2019-02-12 22:09:23 +01:00
Peter Petrik
4ca91b2858 [quick] [feature] Feature attribute panel
Allow to show feature attribute form and edit/save the modification
of the attributes. Support most frequent QGIS edit widgets such
as text edit, value map or external resource (photo capture)
2018-07-02 11:49:29 +02:00
Peter Petrik
b55db3dfb5 match Qt naming schema for factories 2018-06-28 16:43:08 +02:00
Peter Petrik
7bfcaf4db9 remove need for factory for system of measurement 2018-06-28 10:41:13 +02:00
Peter Petrik
caed3a91d9 choose system of measurement for scalebar or position 2018-06-25 13:47:58 +02:00
Peter Petrik
3f5babddfa fix travis and use qgscoordinateformatter 2018-06-25 09:14:53 +02:00
Peter Petrik
7828dc49ee fixes for position kit and coordinate transformer 2018-06-25 09:14:35 +02:00
viktor.sklencar@lutraconsulting.co.uk
5f07851a2d [feature ] Add PositionKit, PositionMarker and other related classes to QgsQuick.
For background information see the associated QEP (https://github.com/qgis/QGIS-Enhancement-Proposals/issues/109
2018-06-25 09:13:29 +02:00
Peter Petrik
8494c67a20 apply map transform directly in the feature highligh c++ code 2018-05-29 14:58:58 +02:00
Peter Petrik
00b6019818 rename qgsquickfeature and remove featuremodel 2018-05-29 11:28:31 +02:00
viktor.sklencar@lutraconsulting.co.uk
264788ac21 [qgsquick] [feature] Added identify and highlight feature 2018-05-29 11:26:27 +02:00
Peter Petrik
0cd9e19abc [Feature] Add ScaleBar and MessageLog components to QgsQuick library. 2018-05-14 11:39:17 +02:00
Denis Rouzaud
d36d4f8c65
fix warning for release build (#6976) 2018-05-11 07:41:10 -08:00
Peter Petrik
aed3939cbd rename qml library to QgsQuick 2018-05-04 14:20:43 +02:00
Peter Petrik
b1bf9b2809 [FEATURE] Introduction of QGIS Quick library
This pull request is a subset of #6490

This adds a new library for creation of applications based on Qt Quick
framework.
It contains reusable QML / Qt Quick components based on QGIS core
library.
The initial work introduces MapCanvas

To enable compilation of the library, use WITH_QUICK=TRUE

Further documentation of the library is located in doc/qgsquick.dox

For background information see the associated QEP:
qgis/QGIS-Enhancement-Proposals#109

The initial implementation is largely based on the work of Matthias Kuhn
and Marco Bernasocchi on QField probject - kudos to them for the great
job!
2018-04-26 13:33:48 +02:00