From 86ad564ef5323c411811b3767690f9b4e3189451 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Sat, 21 Nov 2015 20:02:21 +1100 Subject: [PATCH] Add (disabled) test for labels around large symbols --- .../python/test_qgspallabeling_placement.py | 11 +- ...placement_around_obstacle_large_symbol.png | Bin 0 -> 3265 bytes tests/testdata/labeling/point3.qml | 351 ++++++++++++++++++ 3 files changed, 361 insertions(+), 1 deletion(-) create mode 100755 tests/testdata/control_images/expected_pal_placement/sp_point_placement_around_obstacle_large_symbol/sp_point_placement_around_obstacle_large_symbol.png create mode 100644 tests/testdata/labeling/point3.qml diff --git a/tests/src/python/test_qgspallabeling_placement.py b/tests/src/python/test_qgspallabeling_placement.py index d708ca09dbfd..13bd048aa00e 100644 --- a/tests/src/python/test_qgspallabeling_placement.py +++ b/tests/src/python/test_qgspallabeling_placement.py @@ -24,7 +24,7 @@ from PyQt4.QtGui import QFont from qgis.core import QgsPalLayerSettings - +from unittest import skip from utilities import ( svgSymbolsPath, getTempfilePath, @@ -133,6 +133,15 @@ def test_point_placement_narrow_polygon_obstacle(self): self.removeMapLayer(polyLayer) self.layer = None + @skip("not yet implemented") + def test_point_placement_around_obstacle_large_symbol(self): + # Default point label placement with obstacle and large symbols + self.layer = TestQgsPalLabeling.loadFeatureLayer('point3') + self._TestMapSettings = self.cloneMapSettings(self._MapSettings) + self.checkTest() + self.removeMapLayer(self.layer) + self.layer = None + if __name__ == '__main__': # NOTE: unless PAL_SUITE env var is set all test class methods will be run # SEE: test_qgspallabeling_tests.suiteTests() to define suite diff --git a/tests/testdata/control_images/expected_pal_placement/sp_point_placement_around_obstacle_large_symbol/sp_point_placement_around_obstacle_large_symbol.png b/tests/testdata/control_images/expected_pal_placement/sp_point_placement_around_obstacle_large_symbol/sp_point_placement_around_obstacle_large_symbol.png new file mode 100755 index 0000000000000000000000000000000000000000..c02c02e90e7bf6e812d6e6d7895977375afaa7d4 GIT binary patch literal 3265 zcmeH~do)}57RRGiLrf<`y*fzm)U7_0YMU}%@v28V9;38cBGXU|N=*>NqqtN(!rYE` zB_%gnMP{NNO;l7zlW9>>uOUrByvc(qq9W#))&K7O^RBz@A9L2)>#W~C=XciL`}^6y z-|yV@@^IM?J_rVZK>OWXoxDLHg?|C2qpSpYG@LT5fSV%5!Oce*xRRBFbAYkRE!V3U z5J(leYYK0_^76rkw;l>rZ&Ah zICf;LH&XCb@ISfb!k2-IA$N4)mBPM{lJK?HmE|-)Bda~;xE4dhyf2QNYr3(|QPXW- zqp`B`%`Ul>O|0o1wJ7TKRYX1{%QwAFgeyMf!BsO9NlqYU-Z?v!n| zTBIhRVxvr0?k8qZYjY+9y}YiD!!b)$8!S&^8u_`#X^spA^?LMrIzbkB$>p1$Ak6W` z6CnpkIXPMSjnpVku1>^Ko@j#$9j?1zZ*-%T=CB8Rsa&rx)L=V4HudMPue~NO5zKAR z>Kd(o^K!8L3+JH0wf@7}S6uC`6Ota(hnVH&lyyG(Ix6*-V}#@f^+#5JJ709$K^DF> zGM^Oe)`yNAlfCSt&Q|{*`>2heEChrQ4=KP$fwc9O(hk3__g5`PiNg!h9e-y1$QuQh z_Y2hwAI!$v?l=KSY12s<3{IFVUU9&Bp)wSQhMuRJ2Q{5OJN0lOB>cKdM1E@gIXr9} zHE*!!Qgpjwk+U7%j5Qy*aRrBU{2=0eTZ%m33HT2t@7Nh5Q9=>Dr-Wk4n!u&Rjh$an zRC!dF&f8|c4J1mGTbfG+VG{pO{&GNSr|<21V9zQkuKUT^VaMUj`Q=TzkmLtM(VO+; zVGtnkBK^q}1#Xr+>x0C4e{R1gy!Ph8dy6UmA>ie@b+bjtgpTHpb@}vA|r+ zWVfHO-&5nu{Fdqgo1sFW?rk%#w1aL%Q`ASOMN9N{EJ~Fl610Md}Cs&&%wYX*)m4i)NeU(pSwBJG-^HOH+`B|_v z`sHFrGkW?a!tg;9{sTkHijZQ>bnbTs6bB^6m#llA{fQyvNWEvg^9y|h0Xwdr>sRGg zj+d}Vp7Q$7bQlVXDwM%2OsL?+*dV(#HnI8S)pHzHxdy-yETtXW4bTzOywM0q?#x0) z2&S!AL65x)IN}bY%Z*zekqKdW65W(cWoYjJ03#`Squxv^PuH2}!pQqhQs3i!V-}ZP zzSXVD5f|97Y4MI9tYv<&+>V&mLMx;EFNlScXCBr(izI84Q!`bd0c3d!4n3;s+1)+u z1&}M3#}5`GoXwF{_?5{E$>Rt;K;^LS0}uEUl8%i;ja%m#-J#hRO&piKpW_ImlPPQ( zP0zfsENz(Bp74XQ(gwb}5zB)iQsl*ZJe4uThr)>npChcP&`L{mP4cOcD5M!l=e(1# zFsvYsbGh5k9~IdtDS71K3${Ggn?fm?II;V7xl5;h6+Z%B^1}jst^nfBylZo5V)$YScUQ85+rum*jZhDRU6LggPePL4;Tj{Xp@(&^ljq9%Fn^bl_ z{d&aO2annju;5jy=6mcjOc(fVM)9#&g=p~U93iQ)b^XEg|hPzn8=NVr=eRTVFak*ETL^&-ch^yt|_y><>XbZ zV)orK%E;UresFl#vfjz|hQ zeYqhJc7iT%DB3)AMFlETMHC&v(AI^~_EAE2$W=(^`v}bUx&|tVu}R z&a|M09%uHC9=TB5|JdvUk1S;)Z2j*g-Xf_RO2O{#eY=pwOt;OUrIykB0zzH)!j3^+ zr*ta~pSXW5@rpq&JVOyhqShTSeYO(Q9QaO6BA>mdi%2m~Wk8K^F6h)7?y}+axo%}f zHg>GbSNaOGqveu>%G2++HGts>zz&=JX@?CvnzDlB#>QD54;q#VrxWs1y$eb_yKw$T!G2YMn<+B9P`2aW-f>iuQhul_?wVJi9sr8$ABq7+ z5ICqP^g+jzp?}%` cOATZ&NbUWlOajdg_y+;Go%e8}IDD7!2SpcSmH+?% literal 0 HcmV?d00001 diff --git a/tests/testdata/labeling/point3.qml b/tests/testdata/labeling/point3.qml new file mode 100644 index 000000000000..9fdfe97c9ba9 --- /dev/null +++ b/tests/testdata/labeling/point3.qml @@ -0,0 +1,351 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 0 + 0 + 0 + pkuid + + + + + + + + + + + + 0 + + generatedlayout + + + +