From 4bbe318c20cb60d9517fb6acb9ec7b8f559a92d2 Mon Sep 17 00:00:00 2001 From: Nyall Dawson Date: Mon, 11 Apr 2016 08:49:44 +1000 Subject: [PATCH] [symbology] Remove distorted star symbol --- .../symbology-ng/qgsmarkersymbollayerv2.sip | 2 +- scripts/generate_test_mask_image.py | 2 +- .../symbology-ng/qgsmarkersymbollayerv2.cpp | 18 +----------------- .../symbology-ng/qgsmarkersymbollayerv2.h | 2 +- .../symbology-ng/qgssymbollayerv2widget.cpp | 4 ++-- .../expected_simplepoints+30.png | Bin 40258 -> 1387 bytes .../expected_simplepoints+30_mask.png | Bin 1656 -> 520 bytes 7 files changed, 6 insertions(+), 22 deletions(-) diff --git a/python/core/symbology-ng/qgsmarkersymbollayerv2.sip b/python/core/symbology-ng/qgsmarkersymbollayerv2.sip index eb30a252908..9bce49420b9 100644 --- a/python/core/symbology-ng/qgsmarkersymbollayerv2.sip +++ b/python/core/symbology-ng/qgsmarkersymbollayerv2.sip @@ -8,7 +8,7 @@ class QgsSimpleMarkerSymbolLayerV2 : QgsMarkerSymbolLayerV2 /** Constructor for QgsSimpleMarkerSymbolLayerV2. * @param name symbol name, should be one of "square", "rectangle", "diamond", - * "pentagon", "triangle", "equilateral_triangle", "star", "regular_star", "arrow", + * "pentagon", "triangle", "equilateral_triangle", "star", "arrow", * "circle", "cross", "cross2", "line", "x", "arrowhead", "filled_arrowhead", * "semi_circle", "third_circle", "quarter_circle", "quarter_square", "half_square", * "diagonal_half_square", "right_half_triangle", "left_half_triangle" diff --git a/scripts/generate_test_mask_image.py b/scripts/generate_test_mask_image.py index 313f560fbee..eb6bf9ffa42 100755 --- a/scripts/generate_test_mask_image.py +++ b/scripts/generate_test_mask_image.py @@ -8,7 +8,7 @@ import os import sys import argparse -from PyQt.QtGui import QImage, QColor, qRed, qBlue, qGreen, qAlpha, qRgb +from PyQt4.QtGui import QImage, QColor, qRed, qBlue, qGreen, qAlpha, qRgb import struct import urllib2 import glob diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp index 3d59188f89c..d0b9d220339 100644 --- a/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp +++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.cpp @@ -394,23 +394,7 @@ bool QgsSimpleMarkerSymbolLayerV2::prepareShape( const QString& name, QPolygonF polygon << QPointF( -1, 1 ) << QPointF( 0, 1 ) << QPointF( 0, -1 ); return true; } - else if ( name == "star" ) - { - double sixth = 1.0 / 3; - - polygon << QPointF( 0, -1 ) - << QPointF( -sixth, -sixth ) - << QPointF( -1, -sixth ) - << QPointF( -sixth, 0 ) - << QPointF( -1, 1 ) - << QPointF( 0, + sixth ) - << QPointF( 1, 1 ) - << QPointF( + sixth, 0 ) - << QPointF( 1, -sixth ) - << QPointF( + sixth, -sixth ); - return true; - } - else if ( name == "regular_star" ) + else if ( name == "star" || name == "regular_star" ) { double inner_r = cos( DEG2RAD( 72.0 ) ) / cos( DEG2RAD( 36.0 ) ); diff --git a/src/core/symbology-ng/qgsmarkersymbollayerv2.h b/src/core/symbology-ng/qgsmarkersymbollayerv2.h index 9bb429a90aa..6eea1244129 100644 --- a/src/core/symbology-ng/qgsmarkersymbollayerv2.h +++ b/src/core/symbology-ng/qgsmarkersymbollayerv2.h @@ -38,7 +38,7 @@ class CORE_EXPORT QgsSimpleMarkerSymbolLayerV2 : public QgsMarkerSymbolLayerV2 /** Constructor for QgsSimpleMarkerSymbolLayerV2. * @param name symbol name, should be one of "square", "rectangle", "diamond", - * "pentagon", "triangle", "equilateral_triangle", "star", "regular_star", "arrow", + * "pentagon", "triangle", "equilateral_triangle", "star", "arrow", * "circle", "cross", "cross2", "line", "x", "arrowhead", "filled_arrowhead", * "semi_circle", "third_circle", "quarter_circle", "quarter_square", "half_square", * "diagonal_half_square", "right_half_triangle", "left_half_triangle" diff --git a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp index 370b3cdad18..a0dd1c396ab 100644 --- a/src/gui/symbology-ng/qgssymbollayerv2widget.cpp +++ b/src/gui/symbology-ng/qgssymbollayerv2widget.cpp @@ -441,7 +441,7 @@ QgsSimpleMarkerSymbolLayerV2Widget::QgsSimpleMarkerSymbolLayerV2Widget( const Qg QSize size = lstNames->iconSize(); QStringList names; names << "circle" << "rectangle" << "diamond" << "pentagon" << "cross" << "cross2" << "triangle" << "equilateral_triangle" << "star" - << "regular_star" << "arrow" << "line" << "arrowhead" << "filled_arrowhead" << "semi_circle" << "third_circle" << "quarter_circle" + << "arrow" << "line" << "arrowhead" << "filled_arrowhead" << "semi_circle" << "third_circle" << "quarter_circle" << "quarter_square" << "half_square" << "diagonal_half_square" << "right_half_triangle" << "left_half_triangle"; double markerSize = DEFAULT_POINT_SIZE * 2; Q_FOREACH ( const QString& name, names ) @@ -541,7 +541,7 @@ void QgsSimpleMarkerSymbolLayerV2Widget::setSymbolLayer( QgsSymbolLayerV2* layer registerDataDefinedButton( mNameDDBtn, "name", QgsDataDefinedButton::String, tr( "string " ) + QLatin1String( "[square|rectangle|diamond|" "pentagon|triangle|equilateral_triangle|" - "star|regular_star|arrow|filled_arrowhead|" + "star|arrow|filled_arrowhead|" "circle|cross|x|" "cross2|line|arrowhead|semi_circle|third_circle|quarter_circle|" "quarter_square|half_square|diagonal_half_square|right_half_triangle|left_half_triangle]" ) ); diff --git a/tests/testdata/control_images/maprotation/expected_simplepoints+30/expected_simplepoints+30.png b/tests/testdata/control_images/maprotation/expected_simplepoints+30/expected_simplepoints+30.png index c111f20638d22b45b672d3823173a6661fa9a702..6c257d9c91850edbadb592e2fd687316236519c2 100644 GIT binary patch delta 1350 zcmV-M1-bgdx&rG8kR%TVVoOIv0RI600RN!9r<0K}7k>Z;bV*G`2jBz?3KALV8ObWQ2kdP;TQQyF`b`KrWrF4ZZB4^TLLsl-3gX zeP2i~r+=mW^!(2`rBsyHt2KhnnH=~O5QGtgAdDacVFV!vBM3nlK^Q>@!U#eTMi7E9 zf)Ioegb{=wj35MI1ewn*S||^+zqb>b@ll)KkKpD3pWtT*G9AV@?{0(?BAefr)@a1m zd;uw%@hl|1 z;eUXm)O5xoCrD(^qO-1=8ukEbC@Z=@uI{DrT7`x(jxD=@Ts>FvU|ju^Q67t{RSIf6 zZji3}3lJ|32Edm;x1gvKQh%Ayu4_(-%5J;z3u31y9RY+=3{#m2`!)F zxyUfQ{n=M$FEh~BHLFh)nwzt$J7mj4?FRw?O%@*N}(nYf>WTt@SXh-T{M8wB@gs z{zf>qHcxbuht zudIuQ&~t2Ndr@8AAvHY#nTJpENZs0L@2GHBFPYgg1_`uk72i6sMVHQ;ghBrNjF!>M z^VL(jw?&Q|uv4s3Fv6Vg1Wt5R_TKgn9~)Xebxp-$-osU${fpe}!sv3~&#ebiU)w zMmRL*A)~Mof#J~zU-KdkytxkgmD^$PjeBrKk06XS4dQnHb$I$d#Wlnl<4XUpgF@$y zuMr~dL2m0X0>e$0EsKaoZhz}ALM6R$?kJdaeS>cdnkr9oWLYC+$wT8x)emX)4s3WM z9hrxw9z&Ujim+i*8l=@3fa<1cvMr5+VRepClHa8X7TM@Iah}KjLq-~ zjl>>B9oG;`((5J=u{H&{Z6mY70D#EkbR4`ggcS)%Fz9t$L)bh!Fk}QF2qOqV7(oca z2*LXyQH#e#NGynhq07*qo IM6N<$f><7Mod5s; literal 40258 zcmeI5TWnNC7{~uxS?Ct1NCdf*D2lK^QjI8B@Bx|xtW*<7BFf} zS_)OLRE+Tflmev@l#35OXd)nZdoW_5sck658+U5Eq3g`Hr}VUYwmWC{%$eQ&CTXX0 z&NnmP{(t*@GiQ5x`tCDxXAMjmkpy61=Io3tRxjjViGA7kRrT9Ftm?BiJ=2rO%KF5G zMXc>wHGBSAAo*MV<=8$kc_i=vGBaj)UUOj0#*#uuc}sCDe{j6K z2;Qk1aC~PGc$-SQ0=57-xMd@pkIeUb!0YNQn}|n;0@8tWM#sbasXBm{)yK-;>2QZC z=|H+hhbBLdl7l51wPsw`Qh{`j4o!KA5={v}Dv&_Yp}FEr%|mr5ttHZc7)6H$#5*<{ zM|ZrfHRHCH1|(Q?XzDvtb5Xr@v(}8uS_+WfqC-=jN6E1`j}p`OXzeasjmGo8pb<_v1lPGrQ>m%nLBh0kni%>2<~}WcF93@a z$CIm2_HwQ^PTbU%!8vuf67?5vplvw2fHYCsMy8>z{vVt8EW-9dg-UvpXIP zYC0S*9}uu!iDeri}!N{uV7j6``|TS%=z&^CEik3L{nDKRK=s> z=Q51G|6Z&p@0rT@0?yZrTaWS&4!duE<0o}R6iDeyS*W=^fknq;-J6}i`+X<2Vqw`H zOq$I;j5H{G0pC@S?@v=aGP)K%hCA^bR#pgZr@Iak1wThDWu5$dFB+O|>0xxN72}g? z{nr=4U~sMYC%Jq9ce`rY+ET`j+*w=vsjJ~KPJekI3S>3!VniaO?e=XfpD+NvtUIYF z)Tl6W-7s4A=YajQGox-%e>@@);@?%JvHuvyi(pi=ck21QGg=bQvuJs*(;y*j4ayd? z4=!W0gbjqJs``sJ{i%va1>Z68ol~HN+l+=QD=Lw{VhO+^gO4BUsVl6M)tRd1eHL^F zWd=l`K0Gq&*gE3hiN$E@3JXZ-f_XUimlJJg5B0i(3M8&&&l>L>KsPxk0-%@_YzCRRD|%4*o*ULBK`U0 zL9Z*U7K+38diPGey5}par;;|lDIn6ki^GXbr>r>CO3F(nAW~!weG&o^x>iyw35XP# zL!X3z1lFoz)8qmm<#1-k3{PMS2}d1|rJQLXLK2h~nSy|bs3pOcfJhKoWC{WzqLu_( z0wO_Vktqm>h*}bC35W!dMW!GiB5FynB_I++7MX&8h^QsOmVihQS!4uq7Z8L>8HXfQYCi!FJlA!Mj`^pUC4=WzL+NQI-C} G=Kle#xjBXa diff --git a/tests/testdata/control_images/maprotation/expected_simplepoints+30/expected_simplepoints+30_mask.png b/tests/testdata/control_images/maprotation/expected_simplepoints+30/expected_simplepoints+30_mask.png index 32a7dd9cdad669682ff71f6aa8acf6126cd4eb4a..c07ae7aa01f8bb2a84c5977d6ede249d216493a6 100644 GIT binary patch literal 520 zcmeAS@N?(olHy`uVBq!ia0vp^DIm~)z2lhIY#`teC{xI~ z?&#nA$Lj((1+|Xem~rO!>#)E-j~Fkn$dqWaSus0q8be0|gP?!{6O)TW0|yrNr?b6* z_cG4C-M3(7&?e`qgBrDa4KG<}{Cu+QP&sd5pg2q`hX5ncnEENjdH+PjPB=Jk2~u4DwO`(o*p>X{Yg6DRv7-vN&7*~vU43oyZ_&QEIZ^YEa7avlJ7E^LIP0QY zx$md$R+Vy_DqD1w^?%>&*7f!h^K3u39?hr=0y-_cXWohP+w$%z%Bj_v-QyMf$#k!z z{f+LIdpDDIM=$DIo2HyS@45Msuk#C*XBr*KlIOYJUH|3C-oHCL9z(wy1IOC)eX;BV5kAT&Zwl|zybwPX!of44$rjF6*2UngFZ5&r$#Y literal 1656 zcmb_d>p#;A82{-=ENMkeGHDXwxKlA?&D|2mn%mqq%BDkZxu=y8j8 z_qxgQ-U=PfykCs-510vp18E^PjGZuu=lgSo5Z#RChm@%5V|fbr`b*f@yE;BHfjF@v zj(%}guZME57s1g^Pqzw$e)_4gT`j2+<7`;$oW)yhNzEHhn8nT#I%TeuwK=*xQ-uX%teWqXJj0d16CG4_xA}Y9jN4P zIl#l$*H#sJ3f!zv&#zH7P5nM()xzA-{?2;#dDQD5yBltIUiprel&!d0=RlcJ3_(6T4z6Zbd(MYV7`z){Eo$VArc*x<<26G)SlQIG4}EnE$p#@EQ1tN z0QR8@zjjo5*VV9CZi00<9A1BAD;bltC8aEL^2#Ps1sR(HjzDKH7^E#!NlNzvE1cL4 zeIjv1KR7rTDwkHVv^y2$fyY-K6E$zQLxGC;51DeFJu|Sf$_AG`ohFB!*%EafY)n|L zdekr>66H7_Eh#4rO!ze?-)e2O9-of`MRUer0+N$Avm;}oqXUA1wvUaCnY7oywp|6B z1yRV6IhDNbiChr&M*!fERkGxs2G-%`q`zYN2^$+5ii(OYWiAhL&XncyKj|ZpK7z!# zSY>&6c@HnI!N|~e`WX3+>_c`;k0|4j9fg~iP>0UJK^i$QWy=Pcw5D+R%doX>A-A*h zCL^vTrDL`z5-m#Anf5Hfx1sPJNB z+&9UIH^tnhq(wjag22eebyzObVwWciq)V61p!){~w#^~S%TWSj7fY+~w#8CXK)_WM zi};0(WF9e(((3=N)JgC(#+x%-Ji9tS5jFZk#w_j|vEA~qdqyBr5pEG*(DqS(HL)op z$poXuXVEqgaeY2`mSK^ssi`ScR*HWP%OmbBJ5$`oBy`Nq3>b|^oJ2EvD}QJMPf}2f z!(t~nBc|9w?cjSMcbeA!Vif-?hl`@k%gVpA=#9{Kzx0 z=iK6F+|8`4FG}8K>1-V`d3}kn7*oMn3N^{+^-NA`1{oINJ$peVO|`X5xcaYHPgn!= za+3LsM#9||md@*mdGkBvL_>%EYQM6CV7kVKDy5yNW6ctS5m$SXrIdptP#`HpVh5 zC=omPteU1KIYis^G>MPHXF31uSMK&$L4B_bjzxDf!bFn8B)l$9Mfe0^TwKOFi;PZ$ z{|V^gIqpnKL}r+