Skip to content
Permalink
Browse files

Merge branch 'master' into CategorizedRendererUpdate

  • Loading branch information
ccrook committed Sep 23, 2014
2 parents e0b9afb + e194423 commit 91358aaa15a00a0745ffc4cc41d8d375da80917c
Showing with 7,659 additions and 3,548 deletions.
  1. +58 −58 doc/TRANSLATORS
  2. +1,724 −1,040 i18n/qgis_de.ts
  3. +1,710 −1,042 i18n/qgis_en.ts
  4. +1 −1 python/core/composer/qgsaddremoveitemcommand.sip
  5. +1 −1 python/core/composer/qgsaddremovemultiframecommand.sip
  6. +3 −3 python/core/composer/qgscomposerarrow.sip
  7. +1 −1 python/core/composer/qgscomposerattributetable.sip
  8. +79 −5 python/core/composer/qgscomposerattributetablev2.sip
  9. +5 −2 python/core/composer/qgscomposerhtml.sip
  10. +1 −1 python/core/composer/qgscomposeritemcommand.sip
  11. +60 −18 python/core/composer/qgscomposermap.sip
  12. +6 −73 python/core/composer/qgscomposermapgrid.sip
  13. +222 −0 python/core/composer/qgscomposermapitem.sip
  14. +218 −0 python/core/composer/qgscomposermapoverview.sip
  15. +2 −2 python/core/composer/qgscomposermultiframe.sip
  16. +1 −1 python/core/composer/qgscomposermultiframecommand.sip
  17. +42 −41 python/core/composer/qgscomposerobject.sip
  18. +1 −1 python/core/composer/qgscomposershape.sip
  19. +14 −0 python/core/composer/qgscomposertablecolumn.sip
  20. +56 −2 python/core/composer/qgscomposertablev2.sip
  21. +1 −1 python/core/composer/qgscomposertexttable.sip
  22. +2 −0 python/core/core.sip
  23. +1 −1 python/core/qgsrelation.sip
  24. +8 −1 python/core/qgsrelationmanager.sip
  25. +17 −5 python/core/qgsvectorlayer.sip
  26. +17 −0 python/gui/qgscodeeditor.sip
  27. +27 −6 python/gui/qgsfilterlineedit.sip
  28. +2 −1 python/plugins/db_manager/db_manager_plugin.py
  29. +29 −1 python/plugins/db_manager/dlg_sql_window.py
  30. +94 −16 src/app/composer/qgsattributeselectiondialog.cpp
  31. +17 −0 src/app/composer/qgsattributeselectiondialog.h
  32. +2 −13 src/app/composer/qgscomposer.cpp
  33. +279 −8 src/app/composer/qgscomposerattributetablewidget.cpp
  34. +15 −1 src/app/composer/qgscomposerattributetablewidget.h
  35. +11 −9 src/app/composer/qgscomposermapwidget.cpp
  36. +5 −2 src/app/qgsmaptoolmovefeature.cpp
  37. +5 −2 src/app/qgsmaptoolrotatefeature.cpp
  38. +15 −63 src/app/qgsprojectproperties.cpp
  39. +0 −3 src/app/qgsprojectproperties.h
  40. +3 −0 src/core/CMakeLists.txt
  41. +20 −2 src/core/composer/qgscomposerattributetablemodelv2.cpp
  42. +270 −38 src/core/composer/qgscomposerattributetablev2.cpp
  43. +98 −4 src/core/composer/qgscomposerattributetablev2.h
  44. +26 −14 src/core/composer/qgscomposerhtml.cpp
  45. +2 −0 src/core/composer/qgscomposerhtml.h
  46. +48 −159 src/core/composer/qgscomposermap.cpp
  47. +64 −36 src/core/composer/qgscomposermap.h
  48. +78 −171 src/core/composer/qgscomposermapgrid.cpp
  49. +13 −90 src/core/composer/qgscomposermapgrid.h
  50. +224 −0 src/core/composer/qgscomposermapitem.cpp
  51. +261 −0 src/core/composer/qgscomposermapitem.h
  52. +112 −22 src/core/composer/qgscomposermapoverview.cpp
  53. +180 −37 src/core/composer/qgscomposermapoverview.h
  54. +6 −1 src/core/composer/qgscomposertablecolumn.cpp
  55. +15 −0 src/core/composer/qgscomposertablecolumn.h
  56. +130 −20 src/core/composer/qgscomposertablev2.cpp
  57. +63 −1 src/core/composer/qgscomposertablev2.h
  58. +1 −1 src/core/composer/qgscomposition.cpp
  59. +1 −1 src/core/qgsrelation.cpp
  60. +1 −1 src/core/qgsrelation.h
  61. +15 −3 src/core/qgsrelationmanager.cpp
  62. +7 −0 src/core/qgsrelationmanager.h
  63. +14 −7 src/core/qgsvectorlayer.cpp
  64. +14 −0 src/core/qgsvectorlayer.h
  65. +17 −24 src/core/qgsvectorlayereditutils.cpp
  66. +1 −1 src/gui/attributetable/qgsattributetabledelegate.cpp
  67. +10 −1 src/gui/attributetable/qgsattributetableview.cpp
  68. +3 −0 src/gui/attributetable/qgsattributetableview.h
  69. +16 −13 src/gui/attributetable/qgsdualview.cpp
  70. +1 −0 src/gui/attributetable/qgsdualview.h
  71. +21 −2 src/gui/editorwidgets/qgsfilenamewidgetwrapper.cpp
  72. +20 −5 src/gui/editorwidgets/qgsphotowidgetwrapper.cpp
  73. +7 −0 src/gui/editorwidgets/qgsrangeconfigdlg.cpp
  74. +9 −0 src/gui/editorwidgets/qgsrangewidgetfactory.cpp
  75. +8 −0 src/gui/editorwidgets/qgsrangewidgetwrapper.cpp
  76. +13 −8 src/gui/editorwidgets/qgsrelationreferencewidget.cpp
  77. +1 −0 src/gui/editorwidgets/qgsrelationreferencewidget.h
  78. +1 −1 src/gui/editorwidgets/qgsrelationwidgetwrapper.cpp
  79. +20 −4 src/gui/editorwidgets/qgsuniquevaluewidgetwrapper.cpp
  80. +20 −2 src/gui/editorwidgets/qgswebviewwidgetwrapper.cpp
  81. +23 −7 src/gui/qgsattributeform.cpp
  82. +17 −1 src/gui/qgscodeeditor.cpp
  83. +10 −2 src/gui/qgscodeeditor.h
  84. +5 −0 src/gui/qgscolorbuttonv2.cpp
  85. +56 −0 src/gui/qgscolordialog.cpp
  86. +5 −0 src/gui/qgscolordialog.h
  87. +2 −2 src/gui/qgscolorwidgets.h
  88. +8 −5 src/gui/qgsexpressionbuilderwidget.cpp
  89. +35 −6 src/gui/qgsfilterlineedit.cpp
  90. +36 −4 src/gui/qgsfilterlineedit.h
  91. +0 −1 src/gui/qgsidentifymenu.h
  92. +0 −3 src/gui/qgsmaptoolidentify.h
  93. +11 −0 src/gui/qgsrelationeditorwidget.cpp
  94. +11 −6 src/mapserver/qgswfsprojectparser.cpp
  95. +1 −0 src/mapserver/qgswfsprojectparser.h
  96. +2 −32 src/plugins/spatialquery/qgsreaderfeatures.cpp
  97. +0 −22 src/plugins/spatialquery/qgsreaderfeatures.h
  98. +161 −113 src/ui/editorwidgets/qgsrangeconfigdlgbase.ui
  99. +8 −0 src/ui/qgscolordialog.ui
  100. +131 −60 src/ui/qgscomposerattributetablewidgetbase.ui
  101. +1 −0 tests/src/core/CMakeLists.txt
  102. +12 −11 tests/src/core/qgscompositionchecker.cpp
  103. +19 −15 tests/src/core/testqgsatlascomposition.cpp
  104. +0 −6 tests/src/core/testqgscomposerhtml.cpp
  105. +1 −109 tests/src/core/testqgscomposermap.cpp
  106. +20 −20 tests/src/core/testqgscomposermapgrid.cpp
  107. +204 −0 tests/src/core/testqgscomposermapoverview.cpp
  108. +1 −1 tests/src/core/testqgscomposerpaper.cpp
  109. +10 −10 tests/src/core/testqgscomposerpicture.cpp
  110. +2 −2 tests/src/core/testqgscomposerrotation.cpp
  111. +5 −5 tests/src/core/testqgscomposerscalebar.cpp
  112. +267 −5 tests/src/core/testqgscomposertablev2.cpp
  113. +7 −6 tests/src/python/test_qgsatlascomposition.py
  114. BIN tests/testdata/control_images/expected_atlas_autoscale1/expected_atlas_autoscale1.png
  115. BIN tests/testdata/control_images/expected_atlas_autoscale2/expected_atlas_autoscale2.png
  116. BIN ...s/testdata/control_images/expected_atlas_autoscale_old_api1/expected_atlas_autoscale_old_api1.png
  117. BIN ...s/testdata/control_images/expected_atlas_autoscale_old_api2/expected_atlas_autoscale_old_api2.png
  118. BIN tests/testdata/control_images/expected_atlas_filtering1/expected_atlas_filtering1.png
  119. BIN tests/testdata/control_images/expected_atlas_fixedscale1/expected_atlas_fixedscale1.png
  120. BIN tests/testdata/control_images/expected_atlas_fixedscale2/expected_atlas_fixedscale2.png
  121. BIN ...testdata/control_images/expected_atlas_fixedscale_old_api1/expected_atlas_fixedscale_old_api1.png
  122. BIN ...testdata/control_images/expected_atlas_fixedscale_old_api2/expected_atlas_fixedscale_old_api2.png
  123. BIN tests/testdata/control_images/expected_atlas_hiding1/expected_atlas_hiding1.png
  124. BIN tests/testdata/control_images/expected_atlas_hiding2/expected_atlas_hiding2.png
  125. BIN tests/testdata/control_images/expected_atlas_predefinedscales1/expected_atlas_predefinedscales1.png
  126. BIN tests/testdata/control_images/expected_atlas_predefinedscales2/expected_atlas_predefinedscales2.png
  127. BIN tests/testdata/control_images/expected_atlas_sorting1/expected_atlas_sorting1.png
  128. BIN tests/testdata/control_images/expected_atlas_sorting2/expected_atlas_sorting2.png
  129. BIN tests/testdata/control_images/expected_atlas_two_maps1/expected_atlas_two_maps1.png
  130. BIN tests/testdata/control_images/expected_atlas_two_maps2/expected_atlas_two_maps2.png
  131. BIN ...mages/expected_composerattributetable_columnwidth/expected_composerattributetable_columnwidth.png
  132. BIN ...ol_images/expected_composerattributetable_drawempty/expected_composerattributetable_drawempty.png
  133. BIN ...mages/expected_composerattributetable_headersonly/expected_composerattributetable_headersonly.png
  134. BIN ...ol_images/expected_composerattributetable_hidetable/expected_composerattributetable_hidetable.png
  135. BIN .../control_images/expected_composerattributetable_render/expected_composerattributetable_render.png
  136. BIN ...mages/expected_composerattributetable_showmessage/expected_composerattributetable_showmessage.png
  137. BIN tests/testdata/control_images/expected_composereffects_blend/expected_composereffects_blend.png
  138. BIN ...ta/control_images/expected_composereffects_transparency/expected_composereffects_transparency.png
  139. BIN ..._images/expected_composerhtml_expressions_disabled/expected_composerhtml_expressions_disabled.png
  140. BIN ...ol_images/expected_composerhtml_expressions_enabled/expected_composerhtml_expressions_enabled.png
  141. BIN tests/testdata/control_images/expected_composerhtml_manual/expected_composerhtml_manual.png
  142. BIN ...s/testdata/control_images/expected_composerhtml_multiframe1/expected_composerhtml_multiframe1.png
  143. BIN ...s/testdata/control_images/expected_composerhtml_multiframe2/expected_composerhtml_multiframe2.png
  144. BIN ...s/testdata/control_images/expected_composerhtml_multiframe3/expected_composerhtml_multiframe3.png
  145. BIN ...testdata/control_images/expected_composerhtml_smartbreaks1/expected_composerhtml_smartbreaks1.png
  146. BIN ...testdata/control_images/expected_composerhtml_smartbreaks2/expected_composerhtml_smartbreaks2.png
  147. BIN ...testdata/control_images/expected_composerhtml_smartbreaks3/expected_composerhtml_smartbreaks3.png
  148. BIN tests/testdata/control_images/expected_composerhtml_table/expected_composerhtml_table.png
  149. BIN ...data/control_images/expected_composerhtml_userstylesheet/expected_composerhtml_userstylesheet.png
  150. BIN tests/testdata/control_images/expected_composermap_crossgrid/expected_composermap_crossgrid.png
  151. BIN ...testdata/control_images/expected_composermap_exteriorticks/expected_composermap_exteriorticks.png
  152. BIN ...ges/expected_composermap_exteriorticks_annotated/expected_composermap_exteriorticks_annotated.png
  153. BIN ...s/expected_composermap_exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2.png
  154. BIN tests/testdata/control_images/expected_composermap_grid/expected_composermap_grid.png
  155. BIN ...testdata/control_images/expected_composermap_gridframeonly/expected_composermap_gridframeonly.png
  156. BIN ..._images/expected_composermap_interiorexteriorticks/expected_composermap_interiorexteriorticks.png
  157. BIN ...posermap_interiorexteriorticks_annotated/expected_composermap_interiorexteriorticks_annotated.png
  158. BIN ...sermap_interiorexteriorticks_annotated2/expected_composermap_interiorexteriorticks_annotated2.png
  159. BIN ...testdata/control_images/expected_composermap_interiorticks/expected_composermap_interiorticks.png
  160. BIN ...ges/expected_composermap_interiorticks_annotated/expected_composermap_interiorticks_annotated.png
  161. BIN ...s/expected_composermap_interiorticks_annotated2/expected_composermap_interiorticks_annotated2.png
  162. BIN tests/testdata/control_images/expected_composermap_lineborder/expected_composermap_lineborder.png
  163. BIN ...ol_images/expected_composermap_lineborder_annotated/expected_composermap_lineborder_annotated.png
  164. BIN ..._images/expected_composermap_lineborder_annotated2/expected_composermap_lineborder_annotated2.png
  165. BIN tests/testdata/control_images/expected_composermap_markergrid/expected_composermap_markergrid.png
  166. BIN tests/testdata/control_images/expected_composermap_overview/expected_composermap_overview.png
  167. BIN .../control_images/expected_composermap_overview_blending/expected_composermap_overview_blending.png
  168. BIN ...data/control_images/expected_composermap_overview_center/expected_composermap_overview_center.png
  169. BIN ...data/control_images/expected_composermap_overview_invert/expected_composermap_overview_invert.png
  170. BIN ...ta/control_images/expected_composermap_overview_rotated/expected_composermap_overview_rotated.png
  171. BIN .../control_images/expected_composermap_overview_rotated2/expected_composermap_overview_rotated2.png
  172. BIN tests/testdata/control_images/expected_composermap_render/expected_composermap_render.png
  173. BIN tests/testdata/control_images/expected_composermap_zebrastyle/expected_composermap_zebrastyle.png
  174. BIN ...data/control_images/expected_composermap_zebrastyle_left/expected_composermap_zebrastyle_left.png
  175. BIN ...ontrol_images/expected_composermap_zebrastyle_lefttop/expected_composermap_zebrastyle_lefttop.png
  176. BIN ...ges/expected_composermap_zebrastyle_lefttopright/expected_composermap_zebrastyle_lefttopright.png
  177. BIN tests/testdata/control_images/expected_composerpaper_bordered/expected_composerpaper_bordered.png
  178. BIN tests/testdata/control_images/expected_composerpaper_default/expected_composerpaper_default.png
  179. BIN ...stdata/control_images/expected_composerpaper_markerborder/expected_composerpaper_markerborder.png
  180. BIN ...testdata/control_images/expected_composerpaper_transparent/expected_composerpaper_transparent.png
  181. BIN .../control_images/expected_composerpicture_badexpression/expected_composerpicture_badexpression.png
  182. BIN ...data/control_images/expected_composerpicture_clip_anchor/expected_composerpicture_clip_anchor.png
  183. BIN ...ges/expected_composerpicture_clip_anchoroversize/expected_composerpicture_clip_anchoroversize.png
  184. BIN ...stdata/control_images/expected_composerpicture_expression/expected_composerpicture_expression.png
  185. BIN ...ta/control_images/expected_composerpicture_itemrotation/expected_composerpicture_itemrotation.png
  186. BIN tests/testdata/control_images/expected_composerpicture_remote/expected_composerpicture_remote.png
  187. BIN ...data/control_images/expected_composerpicture_resize_clip/expected_composerpicture_resize_clip.png
  188. BIN ...ges/expected_composerpicture_resize_frametoimage/expected_composerpicture_resize_frametoimage.png
  189. BIN ...ontrol_images/expected_composerpicture_resize_stretch/expected_composerpicture_resize_stretch.png
  190. BIN ...data/control_images/expected_composerpicture_resize_zoom/expected_composerpicture_resize_zoom.png
  191. BIN ..._images/expected_composerpicture_resize_zoomresize/expected_composerpicture_resize_zoomresize.png
  192. BIN ...s/testdata/control_images/expected_composerpicture_rotation/expected_composerpicture_rotation.png
  193. BIN ...ol_images/expected_composerpicture_svg_frametoimage/expected_composerpicture_svg_frametoimage.png
  194. BIN ...data/control_images/expected_composerpicture_svg_stretch/expected_composerpicture_svg_stretch.png
  195. BIN ...s/testdata/control_images/expected_composerpicture_svg_zoom/expected_composerpicture_svg_zoom.png
  196. BIN ...ontrol_images/expected_composerpicture_svg_zoomresize/expected_composerpicture_svg_zoomresize.png
  197. BIN ...data/control_images/expected_composerpicture_zoom_anchor/expected_composerpicture_zoom_anchor.png
  198. BIN tests/testdata/control_images/expected_composerrotation_label/expected_composerrotation_label.png
  199. BIN ...ol_images/expected_composerrotation_mapitemrotation/expected_composerrotation_mapitemrotation.png
  200. BIN ...ta/control_images/expected_composerrotation_maprotation/expected_composerrotation_maprotation.png
  201. BIN tests/testdata/control_images/expected_composerrotation_shape/expected_composerrotation_shape.png
  202. BIN ...stdata/control_images/expected_composerscalebar_doublebox/expected_composerscalebar_doublebox.png
  203. BIN ...s/testdata/control_images/expected_composerscalebar_numeric/expected_composerscalebar_numeric.png
  204. BIN ...stdata/control_images/expected_composerscalebar_singlebox/expected_composerscalebar_singlebox.png
  205. BIN ...ol_images/expected_composerscalebar_singlebox_alpha/expected_composerscalebar_singlebox_alpha.png
  206. BIN tests/testdata/control_images/expected_composerscalebar_tick/expected_composerscalebar_tick.png
  207. BIN tests/testdata/control_images/expected_composershapes_ellipse/expected_composershapes_ellipse.png
  208. BIN ...s/testdata/control_images/expected_composershapes_rectangle/expected_composershapes_rectangle.png
  209. BIN ...stdata/control_images/expected_composershapes_roundedrect/expected_composershapes_roundedrect.png
  210. BIN tests/testdata/control_images/expected_composershapes_symbolv2/expected_composershapes_symbolv2.png
  211. BIN tests/testdata/control_images/expected_composershapes_triangle/expected_composershapes_triangle.png
  212. BIN tests/testdata/control_images/expected_piediagram/expected_piediagram.png
  213. BIN tests/testdata/control_images/expected_piediagram_expression/expected_piediagram_expression.png
  214. BIN tests/testdata/points_relations.dbf
  215. +1 −0 tests/testdata/points_relations.prj
  216. +1 −0 tests/testdata/points_relations.qpj
  217. BIN tests/testdata/points_relations.shp
  218. BIN tests/testdata/points_relations.shx

