Skip to content
Permalink
Browse files

Merge pull request #5434 from nyalldawson/layout_next2

[layouts] Port item type from composer
  • Loading branch information
nyalldawson committed Nov 7, 2017
2 parents e9e7740 + 36b58a8 commit c000cb86caec89195bdf799afc4f19637d1da94d
Showing with 38,056 additions and 1,164 deletions.
  1. +1 −0 python/core/composer/qgscomposerlabel.sip
  2. +1 −25 python/core/composer/qgscomposerlegend.sip
  3. +13 −2 python/core/core_auto.sip
  4. +9 −1 python/core/geometry/qgsrectangle.sip
  5. +24 −1 python/core/layout/qgslayout.sip
  6. +41 −1 python/core/layout/qgslayoutcontext.sip
  7. +61 −0 python/core/layout/qgslayouteffect.sip
  8. +57 −0 python/core/layout/qgslayoutexporter.sip
  9. +260 −20 python/core/layout/qgslayoutitem.sip
  10. +7 −8 python/core/layout/qgslayoutitemgroup.sip
  11. +232 −0 python/core/layout/qgslayoutitemlabel.sip
  12. +477 −0 python/core/layout/qgslayoutitemlegend.sip
  13. +467 −0 python/core/layout/qgslayoutitemmap.sip
  14. +765 −0 python/core/layout/qgslayoutitemmapgrid.sip
  15. +253 −0 python/core/layout/qgslayoutitemmapitem.sip
  16. +237 −0 python/core/layout/qgslayoutitemmapoverview.sip
  17. +191 −0 python/core/layout/qgslayoutitemnodeitem.sip
  18. +7 −2 python/core/layout/qgslayoutitempage.sip
  19. +293 −0 python/core/layout/qgslayoutitempicture.sip
  20. +85 −0 python/core/layout/qgslayoutitempolygon.sip
  21. +86 −0 python/core/layout/qgslayoutitempolyline.sip
  22. +10 −7 python/core/layout/qgslayoutitemregistry.sip
  23. +31 −93 python/core/layout/qgslayoutitemshape.sip
  24. +8 −0 python/core/layout/qgslayoutmodel.sip
  25. +13 −0 python/core/layout/qgslayoutobject.sip
  26. +15 −1 python/core/layout/qgslayoutundostack.sip
  27. +125 −0 python/core/layout/qgslayoututils.sip
  28. +9 −0 python/core/qgsmaplayermodel.sip
  29. +38 −0 python/core/qgsmultirenderchecker.sip
  30. +4 −0 python/gui/gui_auto.sip
  31. +100 −0 python/gui/layout/qgslayoutitemcombobox.sip
  32. +64 −15 python/gui/layout/qgslayoutitemguiregistry.sip
  33. +69 −0 python/gui/layout/qgslayoutitemwidget.sip
  34. +7 −0 python/gui/layout/qgslayoutview.sip
  35. +4 −1 python/gui/layout/qgslayoutviewmouseevent.sip
  36. +6 −0 python/gui/layout/qgslayoutviewtool.sip
  37. +17 −6 python/gui/layout/qgslayoutviewtooladditem.sip
  38. +68 −0 python/gui/layout/qgslayoutviewtooladdnodeitem.sip
  39. +59 −0 python/gui/layout/qgslayoutviewtooleditnodes.sip
  40. +45 −0 python/gui/layout/qgslayoutviewtoolmoveitemcontent.sip
  41. +6 −0 python/gui/qgsratiolockbutton.sip
  42. +21 −0 src/app/CMakeLists.txt
  43. +1 −0 src/app/composer/qgscomposerlegendwidget.cpp
  44. +13 −0 src/app/layout/qgslayoutappmenuprovider.cpp
  45. +201 −0 src/app/layout/qgslayoutapputils.cpp
  46. +36 −0 src/app/layout/qgslayoutapputils.h
  47. +124 −41 src/app/layout/qgslayoutdesignerdialog.cpp
  48. +22 −4 src/app/layout/qgslayoutdesignerdialog.h
  49. +10 −8 src/app/layout/qgslayoutguidewidget.cpp
  50. +2 −2 src/app/layout/qgslayoutguidewidget.h
  51. +69 −0 src/app/layout/qgslayoutitemslistview.cpp
  52. +53 −0 src/app/layout/qgslayoutitemslistview.h
  53. +323 −0 src/app/layout/qgslayoutlabelwidget.cpp
  54. +65 −0 src/app/layout/qgslayoutlabelwidget.h
  55. +53 −0 src/app/layout/qgslayoutlegendlayersdialog.cpp
  56. +43 −0 src/app/layout/qgslayoutlegendlayersdialog.h
  57. +1,144 −0 src/app/layout/qgslayoutlegendwidget.cpp
  58. +135 −0 src/app/layout/qgslayoutlegendwidget.h
  59. +1,165 −0 src/app/layout/qgslayoutmapgridwidget.cpp
  60. +138 −0 src/app/layout/qgslayoutmapgridwidget.h
  61. +1,649 −0 src/app/layout/qgslayoutmapwidget.cpp
  62. +165 −0 src/app/layout/qgslayoutmapwidget.h
  63. +11 −0 src/app/layout/qgslayoutpagepropertieswidget.cpp
  64. +1 −0 src/app/layout/qgslayoutpagepropertieswidget.h
  65. +747 −0 src/app/layout/qgslayoutpicturewidget.cpp
  66. +102 −0 src/app/layout/qgslayoutpicturewidget.h
  67. +94 −0 src/app/layout/qgslayoutpolygonwidget.cpp
  68. +48 −0 src/app/layout/qgslayoutpolygonwidget.h
  69. +94 −0 src/app/layout/qgslayoutpolylinewidget.cpp
  70. +50 −0 src/app/layout/qgslayoutpolylinewidget.h
  71. +183 −0 src/app/layout/qgslayoutshapewidget.cpp
  72. +60 −0 src/app/layout/qgslayoutshapewidget.h
  73. +19 −0 src/app/qgisapp.cpp
  74. +4 −0 src/app/qgisapp.h
  75. +24 −2 src/core/CMakeLists.txt
  76. +1 −0 src/core/composer/qgscomposerlabel.h
  77. +14 −45 src/core/composer/qgscomposerlegend.cpp
  78. +5 −23 src/core/composer/qgscomposerlegend.h
  79. +9 −0 src/core/geometry/qgsrectangle.cpp
  80. +8 −1 src/core/geometry/qgsrectangle.h
  81. +12 −0 src/core/layout/qgslayout.cpp
  82. +25 −1 src/core/layout/qgslayout.h
  83. +13 −2 src/core/layout/qgslayoutcontext.cpp
  84. +47 −1 src/core/layout/qgslayoutcontext.h
  85. +62 −0 src/core/layout/qgslayouteffect.cpp
  86. +70 −0 src/core/layout/qgslayouteffect.h
  87. +68 −0 src/core/layout/qgslayoutexporter.cpp
  88. +67 −0 src/core/layout/qgslayoutexporter.h
  89. +477 −221 src/core/layout/qgslayoutitem.cpp
  90. +272 −16 src/core/layout/qgslayoutitem.h
  91. +16 −19 src/core/layout/qgslayoutitemgroup.cpp
  92. +5 −6 src/core/layout/qgslayoutitemgroup.h
  93. +609 −0 src/core/layout/qgslayoutitemlabel.cpp
  94. +278 −0 src/core/layout/qgslayoutitemlabel.h
  95. +827 −0 src/core/layout/qgslayoutitemlegend.cpp
  96. +514 −0 src/core/layout/qgslayoutitemlegend.h
  97. +1,670 −0 src/core/layout/qgslayoutitemmap.cpp
  98. +616 −0 src/core/layout/qgslayoutitemmap.h
  99. +2,347 −0 src/core/layout/qgslayoutitemmapgrid.cpp
  100. +1,010 −0 src/core/layout/qgslayoutitemmapgrid.h
  101. +230 −0 src/core/layout/qgslayoutitemmapitem.cpp
  102. +254 −0 src/core/layout/qgslayoutitemmapitem.h
  103. +396 −0 src/core/layout/qgslayoutitemmapoverview.cpp
  104. +262 −0 src/core/layout/qgslayoutitemmapoverview.h
  105. +363 −0 src/core/layout/qgslayoutitemnodeitem.cpp
  106. +191 −0 src/core/layout/qgslayoutitemnodeitem.h
  107. +7 −7 src/core/layout/qgslayoutitempage.cpp
  108. +8 −2 src/core/layout/qgslayoutitempage.h
  109. +848 −0 src/core/layout/qgslayoutitempicture.cpp
  110. +352 −0 src/core/layout/qgslayoutitempicture.h
  111. +154 −0 src/core/layout/qgslayoutitempolygon.cpp
  112. +92 −0 src/core/layout/qgslayoutitempolygon.h
  113. +154 −0 src/core/layout/qgslayoutitempolyline.cpp
  114. +94 −0 src/core/layout/qgslayoutitempolyline.h
  115. +21 −9 src/core/layout/qgslayoutitemregistry.cpp
  116. +12 −9 src/core/layout/qgslayoutitemregistry.h
  117. +131 −82 src/core/layout/qgslayoutitemshape.cpp
  118. +52 −94 src/core/layout/qgslayoutitemshape.h
  119. +1 −0 src/core/layout/qgslayoutitemundocommand.cpp
  120. +0 −2 src/core/layout/qgslayoutmodel.cpp
  121. +7 −5 src/core/layout/qgslayoutmodel.h
  122. +5 −0 src/core/layout/qgslayoutobject.cpp
  123. +18 −0 src/core/layout/qgslayoutobject.h
  124. +6 −0 src/core/layout/qgslayoutpagecollection.cpp
  125. +17 −2 src/core/layout/qgslayoutundostack.cpp
  126. +24 −1 src/core/layout/qgslayoutundostack.h
  127. +268 −0 src/core/layout/qgslayoututils.cpp
  128. +136 −0 src/core/layout/qgslayoututils.h
  129. +2 −0 src/core/qgsapplication.cpp
  130. +5 −0 src/core/qgsmaplayermodel.cpp
  131. +8 −0 src/core/qgsmaplayermodel.h
  132. +65 −0 src/core/qgsmultirenderchecker.cpp
  133. +42 −0 src/core/qgsmultirenderchecker.h
  134. +8 −0 src/gui/CMakeLists.txt
  135. +115 −0 src/gui/layout/qgslayoutitemcombobox.cpp
  136. +110 −0 src/gui/layout/qgslayoutitemcombobox.h
  137. +68 −37 src/gui/layout/qgslayoutitemguiregistry.cpp
  138. +132 −20 src/gui/layout/qgslayoutitemguiregistry.h
  139. +710 −1 src/gui/layout/qgslayoutitemwidget.cpp
  140. +132 −0 src/gui/layout/qgslayoutitemwidget.h
  141. +19 −20 src/gui/layout/qgslayoutmousehandles.cpp
  142. +2 −2 src/gui/layout/qgslayoutmousehandles.h
  143. +27 −27 src/gui/layout/qgslayoutnewitempropertiesdialog.cpp
  144. +5 −3 src/gui/layout/qgslayoutruler.cpp
  145. +1 −1 src/gui/layout/qgslayoutruler.h
  146. +73 −47 src/gui/layout/qgslayoutview.cpp
  147. +11 −3 src/gui/layout/qgslayoutview.h
  148. +2 −2 src/gui/layout/qgslayoutviewmouseevent.cpp
  149. +5 −1 src/gui/layout/qgslayoutviewmouseevent.h
  150. +3 −3 src/gui/layout/qgslayoutviewrubberband.cpp
  151. +5 −0 src/gui/layout/qgslayoutviewtool.cpp
  152. +5 −0 src/gui/layout/qgslayoutviewtool.h
  153. +11 −6 src/gui/layout/qgslayoutviewtooladditem.cpp
  154. +18 −7 src/gui/layout/qgslayoutviewtooladditem.h
  155. +204 −0 src/gui/layout/qgslayoutviewtooladdnodeitem.cpp
  156. +83 −0 src/gui/layout/qgslayoutviewtooladdnodeitem.h
  157. +285 −0 src/gui/layout/qgslayoutviewtooleditnodes.cpp
  158. +75 −0 src/gui/layout/qgslayoutviewtooleditnodes.h
  159. +122 −0 src/gui/layout/qgslayoutviewtoolmoveitemcontent.cpp
  160. +56 −0 src/gui/layout/qgslayoutviewtoolmoveitemcontent.h
  161. +21 −9 src/gui/layout/qgslayoutviewtoolselect.cpp
  162. +0 −1 src/gui/qgsgui.cpp
  163. +6 −0 src/gui/qgsratiolockbutton.cpp
  164. +6 −0 src/gui/qgsratiolockbutton.h
  165. +1 −0 src/server/CMakeLists.txt
  166. +1 −0 src/server/services/wms/CMakeLists.txt
  167. +1 −1 src/server/services/wms/qgswmsrenderer.cpp
  168. +52 −0 src/ui/layout/qgslayoutdesignerbase.ui
  169. +905 −0 src/ui/layout/qgslayoutitemwidgetbase.ui
  170. +391 −0 src/ui/layout/qgslayoutlabelwidgetbase.ui
  171. +71 −0 src/ui/layout/qgslayoutlegendlayersdialogbase.ui
  172. +1,187 −0 src/ui/layout/qgslayoutlegendwidgetbase.ui
  173. +880 −0 src/ui/layout/qgslayoutmapgridwidgetbase.ui
  174. +925 −0 src/ui/layout/qgslayoutmapwidgetbase.ui
  175. +37 −37 src/ui/layout/qgslayoutnewitemproperties.ui
  176. +46 −12 src/ui/layout/qgslayoutpagepropertieswidget.ui
  177. +619 −0 src/ui/layout/qgslayoutpicturewidgetbase.ui
  178. +126 −0 src/ui/layout/qgslayoutpolygonwidgetbase.ui
  179. +126 −0 src/ui/layout/qgslayoutpolylinewidgetbase.ui
  180. +179 −0 src/ui/layout/qgslayoutshapewidgetbase.ui
  181. +6 −0 tests/src/core/CMakeLists.txt
  182. +1 −0 tests/src/core/testqgscomposition.cpp
  183. +75 −25 tests/src/core/testqgslayout.cpp
  184. +22 −0 tests/src/core/testqgslayoutcontext.cpp
  185. +239 −17 tests/src/core/testqgslayoutitem.cpp
  186. +163 −26 tests/src/core/testqgslayoutitemgroup.cpp
  187. +291 −0 tests/src/core/testqgslayoutlabel.cpp
  188. +433 −0 tests/src/core/testqgslayoutmap.cpp
  189. +1,021 −0 tests/src/core/testqgslayoutmapgrid.cpp
  190. +298 −0 tests/src/core/testqgslayoutmapoverview.cpp
  191. +69 −10 tests/src/core/testqgslayoutpage.cpp
  192. +426 −0 tests/src/core/testqgslayoutpicture.cpp
  193. +289 −0 tests/src/core/testqgslayoutshapes.cpp
  194. +311 −1 tests/src/core/testqgslayoututils.cpp
  195. +23 −0 tests/src/core/testqgsrectangle.cpp
  196. +1 −0 tests/src/gui/CMakeLists.txt
  197. +234 −0 tests/src/gui/testqgslayoutgui.cpp
  198. +49 −16 tests/src/gui/testqgslayoutview.cpp
  199. +7 −0 tests/src/python/CMakeLists.txt
  200. +60 −0 tests/src/python/qgslayoutchecker.py
  201. +10 −10 tests/src/python/test_qgslayoutaligner.py
  202. +3 −3 tests/src/python/test_qgslayoutitem.py
  203. +94 −0 tests/src/python/test_qgslayoutlabel.py
  204. +242 −0 tests/src/python/test_qgslayoutlegend.py
  205. +238 −0 tests/src/python/test_qgslayoutmap.py
  206. +289 −0 tests/src/python/test_qgslayoutmapgrid.py
  207. +149 −0 tests/src/python/test_qgslayoutpicture.py
  208. +319 −0 tests/src/python/test_qgslayoutpolygon.py
  209. +361 −0 tests/src/python/test_qgslayoutpolyline.py
  210. +28 −28 tests/src/python/test_qgslayoutview.py
  211. +6 −0 tests/src/python/test_qgsmaplayermodel.py
  212. +31 −0 tests/src/python/test_qgsratiolockbutton.py
  213. BIN ...ontrol_images/composer_label/expected_composerlabel_render/expected_composerlabel_render_mask.png
  214. BIN ...abel/expected_composerlabel_renderhtmlrelative/expected_composerlabel_renderhtmlrelative_mask.png
  215. BIN ...ages/composer_legend/expected_composer_legend_mapunits/expected_composer_legend_mapunits_mask.png
  216. BIN ...ages/composer_legend/expected_composer_legend_noresize/expected_composer_legend_noresize_mask.png
  217. BIN ...ser_legend/expected_composer_legend_noresize_crop/expected_composer_legend_noresize_crop_mask.png
  218. BIN ...poser_legend/expected_composer_legend_size_content/expected_composer_legend_size_content_mask.png
  219. BIN ...ta/control_images/composer_map/expected_composermap_crs3857/expected_composermap_crs3857_mask.png
  220. BIN ...ta/control_images/composer_map/expected_composermap_crs4326/expected_composermap_crs4326_mask.png
  221. BIN .../control_images/composer_map/expected_composermap_ddlayers/expected_composermap_ddlayers_mask.png
  222. BIN .../control_images/composer_map/expected_composermap_ddstyles/expected_composermap_ddstyles_mask.png
  223. BIN ...data/control_images/composer_map/expected_composermap_render/expected_composermap_render_mask.png
  224. BIN ...ol_images/composer_mapgrid/expected_composermap_crossgrid/expected_composermap_crossgrid_mask.png
  225. BIN ...s/composer_mapgrid/expected_composermap_exteriorticks/expected_composermap_exteriorticks_mask.png
  226. BIN ...xpected_composermap_exteriorticks_annotated/expected_composermap_exteriorticks_annotated_mask.png
  227. BIN ...ected_composermap_exteriorticks_annotated2/expected_composermap_exteriorticks_annotated2_mask.png
  228. BIN ...apgrid/expected_composermap_filteredannotations/expected_composermap_filteredannotations_mask.png
  229. BIN ...composer_mapgrid/expected_composermap_framedivisions/expected_composermap_framedivisions_mask.png
  230. BIN ...data/control_images/composer_mapgrid/expected_composermap_grid/expected_composermap_grid_mask.png
  231. BIN ...s/composer_mapgrid/expected_composermap_gridframeonly/expected_composermap_gridframeonly_mask.png
  232. BIN ...mposer_mapgrid/expected_composermap_gridreprojected/expected_composermap_gridreprojected_mask.png
  233. BIN ...id/expected_composermap_interiorexteriorticks/expected_composermap_interiorexteriorticks_mask.png
  234. BIN ...map_interiorexteriorticks_annotated/expected_composermap_interiorexteriorticks_annotated_mask.png
  235. BIN ...p_interiorexteriorticks_annotated2/expected_composermap_interiorexteriorticks_annotated2_mask.png
  236. BIN ...s/composer_mapgrid/expected_composermap_interiorticks/expected_composermap_interiorticks_mask.png
  237. BIN ...xpected_composermap_interiorticks_annotated/expected_composermap_interiorticks_annotated_mask.png
  238. BIN ...ected_composermap_interiorticks_annotated2/expected_composermap_interiorticks_annotated2_mask.png
  239. BIN ..._images/composer_mapgrid/expected_composermap_lineborder/expected_composermap_lineborder_mask.png
  240. BIN ...grid/expected_composermap_lineborder_annotated/expected_composermap_lineborder_annotated_mask.png
  241. BIN ...id/expected_composermap_lineborder_annotated2/expected_composermap_lineborder_annotated2_mask.png
  242. BIN ..._images/composer_mapgrid/expected_composermap_markergrid/expected_composermap_markergrid_mask.png
  243. BIN ..._mapgrid/expected_composermap_rotatedannotations/expected_composermap_rotatedannotations_mask.png
  244. BIN ...ges/composer_mapgrid/expected_composermap_rotatedframe/expected_composermap_rotatedframe_mask.png
  245. BIN ...ted_composermap_verticaldescending_inside/expected_composermap_verticaldescending_inside_mask.png
  246. BIN ...d_composermap_verticaldescending_outside/expected_composermap_verticaldescending_outside_mask.png
  247. BIN ..._images/composer_mapgrid/expected_composermap_zebrastyle/expected_composermap_zebrastyle_mask.png
  248. BIN ...mposer_mapgrid/expected_composermap_zebrastyle_left/expected_composermap_zebrastyle_left_mask.png
  249. BIN ..._mapgrid/expected_composermap_zebrastyle_lefttop/expected_composermap_zebrastyle_lefttop_mask.png
  250. BIN ...xpected_composermap_zebrastyle_lefttopright/expected_composermap_zebrastyle_lefttopright_mask.png
  251. BIN ..._images/composer_mapoverview/expected_composermap_overview/expected_composermap_overview_mask.png
  252. BIN ...apoverview/expected_composermap_overview_blending/expected_composermap_overview_blending_mask.png
  253. BIN ...er_mapoverview/expected_composermap_overview_center/expected_composermap_overview_center_mask.png
  254. BIN ...er_mapoverview/expected_composermap_overview_invert/expected_composermap_overview_invert_mask.png
  255. BIN ..._mapoverview/expected_composermap_overview_rotated/expected_composermap_overview_rotated_mask.png
  256. BIN ...apoverview/expected_composermap_overview_rotated2/expected_composermap_overview_rotated2_mask.png
  257. BIN ...ol_images/composer_paper/expected_composerpaper_bordered/expected_composerpaper_bordered_mask.png
  258. BIN ...r_paper/expected_composerpaper_markerborder/{ → composer}/expected_composerpaper_markerborder.png
  259. BIN ...er/expected_composerpaper_markerborder/{ → composer}/expected_composerpaper_markerborder_mask.png
  260. BIN ...composer_paper/expected_composerpaper_markerborder/layout/expected_composerpaper_markerborder.png
  261. BIN ...er_picture/expected_composerpicture_badexpression/expected_composerpicture_badexpression_mask.png
  262. BIN ...mposer_picture/expected_composerpicture_clip_anchor/expected_composerpicture_clip_anchor_mask.png
  263. BIN ...xpected_composerpicture_clip_anchoroversize/expected_composerpicture_clip_anchoroversize_mask.png
  264. BIN ...composer_picture/expected_composerpicture_expression/expected_composerpicture_expression_mask.png
  265. BIN ...oser_picture/expected_composerpicture_itemrotation/expected_composerpicture_itemrotation_mask.png
  266. BIN ...ntrol_images/composer_picture/expected_composerpicture_render/expected_composerpicture_render.png
  267. BIN ...mposer_picture/expected_composerpicture_resize_clip/expected_composerpicture_resize_clip_mask.png
  268. BIN ...xpected_composerpicture_resize_frametoimage/expected_composerpicture_resize_frametoimage_mask.png
  269. BIN ..._picture/expected_composerpicture_resize_stretch/expected_composerpicture_resize_stretch_mask.png
  270. BIN ...mposer_picture/expected_composerpicture_resize_zoom/expected_composerpicture_resize_zoom_mask.png
  271. BIN ...re/expected_composerpicture_resize_zoomresize/expected_composerpicture_resize_zoomresize_mask.png
  272. BIN ...ges/composer_picture/expected_composerpicture_rotation/expected_composerpicture_rotation_mask.png
  273. BIN ...ture/expected_composerpicture_svg_frametoimage/expected_composerpicture_svg_frametoimage_mask.png
  274. BIN ...composer_picture/expected_composerpicture_svg_params/expected_composerpicture_svg_params_mask.png
  275. BIN ...mposer_picture/expected_composerpicture_svg_stretch/expected_composerpicture_svg_stretch_mask.png
  276. BIN ...ges/composer_picture/expected_composerpicture_svg_zoom/expected_composerpicture_svg_zoom_mask.png
  277. BIN ...mposer_picture/expected_composerpicture_zoom_anchor/expected_composerpicture_zoom_anchor_mask.png
  278. BIN ...mages/composer_polygon/expected_composerpolygon_addnode/expected_composerpolygon_addnode_mask.png
  279. BIN ...oser_polygon/expected_composerpolygon_defaultstyle/expected_composerpolygon_defaultstyle_mask.png
  280. BIN ...oser_polygon/expected_composerpolygon_displaynodes/expected_composerpolygon_displaynodes_mask.png
  281. BIN ...ges/composer_polygon/expected_composerpolygon_movenode/expected_composerpolygon_movenode_mask.png
  282. BIN ...oser_polygon/expected_composerpolygon_selectednode/expected_composerpolygon_selectednode_mask.png
  283. BIN ...es/composer_polyline/expected_composerpolyline_addnode/expected_composerpolyline_addnode_mask.png
  284. BIN ...r_polyline/expected_composerpolyline_defaultstyle/expected_composerpolyline_defaultstyle_mask.png
  285. BIN ...r_polyline/expected_composerpolyline_displaynodes/expected_composerpolyline_displaynodes_mask.png
  286. BIN ..._images/composer_polyline/expected_composerpolyline_hozline/expected_composerpolyline_hozline.png
  287. BIN .../composer_polyline/expected_composerpolyline_movenode/expected_composerpolyline_movenode_mask.png
  288. BIN ...ser_polyline/expected_composerpolyline_removednode/expected_composerpolyline_removednode_mask.png
  289. BIN ...r_polyline/expected_composerpolyline_selectednode/expected_composerpolyline_selectednode_mask.png
  290. BIN ...mages/composer_polyline/expected_composerpolyline_vertline/expected_composerpolyline_vertline.png
  291. BIN ...l_images/composer_shapes/expected_composershapes_ellipse/expected_composershapes_ellipse_mask.png
  292. BIN ...ages/composer_shapes/expected_composershapes_rectangle/expected_composershapes_rectangle_mask.png
  293. BIN .../composer_shapes/expected_composershapes_roundedrect/expected_composershapes_roundedrect_mask.png
  294. BIN ...rol_images/composer_shapes/expected_composershapes_symbol/expected_composershapes_symbol_mask.png
  295. BIN ...images/composer_shapes/expected_composershapes_triangle/expected_composershapes_triangle_mask.png
  296. BIN tests/testdata/control_images/layouts/expected_layoutitem_excluded/expected_layoutitem_excluded.png
