1
0
mirror of https://github.com/qgis/QGIS.git synced 2025-03-25 00:05:03 -04:00

22 Commits

Author SHA1 Message Date
Nyall Dawson
a15b54d997 Swap missing 0->nullptr and add missing overrides 2017-12-12 21:14:58 +11:00
Nyall Dawson
04a9cd9211 Add more consistency to doxygen formatting 2017-10-06 08:19:00 +10:00
Nyall Dawson
07e12e2832 Replace reimplemented default methods by = default
Using clang-tidy modernize-use-equals-default
2017-09-11 17:10:31 +10:00
Nyall Dawson
0414794787 Use symbol button in annotation config widgets 2017-07-24 11:07:55 +10:00
Denis Rouzaud
dccf8c9e13 run astyle on src/app 2017-03-03 09:09:37 +01:00
Nyall Dawson
aed6c735a6 Swap QScopedPointer to std::unique_ptr
Why?
- no benefits to QScopedPointer over std::unique_ptr
- unlike QScopedPointer, std::unique_ptr has no overhead
over regular pointers
- using standard language features makes it more likely that
compilers can optimise this use and static analysers can
correctly handle code using unique_ptrs
- QScopedPointer has an (IMO) uncertain future (given that
Qt is dropping features which have become part of the c++
standard). Better to port now before wider use of QScopedPointer
in the codebase!
2017-02-07 12:08:57 +10:00
Nyall Dawson
fac7887a9c [FEATURE] Annotations can be styled using fill symbol styles (fix )
This changes the rendering of annotation frames to use QGIS' symbology
engine, which means that all the existing fill styles can now be
used to style annotation frames.

Also paint effects & data defined symbol parameters. Whee!
2017-01-30 12:17:44 +10:00
Nyall Dawson
c853f4fe89 Refactor annotations
Splits the rendering component of annotations out from map
canvas item component.

A new core abstract base class QgsAnnotation handles the
management of the common properties associated with an
annotation, and handles rendering the annotation onto a
QgsRenderContext destination.

Existing annotation classes have been ported to this, and
with the exception of the form annotation moved into core.
Form annotations are dependant on editor widgets and must
remain in GUI.

A new QgsMapCanvasAnnotationItem item class implements
a QgsMapCanvasItem which draws an annotation inside the
canvas, and handles synchronising the position and size
of the canvas item with the QgsAnnotation position/size.

This allows annotations to be safely used in a multi-canvas
environment, with a single QgsAnnotation being displayed
in multiple canvases (even if the canvases have different
extent/crs/etc).

Additionally it allows annotations to be directly rendered
to a map (eg in composer) without going through the
gui based Qt graphics scene framework.

Also removes lots of duplicate code, and adds some basic
unit tests for annotations.
2017-01-30 08:36:19 +10:00
Matthias Kuhn
38a8ddacd9 Add qgis_app.h with APP_EXPORT macro 2017-01-05 00:12:11 +01:00
Juergen E. Fischer
0688621046 scripts/replacev2.sh run 2016-08-10 12:08:52 +02:00
Nyall Dawson
76c4cae0a3 Fix text annotation edit background should match frame background
Otherwise white text is not visible. Fix .
2016-07-26 15:52:46 +10:00
Matthias Kuhn
4d9f3ff806 Fix inadequate usage of nullptr 2016-07-22 22:04:51 +02:00
Nyall Dawson
95fd61c7bd Fix annotation colors are modified when cancel is clicked 2016-07-22 08:36:36 +10:00
Nyall Dawson
03527452d7 Add apply buttons to annotation dialogs 2016-07-22 08:27:32 +10:00
Nyall Dawson
576875e998 Followup 320c696 use clang-modernize to replace 0/NULL use with nullptr 2015-12-15 11:24:51 +11:00
Juergen E. Fischer
9752c468c1 indentation update 2015-07-29 11:52:14 +02:00
Juergen E. Fischer
0a1d44fc63 make qgis_app a shared library and fix some more stl warnings with msvc 2013-09-07 00:22:10 +02:00
Matthias Kuhn
661df0e446 Update core components to use the new QgsColorButton implementation 2013-03-21 11:19:43 -06:00
Marco Hugentobler
fad5cf3f20 Background color option for svg annotation. Save frame transparency (was missing also for text annotation) 2012-11-19 16:40:20 +01:00
jef
1541ff5225 update permissions
git-svn-id: http://svn.osgeo.org/qgis/trunk@13463 c8812cc2-4d05-0410-92ff-de0c093fc19c
2010-05-10 18:52:30 +00:00
mhugent
0558eae3ce Enable annotation items in composer. Remove gui export from classes that have been moved to app
git-svn-id: http://svn.osgeo.org/qgis/trunk@13191 c8812cc2-4d05-0410-92ff-de0c093fc19c
2010-03-29 13:27:56 +00:00
mhugent
c0a4ee3951 Move annotation items and widgets from gui to app
git-svn-id: http://svn.osgeo.org/qgis/trunk@13190 c8812cc2-4d05-0410-92ff-de0c093fc19c
2010-03-29 13:16:08 +00:00