Large diffs are not rendered by default.

Large diffs are not rendered by default.

Large diffs are not rendered by default.

@@ -13,7 +13,7 @@ class QgsAddRemoveItemCommand: QObject, QUndoCommand
Removed
};

QgsAddRemoveItemCommand( State s, QgsComposerItem* item, QgsComposition* c, const QString& text, QUndoCommand* parent = 0 );
QgsAddRemoveItemCommand( State s, QgsComposerItem* item, QgsComposition* c, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
~QgsAddRemoveItemCommand();

void redo();
@@ -12,7 +12,7 @@ class QgsAddRemoveMultiFrameCommand : QUndoCommand
Removed
};

QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent = 0 );
QgsAddRemoveMultiFrameCommand( State s, QgsComposerMultiFrame* multiFrame, QgsComposition* c, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
~QgsAddRemoveMultiFrameCommand();
void redo();
void undo();
@@ -15,14 +15,14 @@ class QgsComposerArrow: QgsComposerItem
/**Constructor
* @param c parent composition
*/
QgsComposerArrow( QgsComposition* c );
QgsComposerArrow( QgsComposition* c /TransferThis/ );

/**Constructor
* @param startPoint start point for line
* @param stopPoint end point for line
* @param c parent composition
*/
QgsComposerArrow( const QPointF& startPoint, const QPointF& stopPoint, QgsComposition* c );
QgsComposerArrow( const QPointF& startPoint, const QPointF& stopPoint, QgsComposition* c /TransferThis/ );

~QgsComposerArrow();

@@ -151,7 +151,7 @@ class QgsComposerArrow: QgsComposerItem
* @see lineSymbol
* @note added in 2.5
*/
void setLineSymbol( QgsLineSymbolV2* symbol );
void setLineSymbol( QgsLineSymbolV2* symbol /Transfer/ );

/**Returns the line symbol used for drawing the line portion of the arrow
* @returns line symbol
@@ -82,7 +82,7 @@ class QgsComposerAttributeTable : QgsComposerTable
* @see composerMap
* @see setDisplayOnlyVisibleFeatures
*/
void setComposerMap( const QgsComposerMap* map /TransferThis/ );
void setComposerMap( const QgsComposerMap* map );

/**Returns the composer map whose extents are controlling the features shown in the
* table. The extents of the map are only used if displayOnlyVisibleFeatures() is true.
@@ -32,8 +32,17 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
%End

public:

/*! Specifies the content source for the attribute table
*/
enum ContentSource
{
LayerAttributes = 0, /*!< table shows attributes from features in a vector layer */
AtlasFeature, /*!< table shows attributes from the current atlas feature */
RelationChildren /*!< table shows attributes from related child features */
};

QgsComposerAttributeTableV2( QgsComposition* composition, bool createUndoCommands );
QgsComposerAttributeTableV2( QgsComposition* composition /TransferThis/, bool createUndoCommands );
~QgsComposerAttributeTableV2();

/**Writes properties specific to attribute tables
@@ -50,7 +59,27 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
*/
virtual bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );

