From 252e41d3dc5fa5d3f25aa8822e0b7a0cc9069df1 Mon Sep 17 00:00:00 2001 From: Peter Petrik Date: Tue, 26 Jun 2018 11:07:45 +0200 Subject: [PATCH] fix travis issues: docs, sip, test --- .../raster/qgscolorrampshaderwidget.sip.in | 107 ++++++++++++++++++ python/gui/gui_auto.sip | 1 + src/gui/raster/qgscolorrampshaderwidget.h | 11 +- ..._quad_and_triangle_face_scalar_dataset.png | Bin 80307 -> 80307 bytes ...uad_and_triangle_vertex_scalar_dataset.png | Bin 80307 -> 80307 bytes 5 files changed, 115 insertions(+), 4 deletions(-) create mode 100644 python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in diff --git a/python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in b/python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in new file mode 100644 index 00000000000..da672966b5d --- /dev/null +++ b/python/gui/auto_generated/raster/qgscolorrampshaderwidget.sip.in @@ -0,0 +1,107 @@ +/************************************************************************ + * This file has been generated automatically from * + * * + * src/gui/raster/qgscolorrampshaderwidget.h * + * * + * Do not edit manually ! Edit header and run scripts/sipify.pl again * + ************************************************************************/ + + + + + +class QgsColorRampShaderWidget: QWidget, protected Ui::QgsColorRampShaderWidgetBase +{ +%Docstring + +It has 2 ways how to use it. For raster layers, raster data provider and band is assigned and +the Quantile classification mode can be used and the LoadFromBandButton is visible. + +The other mode is used to style mesh layer contours (scalar datasets) + +.. versionadded:: 3.4 +%End + +%TypeHeaderCode +#include "qgscolorrampshaderwidget.h" +%End + public: + + QgsColorRampShaderWidget( QWidget *parent = 0 ); +%Docstring +Creates new color ramp shader widget +%End + + void initForUseWithRasterLayer(); +%Docstring +Allows quantile classification mode for raster layers +%End + + void setRasterBand( QgsRasterDataProvider *dp, int band, const QgsRectangle &extent ); +%Docstring +Associates raster with the widget +%End + + void setMinMaxAndClassify( double min, double max ); +%Docstring +Sets min max and classify color tree +%End + + void setMinMax( double min, double max ); +%Docstring +Sets min max +%End + + QgsColorRampShader shader() const; +%Docstring +Returns shared function used in the renderer +%End + + void setFromShader( const QgsColorRampShader &colorRampShader ); +%Docstring +Sets widget state from the color ramp shader +%End + + signals: + void minMaxChangedFromTree( double min, double max ); +%Docstring +Color ramp tree has changed +%End + + void widgetChanged(); +%Docstring +Widget changed +%End + + void classificationModeChanged( QgsColorRampShader::ClassificationMode mode ); +%Docstring +Classification mode changed +%End + + public slots: + + void classify(); +%Docstring +Executes the single band pseudo raster classification +%End + + void loadMinMaxFromTree(); +%Docstring +Loads min and max values from color ramp tree +%End + + protected: + void populateColormapTreeWidget( const QList &colorRampItems ); +%Docstring +Populates color ramp tree from ramp items +%End + +}; + +/************************************************************************ + * This file has been generated automatically from * + * * + * src/gui/raster/qgscolorrampshaderwidget.h * + * * + * Do not edit manually ! Edit header and run scripts/sipify.pl again * + ************************************************************************/ diff --git a/python/gui/gui_auto.sip b/python/gui/gui_auto.sip index 2ac350255ea..19ef2a2826b 100644 --- a/python/gui/gui_auto.sip +++ b/python/gui/gui_auto.sip @@ -206,6 +206,7 @@ %Include auto_generated/qgsvariableeditorwidget.sip %Include auto_generated/qgsvscrollarea.sip %Include auto_generated/qgsfiledownloaderdialog.sip +%Include auto_generated/raster/qgscolorrampshaderwidget.sip %Include auto_generated/raster/qgsmultibandcolorrendererwidget.sip %Include auto_generated/raster/qgspalettedrendererwidget.sip %Include auto_generated/raster/qgsrasterbandcombobox.sip diff --git a/src/gui/raster/qgscolorrampshaderwidget.h b/src/gui/raster/qgscolorrampshaderwidget.h index ac3e59153ff..98bc3fea6d4 100644 --- a/src/gui/raster/qgscolorrampshaderwidget.h +++ b/src/gui/raster/qgscolorrampshaderwidget.h @@ -45,6 +45,7 @@ class GUI_EXPORT QgsColorRampShaderWidget: public QWidget, protected Ui::QgsColo public: + //! Creates new color ramp shader widget QgsColorRampShaderWidget( QWidget *parent = nullptr ); //! Allows quantile classification mode for raster layers @@ -61,17 +62,18 @@ class GUI_EXPORT QgsColorRampShaderWidget: public QWidget, protected Ui::QgsColo //! Returns shared function used in the renderer QgsColorRampShader shader() const; + //! Sets widget state from the color ramp shader void setFromShader( const QgsColorRampShader &colorRampShader ); signals: - //! color ramp tree has changed + //! Color ramp tree has changed void minMaxChangedFromTree( double min, double max ); - //! widget changed + //! Widget changed void widgetChanged(); - //! classification mode changed + //! Classification mode changed void classificationModeChanged( QgsColorRampShader::ClassificationMode mode ); public slots: @@ -81,10 +83,11 @@ class GUI_EXPORT QgsColorRampShaderWidget: public QWidget, protected Ui::QgsColo */ void classify(); - //! called when the color ramp tree has changed + //! Loads min and max values from color ramp tree void loadMinMaxFromTree(); protected: + //! Populates color ramp tree from ramp items void populateColormapTreeWidget( const QList &colorRampItems ); private: diff --git a/tests/testdata/control_images/mesh/expected_quad_and_triangle_face_scalar_dataset/expected_quad_and_triangle_face_scalar_dataset.png b/tests/testdata/control_images/mesh/expected_quad_and_triangle_face_scalar_dataset/expected_quad_and_triangle_face_scalar_dataset.png index 9a404e9b266e0cb46e8b5d3dcd06f37058053a95..aa948cf0abcacac891b0753ac8d3d62d45f73d0a 100644 GIT binary patch literal 80307 zcmeI4ziSjh6vy`zL=$3TVH8FG2_c0bk&}2$kdPu`qhKWpf{k5*h+t!5qavvUg`id@ zSOx`SD}vZt2wGaGO}s@y?#J%k?C!ibZ+1U{BzLlR<&A*ByMpch#RL` zu0oRWu_DNLMzvmnB%|X+kkNb^aTiJQV@8mCHjTP7EXm%3YaI*E0@#TGS?pvHypv&J zg0~dB0R#yifvpCRq(2V?>F2?_E&(Lj9Rmc}Wx=Z+0!Z>727>eq1uy#vAW6c%1L_|M z-VG9Hx+MGt8Jq~-4-sgxBnUDz4qV70&{RnfBx@SDmPw$Ak|0RtC~z^4fOSbu9BzFQ zdlsOxvc8Nld85JgTmsgu$!)yE4Fo9xjV;aj>mq_M?WGAc;Wr6_lpYT@rUdFP34$=^ zl?l{Y5(KF{9u!Ck)KwA$VZOZ)sG}qZ;%z)AloF_$BnZM>dnZsQNf5;Qcu+7UP!~zW z1v$Pk^Gxhn0A?{70(B5ZT$X6kq)`z9u}gv=B4a_(UIH;of*`#~@>+~Qtdbyz*ho-# zkU)%*Ajn{fycZ=9nna4S zOM)PoWAJxv={?T^WTFwiXjvF!5e}d7ZUn4Kf*@}Bu}Xn}MM)4uA$X2(Ctyty1aZ%f zl}ZFGNrE6sp>s?z0#+nJkYc&9T9JSSNf1OaaE>ZYAhaY1Qam$uC=&=N34$nx&2i-j zgpve7%H?Hp*Ve}4xu!e|5JDJaF*)`$l}A8Z5(LRhg6n1pXi9=0X2*cWMiJ1G1VKin zz&+ChG$cU~(<4B0;|NGgf*|7(;J$eRl9C{Z`S@wjg@BYK2;xGYHBk_dkOV=Zh@K{0 z3HX)-L0rkRPKdyR&zBy_JqzGdnAXC~%MTbMGzXLoOTd>Y2og3&P8THLLlOiL42aU< z2~?E?LBeN92f_rZNP-~3;ZWWNfwGbyh>iT{LV-XTNf1OK7>=+*pr|AWVkbK~Q6f-8 z5(H5Sg=1_HaFql>Y~@BbiUeFF$q?kn=Jxj_nf}vh&n_x<%TW*rOkkWa8L|ZKnByU! zOkk8G2%;PY$Jr#1CkcYs%!{r95Xh1QK>`H9k#-3TN`fGEv!b&=1bQVwkU$}DtZf22 jk|2ofoainffmD*~r$0Vl{rUA&+D7NxeEZee%Xj_(<~{=J literal 80307 zcmeI4KWG#|6o=<5j7dn9!k~qJz(y+z!8Q`nvj`GWXlEfP*a)K7B?=0*f`wvhsiH{G zQc^^$(n`QWOKXc%=N%Gqe|GO?cjvu%v-<^--0jZ1dHH_tBSn@xySjX7Zsy30b8fDE zd1ao1j2Tz%Mb?e&edmUEp> zcOf4}2y|S_z1-O~(hY4K0D(OMw@yvjYpS6gA&Al7k;FzY2x23L%r1~56N~Ca1X0CZ z{4gXb&Mf2(1PMt~s1}k4f%PbhARdq`EJ2buDIiE3?xjvel2X_zZ9#sW9ZBRcBZwSZ)yhaBgBw9)xJIdpB;m0mNO-1ED`M;4w1K$wY9ja`5&WAW7ECX$rT5kbncOKK;Q zl#2^N%5h6_7m^f@4MB=COL_;A6pIf*it(z&Y9#TG5kdS})oLY@_{E7Jew=E#3P~o% ziXf92)p`YzjE@&V#`9^!T_nkm8A0;dH0sW%B=`SpzOe8tfSnkS#ZDH{I~f%wdP~t8 zK#=GW*lGYt2J=9WK_0y85%_gg}!eL6DJg;6fIGrb>b!S<}F^Oae`m1VJ)Kfs1(rtV{Ca)6NsIX93#l z8*3PoHyT{eC1Bl}+{R1XK#&s9*wUQ8E+PoiUYbA?ev=?b>G5D=k3iieK@jG=GJ!fv zf*_U0g91GQb(I7`nD1Z&>L>|<1RDQhA`w65h34-(|$!jqJsY-$%Vk1G}VFD>i zf*`{w@?MlcYLXy`=r~Y3i$F?}AV^k%ToWgdiX;dkJ_;O=M<4}B5F{@>uB#BRE(wBU zj=_~lsoSxk;SP2~~LmIOialHj^o0-BN_h}kiqv2g^nBtejIDR9p; z0S!qI#PkTz+#~|hk|4;W1h{XWfTSb{Vm^Kv^dTT634-|0XH60WBqTwQB%-HDUjm^e zK@eZ^tP>*eW@`J4+_L~7g=wvvf4hY-LUTabxCBC(f*^5oK(&DOOw;Tn5$OI+{lOapwjyWCz$^^zq zf*{IaaGXs7d6FQA&AjL;0)Z?^5F|nn9BG%pup|g#H!C`eM4(?11c?*^$J!>aCrQh> mPRDku&FZe>x{>fh}DJr!Ga%*>po^R%6D z@|=8a=b753?@ynLcHN$i>BMm3yW8|}9F|e8r^a~s$jwge@Ss4zSw(nIBk)-DN7Pb^ zZ9Wi$Xz82Q?I)U9ywZXogzNptT1cY1JP<^81$@TezIN271um;306|pJl@$BoDo7#; zW#BLnBrq~P9Ui>wLp=k>d{hX+XaPI`NpfB-2$FN;(FSZ>GZHNTdIur^K?32T(fGbf zNRq2cFcW0)_^}@MUVvO7qCd{PmBaLtG$2D}vKT;I;uIQI4@-=OP+kNeh!+(`=jtnl z7-h>ZRS3ebW(zXjRx!BX98Sm~072w%)E;H)DoCQD2oOXCRZTJPE+5b|vbn=T5W{MF z7bKBdQ3xUxCyiitmhGdFhyhtZ5Ce+nHHEsBki?5i&~p$ZC^1IuH?Qnxlr7CvAxIAD z@=kU484C9T)UJRqQOXTjqR?Z~_l`^VGRc%)nh=CuO_XG`36g~33PD0)o*N~a0p9Ta`&zR&0w_M`ErBF% znIVWv0^4~6uDS4odB<@*fFN5 z6-026#J$-SMV+xk06}6|_HdKFe98OaIx_ABK^PZLN9xsuv?ZAuv740L3y|26Y=$v9 zmL2mk*A;d!pMiM#5Ja36TBZ@Gx*#5sK#;VeV>cLqH3jX#IxuVvK^PW|Qp%NvO9DYC ztv05)R4i^|nz?`45X7GmS_lv*Uu32v5JaH(Xd*_SY*DLNLq@G22%}5UMN5;JoZV`P>l=T;I35~4`x5|Y5V-&BR{J=<+^vU_%4^$rA4 zO&Ia#2xPf&ajt>*-o#hAkpzN>*90x25|H!?;-)b^k#u*JZ6Syb_ zY9)anE@^Dl6OjB0;wF6P3w4q}5SKExtObdBWKBH?|#wF~LiW9t;SKjP*&$5`sv@qkBV70D^=@hmM>GBuBzY0zo)c z8M*osIM1K&yN3Gx`)9O(AQ?b#NPvLXBKJDym8#GCm(GD;l0XnI$T-KBfPhFH{riOH z2SJ2Up`l3xTKmK#fgmPT9dijp;Jsew|NDI&9)i5s(>P&SWv3H08ykFj<1z>sMBwe@ z`GxV2#h}?^Dj*<0;H|Fgl0XmvfM`O1fX{ELW-}CRH``%m=gmEX8E0k=A&4gyoQxxZ z*E<(V0zu-q5-{hi1YYeJns*I?%)@~L5U{M4wmC^42v!6Lco2AL_we*t2;u<;r$8V@ dVAs3D)(cJT`N=m9K9@R9)NZM1-?aVd{{hK(<+A_) literal 80307 zcmeI5TWl0n7{_PPU@uez1WGGXEq?_Oknk@#k!Ci-OJlO{eI6XPY`4cOSa+t9Mt>CBut=X`VKze(AdIp@3mzVqLi?hf0x zdwX^?HMBH%p4XJ?&i3V>zsUa#)y>TR`{|p*jrphg6W#k>@Vv%(g`bS~?t9Ii*XHH2 z9sOrAUT);#aK`h-$1~oTm+{6Yer6PH7mgM07jKu3mG9e_Ya?cux`XDo=-Zd`z2idy zff*8#U=F1Oe!%(C1KhJlfC90G-aqhEf*ihOQoKNvzCuT7w~hS%z$;NwrA-6^;ssLr3jOivxBi^G z7a&5lj+*?1mmIB3R$1c3V&m0XR*Pz9^Eb}a9^^!NuvP;qS$rm@3Q%oSC1jTVUFbqP#`H^290u9 zOVAT&UQ#EC7l?GQ(tk%Pd})^MM;mtO4q?qd1!4`oTY+!IgKiacr5Xyv$+p@lsvSG+ z1lAap0?`OJjjop>=TzAgh*Ry9Q4G*6Bas-gpg>}PNEej^ZpQp=~LU(8y?Dn?M%Jjio?=7(>lKaT4glvN+w<^hJTxM8g5;1a{yy?I}_q ziim4{Dy-<1<^c(G0|947n?`{|<3=k%1aeraEgSIy;cXq-dhe9uooLrmk9dJ-shUom zB=8V!iM=lI0^v1&>^*nd;V!hrTAz4x^u zT9q=OK$P&&I0*!Hqa|{h6i8%rG)xkKN6{Q9T?!-;HX0?7z#c3Noi+s$8d<3U-$W?o z5q8h?Z*T)x5Gq9qBor=Ac7ecN%nw`!1rit)C+Z+z>kPaf^8%G4ULdAV!GWl8k`n|D zVD7YaR1rx3vCeMKYrdSzcJxnc&j}>p41t4~<6BD=vG~sCAPG1};1FiltVz5;Y+bL` zBvv-S%fT`r3Eh1h*H_J4yg;gE&4VPMfxsY|D!fu46-am>%>)i(R!R93NC^(^kbvhM zLBkXV3S`)+AnQ)5)N(dZ9op-L|s}Dv8)*mSh