@@ -189,6 +189,7 @@ Get font color
%End

public slots:

void refreshExpressionContext();


@@ -11,31 +11,6 @@



class QgsLegendModel : QgsLayerTreeModel
{
%Docstring
Item model implementation based on layer tree model for composer legend.
Overrides some functionality of QgsLayerTreeModel to better fit the needs of composer legend.

.. versionadded:: 2.6
%End

%TypeHeaderCode
#include "qgscomposerlegend.h"
%End
public:
QgsLegendModel( QgsLayerTree *rootNode, QObject *parent /TransferThis/ = 0 );
%Docstring
Construct the model based on the given layer tree
%End

virtual QVariant data( const QModelIndex &index, int role ) const;


virtual Qt::ItemFlags flags( const QModelIndex &index ) const;

};


class QgsComposerLegend : QgsComposerItem
{
@@ -48,6 +23,7 @@ class QgsComposerLegend : QgsComposerItem
%End
public:
QgsComposerLegend( QgsComposition *composition /TransferThis/ );
~QgsComposerLegend();

virtual int type() const;
%Docstring
@@ -158,7 +158,7 @@
%Include composer/qgscomposertexttable.sip
%Include composer/qgspaperitem.sip
%Include layout/qgslayoutaligner.sip
%Include layout/qgslayoutcontext.sip
%Include layout/qgslayoutexporter.sip
%Include layout/qgslayoutgridsettings.sip
%Include layout/qgslayoutmeasurement.sip
%Include layout/qgslayoutmeasurementconverter.sip
@@ -168,7 +168,6 @@
%Include layout/qgslayoutsize.sip
%Include layout/qgslayoutsnapper.sip
%Include layout/qgslayoutundocommand.sip
%Include layout/qgslayoutundostack.sip
%Include layout/qgslayoututils.sip
%Include metadata/qgslayermetadata.sip
%Include metadata/qgslayermetadatavalidator.sip
@@ -403,16 +402,28 @@
%Include gps/qgsnmeaconnection.sip
%Include gps/qgsgpsdconnection.sip
%Include layout/qgslayout.sip
%Include layout/qgslayoutcontext.sip
%Include layout/qgslayouteffect.sip
%Include layout/qgslayoutguidecollection.sip
%Include layout/qgslayoutitem.sip
%Include layout/qgslayoutitemgroup.sip
%Include layout/qgslayoutitemlabel.sip
%Include layout/qgslayoutitemlegend.sip
%Include layout/qgslayoutitemmap.sip
%Include layout/qgslayoutitemmapgrid.sip
%Include layout/qgslayoutitemmapitem.sip
%Include layout/qgslayoutitemmapoverview.sip
%Include layout/qgslayoutitemnodeitem.sip
%Include layout/qgslayoutitempage.sip
%Include layout/qgslayoutitempicture.sip
%Include layout/qgslayoutitempolygon.sip
%Include layout/qgslayoutitempolyline.sip
%Include layout/qgslayoutitemregistry.sip
%Include layout/qgslayoutitemshape.sip
%Include layout/qgslayoutmodel.sip
%Include layout/qgslayoutpagecollection.sip
%Include layout/qgslayoutobject.sip
%Include layout/qgslayoutundostack.sip
%Include symbology/qgscptcityarchive.sip
%Include symbology/qgssvgcache.sip
%Include symbology/qgsstyle.sip
@@ -46,12 +46,20 @@ Copy constructor

static QgsRectangle fromWkt( const QString &wkt );
%Docstring
Creates a new rectangle from a WKT string.
Creates a new rectangle from a ``wkt`` string.
The WKT must contain only 5 vertices, representing a rectangle aligned with X and Y axes.
.. versionadded:: 3.0
:rtype: QgsRectangle
%End

static QgsRectangle fromCenterAndSize( QgsPointXY center, double width, double height );
%Docstring
Creates a new rectangle, given the specified ``center`` point
and ``width`` and ``height``.
.. versionadded:: 3.0
:rtype: QgsRectangle
%End

void set( const QgsPointXY &p1, const QgsPointXY &p2 );
%Docstring
Sets the rectangle from two QgsPoints. The rectangle is
@@ -28,7 +28,7 @@ class QgsLayout : QGraphicsScene, QgsExpressionContextGenerator, QgsLayoutUndoOb
ZGuide,
ZSmartGuide,
ZMouseHandles,
ZMapTool,
ZViewTool,
ZSnapIndicator,
};