virtual void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true );
virtual void addFrame( QgsComposerFrame* frame /Transfer/, bool recalcFrameSizes = true );

/**Sets the source for attributes to show in table body.
* @param source content source
* @see source
*/
void setSource( const ContentSource source );

/**Returns the source for attributes shown in the table body.
* @returns content source
* @see setSource
*/
ContentSource source() const;

/**Returns the source layer for the table, considering the table source mode. Eg,
* if the table is set to atlas feature mode, then the source layer will be the
* atlas coverage layer. If the table is set to layer attributes mode, then
* the source layer will be the user specified vector layer.
* @returns actual source layer
*/
QgsVectorLayer* sourceLayer();

/**Sets the vector layer from which to display feature attributes
* @param layer Vector layer for attribute table
@@ -63,6 +92,22 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see setVectorLayer
*/
QgsVectorLayer* vectorLayer() const;

/**Sets the relation id from which to display child features
* @param relationId id for relation to display child features from
* @see relationId
* @see setSource
* @note only used if table source is set to RelationChildren
*/
void setRelationId( const QString relationId );

/**Returns the relation id which the table displays child features from
* @returns relation id
* @see setRelationId
* @see source
* @note only used if table source is set to RelationChildren
*/
QString relationId() const;

/**Resets the attribute table's columns to match the vector layer's fields
* @see setVectorLayer
@@ -94,22 +139,36 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @param features maximum number of features to show in the table
* @see maximumNumberOfFeatures
*/
void setMaximumNumberOfFeatures( int features );
void setMaximumNumberOfFeatures( const int features );

