Skip to content

Commit

Permalink
Update labeling gui and add expression support as data defined value
Browse files Browse the repository at this point in the history
- Add QgsDataDefined class
- Add QgsDataDefinedButton class
- Add data defined Python support
- Add standalone SVG selector dialog to QgsSvgSelectorWidget class

- Fix for #4607, show only pertinent fields when setting a data defined value
- Fix for #5048 and #5049, data defined settings are literally used
- Fix for #5726, number formatting does not work for expressions
- Fix for #7755, using bufferSize to enable/disable label buffer is confusing
- Fix for #7779, labels do not register in label collision engine; and for #4719, inactive options in labeling dialog
- Prepare label text's expression upfront when preparing layer; makes rendering much faster
- Change name of 'feature obstacles' to appropriate terminology
  • Loading branch information
dakcarto committed May 20, 2013
1 parent 7eacf42 commit 45f374f
Show file tree
Hide file tree
Showing 49 changed files with 11,852 additions and 6,062 deletions.
18 changes: 18 additions & 0 deletions images/images.qrc
Original file line number Diff line number Diff line change
Expand Up @@ -296,24 +296,35 @@
<file>themes/default/mActionZoomOut.png</file>
<file>themes/default/mActionZoomToLayer.png</file>
<file>themes/default/mActionZoomToSelected.png</file>
<file>themes/default/mIconAutoPlacementSettings.svg</file>
<file>themes/default/mIconClear.svg</file>
<file>themes/default/mIconClose.png</file>
<file>themes/default/mIconCollapse.png</file>
<file>themes/default/mIconConnect.png</file>
<file>themes/default/mIconCritical.png</file>
<file>themes/default/mIconDataDefine.svg</file>
<file>themes/default/mIconDataDefineError.svg</file>
<file>themes/default/mIconDataDefineOn.svg</file>
<file>themes/default/mIconDataDefineExpression.svg</file>
<file>themes/default/mIconDataDefineExpressionError.svg</file>
<file>themes/default/mIconDataDefineExpressionOn.svg</file>
<file>themes/default/mIconDbSchema.png</file>
<file>themes/default/mIconDelete.png</file>
<file>themes/default/mIconDeselected.svg</file>
<file>themes/default/mIconEditable.png</file>
<file>themes/default/mIconEditableEdits.png</file>
<file>themes/default/mIconExpand.png</file>
<file>themes/default/mIconExpression.svg</file>
<file>themes/default/mIconExpressionEditorOpen.svg</file>
<file>themes/default/mIconExpressionFilter.svg</file>
<file>themes/default/mIconExpressionPreview.svg</file>
<file>themes/default/mIconExpressionSelect.svg</file>
<file>themes/default/mIconFavourites.png</file>
<file>themes/default/mIconFirst.png</file>
<file>themes/default/mIconGeometryLayer.png</file>
<file>themes/default/mIconInfo.png</file>
<file>themes/default/mIconLabelQuadrantCenter.svg</file>
<file>themes/default/mIconLabelQuadrantOffset.svg</file>
<file>themes/default/mIconLast.png</file>
<file>themes/default/mIconLayer.png</file>
<file>themes/default/mIconLineLayer.png</file>
Expand Down Expand Up @@ -377,15 +388,21 @@
<file>themes/default/propertyicons/attributes.png</file>
<file>themes/default/propertyicons/colormap.png</file>
<file>themes/default/propertyicons/CRS.png</file>
<file>themes/default/propertyicons/datadefined.svg</file>
<file>themes/default/propertyicons/diagram.png</file>
<file>themes/default/propertyicons/digitising.png</file>
<file>themes/default/propertyicons/display.svg</file>
<file>themes/default/propertyicons/gdal.png</file>
<file>themes/default/propertyicons/general.png</file>
<file>themes/default/propertyicons/histogram.png</file>
<file>themes/default/propertyicons/join.png</file>
<file>themes/default/propertyicons/labelbackground.svg</file>
<file>themes/default/propertyicons/labelbuffer.svg</file>
<file>themes/default/propertyicons/labelformatting.svg</file>
<file>themes/default/propertyicons/labels.png</file>
<file>themes/default/propertyicons/labels.svg</file>
<file>themes/default/propertyicons/labelshadow.svg</file>
<file>themes/default/propertyicons/labeltext.svg</file>
<file>themes/default/propertyicons/locale.png</file>
<file>themes/default/propertyicons/map_tools.png</file>
<file>themes/default/propertyicons/metadata.png</file>
Expand All @@ -394,6 +411,7 @@
<file>themes/default/propertyicons/overlay.png</file>
<file>themes/default/propertyicons/pyramids.png</file>
<file>themes/default/propertyicons/rendering.png</file>
<file>themes/default/propertyicons/render.svg</file>
<file>themes/default/propertyicons/symbology.png</file>
<file>themes/default/propertyicons/transparency.png</file>
<file>themes/default/qgis.xpm</file>
Expand Down
28 changes: 28 additions & 0 deletions images/themes/default/mIconAutoPlacementSettings.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
85 changes: 85 additions & 0 deletions images/themes/default/mIconDataDefine.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
62 changes: 62 additions & 0 deletions images/themes/default/mIconDataDefineError.svg
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.

0 comments on commit 45f374f

Please sign in to comment.