@@ -62,6 +62,13 @@ class QgsLayout : QGraphicsScene, QgsExpressionContextGenerator, QgsLayoutUndoOb
:rtype: QgsLayoutModel
%End

QgsLayoutExporter &exporter();
%Docstring
Returns the layout's exporter, which is used for rendering the layout and exporting
to various formats.
:rtype: QgsLayoutExporter
%End

QString name() const;
%Docstring
Returns the layout's name.
@@ -419,6 +426,16 @@ class QgsLayout : QGraphicsScene, QgsExpressionContextGenerator, QgsLayoutUndoOb

public slots:

void refresh();
%Docstring
Forces the layout, and all items contained within it, to refresh. For instance, this causes maps to redraw
and rebuild cached images, html items to reload their source url, and attribute tables
to refresh their contents. Calling this also triggers a recalculation of all data defined
attributes within the layout.

.. seealso:: refreshed()
%End

void updateBounds();
%Docstring
Updates the scene bounds of the layout.
@@ -437,6 +454,12 @@ class QgsLayout : QGraphicsScene, QgsExpressionContextGenerator, QgsLayoutUndoOb
If None, no item is selected.
%End

void refreshed();
%Docstring
Is emitted when the layout has been refreshed and items should also be refreshed
and updated.
%End

};