/**Returns the maximum number of features to be shown by the table.
* @returns maximum number of features
* @see setMaximumNumberOfFeatures
*/
int maximumNumberOfFeatures() const;

/**Sets attribute table to only show unique rows.
* @param uniqueOnly set to true to show only unique rows. Duplicate rows
* will be stripped from the table.
* @see uniqueRowsOnly
*/
void setUniqueRowsOnly( const bool uniqueOnly );

/**Returns true if the table is set to show only unique rows.
* @returns true if table only shows unique rows and is stripping out
* duplicate rows.
* @see setUniqueRowsOnly
*/
bool uniqueRowsOnly() const;

/**Sets attribute table to only show features which are visible in a composer map item. Changing
* this setting forces the table to refetch features from its vector layer, and may result in
* the table changing size to accommodate the new displayed feature attributes.
* @param visibleOnly set to true to show only visible features
* @see displayOnlyVisibleFeatures
* @see setComposerMap
*/
void setDisplayOnlyVisibleFeatures( bool visibleOnly );
void setDisplayOnlyVisibleFeatures( const bool visibleOnly );

/**Returns true if the table is set to show only features visible on a corresponding
* composer map item.
@@ -118,6 +177,21 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see setDisplayOnlyVisibleFeatures
*/
bool displayOnlyVisibleFeatures() const;

/**Sets attribute table to only show features which intersect the current atlas
* feature.
* @param filterToAtlas set to true to show only features which intersect
* the atlas feature
* @see filterToAtlasFeature
*/
void setFilterToAtlasFeature( const bool filterToAtlas );

/**Returns true if the table is set to only show features which intersect the current atlas
* feature.
* @returns true if table only shows features which intersect the atlas feature
* @see setFilterToAtlasFeature
*/
bool filterToAtlasFeature() const;

/**Returns true if a feature filter is active on the attribute table
* @returns bool state of the feature filter
@@ -133,7 +207,7 @@ class QgsComposerAttributeTableV2 : QgsComposerTableV2
* @see filterFeatures
* @see setFeatureFilter
*/
void setFilterFeatures( bool filter );
void setFilterFeatures( const bool filter );

/**Returns the current expression used to filter features for the table. The filter is only
* active if filterFeatures() is true.
@@ -14,7 +14,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
ManualHtml /*< HTML content is manually set for the item*/
};

QgsComposerHtml( QgsComposition* c, bool createUndoCommands );
QgsComposerHtml( QgsComposition* c /TransferThis/, bool createUndoCommands );
QgsComposerHtml();
~QgsComposerHtml();

@@ -176,7 +176,7 @@ class QgsComposerHtml: QgsComposerMultiFrame
void render( QPainter* p, const QRectF& renderExtent, const int frameIndex );
bool writeXML( QDomElement& elem, QDomDocument & doc, bool ignoreFrames = false ) const;
bool readXML( const QDomElement& itemElem, const QDomDocument& doc, bool ignoreFrames = false );
void addFrame( QgsComposerFrame* frame, bool recalcFrameSizes = true );
void addFrame( QgsComposerFrame* frame /Transfer/, bool recalcFrameSizes = true );
//overriden to break frames without dividing lines of text
double findNearbyPageBreak( double yPos );