@@ -8,7 +8,7 @@



class QgsLayoutContext
class QgsLayoutContext : QObject
{
%Docstring
Stores information relating to the current context and rendering settings for a layout.
@@ -125,6 +125,14 @@ class QgsLayoutContext
:rtype: QgsLayoutMeasurementConverter
%End

bool isPreviewRender() const;
%Docstring
Returns true if the render current being conducted is a preview render,
i.e. it is being rendered inside a QGraphicsView widget as opposed to a destination
device (such as an image).
:rtype: bool
%End

bool gridVisible() const;
%Docstring
Returns true if the page grid should be drawn.
@@ -168,11 +176,43 @@ class QgsLayoutContext
:rtype: bool
%End

void setCurrentExportLayer( int layer = -1 );
%Docstring
Sets the current item ``layer`` to draw while exporting. QgsLayoutItem subclasses
which support multi-layer SVG exports must check the currentExportLayer()
and customise their rendering based on the layer.

If ``layer`` is -1, all item layers will be rendered.

.. seealso:: currentExportLayer()
%End

int currentExportLayer() const;
%Docstring
Returns the current item layer to draw while exporting. QgsLayoutItem subclasses
which support multi-layer SVG exports must check this
and customise their rendering based on the layer.

If ``layer`` is -1, all item layers should be rendered.

.. seealso:: setCurrentExportLayer()
:rtype: int
%End

signals:

void flagsChanged( QgsLayoutContext::Flags flags );
%Docstring
Emitted whenever the context's ``flags`` change.
.. seealso:: setFlags()
%End

};