@@ -188,6 +188,9 @@ class QgsComposerHtml: QgsComposerMultiFrame
*/
void loadHtml();

/**Recalculates the frame sizes for the current viewport dimensions*/
void recalculateFrameSizes();

void refreshExpressionContext();

virtual void refreshDataDefinedProperty( const QgsComposerObject::DataDefinedProperty property = QgsComposerObject::AllProperties );
@@ -6,7 +6,7 @@ class QgsComposerItemCommand: QUndoCommand
#include "qgscomposeritemcommand.h"
%End
public:
QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent = 0 );
QgsComposerItemCommand( QgsComposerItem* item, const QString& text, QUndoCommand* parent /TransferThis/ = 0 );
virtual ~QgsComposerItemCommand();

/**Reverses the command*/
@@ -511,6 +511,21 @@ class QgsComposerMap : QgsComposerItem
* @note introduced in QGIS 2.5
*/
QgsComposerMapGrid* grid();

/**Returns the map item's overview stack, which is used to control how over
* are drawn over the map's contents.
* @returns pointer to overview stack
* @see overview()
* @note introduced in QGIS 2.5
*/
QgsComposerMapOverviewStack* overviews();

/**Returns the map item's first overview. This is a convenience function.
* @returns pointer to first overview for map item
* @see overviews()
* @note introduced in QGIS 2.5
*/
QgsComposerMapOverview* overview();

/**In case of annotations, the bounding rectangle can be larger than the map item rectangle
@note this function was added in version 1.4*/
@@ -559,29 +574,56 @@ class QgsComposerMap : QgsComposerItem
double mapUnitsToMM() const;

/**Sets overview frame map. -1 disables the overview frame
@note: this function was added in version 1.9*/
void setOverviewFrameMap( int mapId );
* @note: this function was added in version 1.9
* @deprecated use overview()->setFrameMap() or overviews() instead
*/
void setOverviewFrameMap( int mapId ) /Deprecated/;

/**Returns id of overview frame (or -1 if no overfiew frame)
@note: this function was added in version 1.9*/
int overviewFrameMapId() const;
* @note: this function was added in version 1.9
* @deprecated use overview()->frameMapId() or overviews() instead
*/
int overviewFrameMapId() const /Deprecated/;

/**
* @deprecated use overview()->setFrameSymbol() or overviews() instead
*/
void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol /Transfer/ ) /Deprecated/;

void setOverviewFrameMapSymbol( QgsFillSymbolV2* symbol /Transfer/ );
QgsFillSymbolV2* overviewFrameMapSymbol();
/**
* @deprecated use overview()->frameSymbol() or overviews() instead
*/
QgsFillSymbolV2* overviewFrameMapSymbol() /Deprecated/;