/************************************************************************
* This file has been generated automatically from *
* *
@@ -0,0 +1,61 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/layout/qgslayouteffect.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/





class QgsLayoutEffect : QGraphicsEffect
{
%Docstring

A QGraphicsEffect subclass used for rendering layout items
onto a scene with custom composition modes.

.. versionadded:: 3.0
%End

%TypeHeaderCode
#include "qgslayouteffect.h"
%End
public:

QgsLayoutEffect();
%Docstring
Constructor for QgsLayoutEffect.
%End

void setCompositionMode( QPainter::CompositionMode mode );
%Docstring
Sets the composition (blending) ``mode`` used for rendering
the item.
.. seealso:: compositionMode()
%End

QPainter::CompositionMode compositionMode() const;
%Docstring
Returns the composition (blending) mode used for rendering
the item.
.. seealso:: setCompositionMode()
:rtype: QPainter.CompositionMode
%End

protected:

virtual void draw( QPainter *painter );

};


/************************************************************************
* This file has been generated automatically from *
* *
* src/core/layout/qgslayouteffect.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/
@@ -0,0 +1,57 @@
/************************************************************************
* This file has been generated automatically from *
* *
* src/core/layout/qgslayoutexporter.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/



class QgsLayoutExporter
{
%Docstring
Handles rendering and exports of layouts to various formats.
.. versionadded:: 3.0
%End

%TypeHeaderCode
#include "qgslayoutexporter.h"
%End
public:

QgsLayoutExporter( QgsLayout *layout );
%Docstring
Constructor for QgsLayoutExporter, for the specified ``layout``.
%End

void renderPage( QPainter *painter, int page );
%Docstring
Renders a full page to a destination ``painter``.

The ``page`` argument specifies the page number to render. Page numbers
are 0 based, such that the first page in a layout is page 0.

.. seealso:: renderRect()
%End

void renderRegion( QPainter *painter, const QRectF &region );
%Docstring
Renders a ``region`` from the layout to a ``painter``. This method can be used
to render sections of pages rather than full pages.

.. seealso:: renderPage()
%End

};




/************************************************************************
* This file has been generated automatically from *
* *
* src/core/layout/qgslayoutexporter.h *
* *
* Do not edit manually ! Edit header and run scripts/sipify.pl again *
************************************************************************/

0 comments on commit c000cb8

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