/** Returns the overview's blending mode */
QPainter::CompositionMode overviewBlendMode() const;
/** Sets the overview's blending mode*/
void setOverviewBlendMode( QPainter::CompositionMode blendMode );
/** Returns the overview's blending mode
* @deprecated use overview()->blendMode() or overviews() instead
*/
QPainter::CompositionMode overviewBlendMode() const /Deprecated/;

/** Returns true if the overview frame is inverted */
bool overviewInverted() const;
/** Sets the overview's inversion mode*/
void setOverviewInverted( bool inverted );
/** Sets the overview's blending mode
* @deprecated use overview()->setBlendMode() or overviews() instead
*/
void setOverviewBlendMode( QPainter::CompositionMode blendMode ) /Deprecated/;

/** Returns true if the extent is forced to center on the overview */
/** Returns true if the overview frame is inverted
* @deprecated use overview()->inverted() or overviews() instead
*/
bool overviewInverted() const /Deprecated/;

/** Sets the overview's inversion mode
* @deprecated use overview()->setInverted() or overviews() instead
*/
void setOverviewInverted( bool inverted ) /Deprecated/;

/** Returns true if the extent is forced to center on the overview
* @deprecated use overview()->centered() or overviews() instead
*/
bool overviewCentered() const;
/** Set the overview's centering mode */
void setOverviewCentered( bool centered );

/** Set the overview's centering mode
* @deprecated use overview()->setCentered() or overviews() instead
*/
void setOverviewCentered( bool centered ) /Deprecated/;

/**Sets mId to a number not yet used in the composition. mId is kept if it is not in use.
Usually, this function is called before adding the composer map to the composition*/
@@ -693,7 +735,7 @@ class QgsComposerMap : QgsComposerItem
/**Transforms map coordinates to item coordinates (considering rotation and move offset)*/
QPointF mapToItemCoords( const QPointF& mapCoords ) const;

void connectMapOverviewSignals();
void connectMapOverviewSignals() /Deprecated/;

signals:
void extentChanged();

0 comments on commit 91358aa

Please sign in to comment.
You can’t perform that action at this time.