From beffc3a791a257f34f01f72944bace3e19d0a347 Mon Sep 17 00:00:00 2001
From: mashiros <490328928@qq.com>
Date: Sat, 4 Jun 2022 01:37:58 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E5=90=88=E5=B9=B6=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E3=80=90=E6=B8=90=E5=8F=98=E7=BA=BF=E3=80=91=E5=88=B0=E3=80=90?=
 =?UTF-8?q?=E7=BA=BF=E3=80=91=EF=BC=8C=E3=80=90=E7=BA=BF=E3=80=91=E4=B8=8E?=
 =?UTF-8?q?=E3=80=90=E6=B3=A2=E6=B5=AA=E3=80=91=E6=96=B0=E5=A2=9E=E6=96=B9?=
 =?UTF-8?q?=E5=90=91(=E6=B0=B4=E5=B9=B3=E4=B8=8E=E5=9E=82=E7=9B=B4)?=
 =?UTF-8?q?=E8=AE=BE=E7=BD=AE=E9=80=89=E9=A1=B9=20-=20=E6=A0=B7=E5=BC=8F?=
 =?UTF-8?q?=E3=80=90=E6=B3=A2=E6=B5=AA=E3=80=91=E3=80=81=E3=80=90=E5=9C=86?=
 =?UTF-8?q?=E3=80=91=E3=80=81=E3=80=90=E5=AE=9E=E5=BF=83=E5=9C=86=E3=80=91?=
 =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=B8=90=E5=8F=98=E8=AE=BE=E7=BD=AE=E9=80=89?=
 =?UTF-8?q?=E9=A1=B9=20-=20=E4=BC=98=E5=8C=96=E6=9C=8D=E5=8A=A1=E5=99=A8?=
 =?UTF-8?q?=E8=B0=83=E8=AF=95=E9=80=BB=E8=BE=91(=E8=B0=83=E8=AF=95?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=EF=BC=9A=E6=9C=8D=E5=8A=A1=E5=99=A8=E5=B4=A9?=
 =?UTF-8?q?=E6=BA=83=E8=87=AA=E5=8A=A8=E6=89=93=E5=BC=80=E6=97=A5=E5=BF=97?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6)=20-=20=E4=BC=98=E5=8C=96API?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 Locales/ja.qm                                   | Bin 5515 -> 6950 bytes
 Locales/zh.qm                                   | Bin 5229 -> 6536 bytes
 Locales/zh_TW.qm                                | Bin 5229 -> 6536 bytes
 Presets/Circle/preview.png                      | Bin 4302 -> 3819 bytes
 Presets/Circle/settings.xml                     |   2 +-
 Presets/Gradient_Line/preset.json               |   4 -
 Presets/Gradient_Line/preview.png               | Bin 5383 -> 0 bytes
 Presets/Gradient_Line/settings.xml              |   5 -
 Presets/Line/settings.xml                       |   2 +-
 Presets/Solidcircle/preview.png                 | Bin 6788 -> 5629 bytes
 Presets/Solidcircle/settings.xml                |   2 +-
 Presets/Waves/settings.xml                      |   2 +-
 package.json                                    |  26 +-
 qml/Common.qml                                  |   2 +
 qml/Main.qml                                    |   8 +-
 qml/api/AdvpCanvasTemplate.qml                  |  21 ++
 readme.md                                       |   4 +-
 styles/Preset_Ordinal_Scale_UI_bottom/Style.qml |   2 +-
 styles/Preset_circle/Style.qml                  | 342 ++++++++++++-----
 styles/Preset_gradient_line/Style.qml           | 310 ----------------
 styles/Preset_line/Style.qml                    | 470 ++++++++++++++++++------
 styles/Preset_solidcircle/Style.qml             | 370 ++++++++++++++-----
 styles/Preset_waves/Style.qml                   | 364 ++++++++++++++----
 23 files changed, 1221 insertions(+), 715 deletions(-)
 delete mode 100644 Presets/Gradient_Line/preset.json
 delete mode 100644 Presets/Gradient_Line/preview.png
 delete mode 100644 Presets/Gradient_Line/settings.xml
 delete mode 100644 styles/Preset_gradient_line/Style.qml

diff --git a/Locales/ja.qm b/Locales/ja.qm
index 4d94940b797ceebfb79d9c589b27e787ad20cacf..853a861d2506399e18229ae62b0b97f230f89716 100644
GIT binary patch
delta 1734
zcma)5eN0tl7=O6jbI<)a_niC11uqjX?M9`8-W5?ZYQ@KbK)$Y_mWmfR7f-;sayejS
zdKb&KU~bS6SI(gjHgimytPpHsK@%$}nXR%=C)4<_*22<1AbT#%1NUaGKhEC0&-?s-
z&+qv?&uLomK}z$|7b9Z;s8ay;uR*=%5P-n}>O<`Ss{26w$wdI87N`~H0XPPz;!FTj
zJW%z!0cb5)`wk+GhbI%qkb{PT;i~}5kFa+327uMtQes!xuC#28)3fmrv7dKgETv_?
z-D0d(?aCSiu((ts12#O5w)7_j*jFf>eJ6meiy}D<SZ@<mf2$h+DyePSV_4@s>fJBW
z@IFEv9_q*YQ&g8~03f=D`sqdn#*^pI=%=ZRWgi3R8#UzIqo`-ChKyUWcDttXrVI7g
zXxeY{0J=0y-!$fNZ)(2U|0e{%oT-@{zXA{yt-0>`8;Rf0%<gy)?|bN|+t?supkudT
zJkmwGX1_;+F4Ipu5QW4ebV;{_`4+li>NFNErkm@IU?UcKaO-bau$`XhLqiN_wd%Hw
zXy`$0%9;1E?J{lORlGCDw4;t;`9wslu2Y}z%qYH$%9kRR1P)~9A^LZH@2wfkdfSlo
zCE8+0HMmV#c-9zNjy#4cikL?lQ5DzCY{;=-TlI`b{sUE?V_u&u#rQR5@64xY*LCL1
z0Tyin=4=P@aY@Y0;!fmGH!jWTK-Ck*!J$+D_5H@nFQ7ekLx7DLqX5`!HvUvA${u5L
zr6NoyX7@#AV%q|HQWuA9u4jMvEC~y)<|3XQ0Wkl}B~PXy?i=p$zmVA6#%)f(IGxJ9
z)`a=&J}%I665}s(t-(3yd${pIw8ywyKo2J)QK6oEOJ+!So2ts7%}Xp9*nVMSrhLh0
zmrJcSS;syUuob=~n@UQ_M`VJW#?&723z^mio73QDO81FEnWxJ6oZnL}@S;RxkaA0}
zR`C%*ddJ<+L~KlaX|KYuB%H(P<|RoGD{7HUPGG$;YQA^1S;^OB2!6gy5`3b(o!yk|
z2$e?Osn8Yml1j3UG${}+Q}mQp@rp`$nBDoXJq*}O`bj65Qb6pTo}6?2$QfK?p}ufu
zfkedoRRK}S<FdtCp`3RX_-ciqsxS-K1qcxv{0b~;4kr6d%dF}R*P6$b2X!v*mE?YI
zw@aUw*eZutTP2j2V=H&6$r+~St?HV1vSxuG&nNP7z*HTu&yO@{9}&r6@*O!r2FQ?-
zxh&u7t>q=B&+AOb;qiWFt|0PG#o(}39Hf_AAV<j%nfg!4_ytNgvjykmudAM8l~-~O
z`B#(6tzT#VmxreOI_aJ!E?`1Tw9n&$E-sHjWgp^(_Tx87j?ZsuXm(+p$B$jgTTF2Q
zJ1+Eb(m|#|*Ff=xE5ePw$7bIh9<tdnVH6>Yy@oZ)7IT?R?VesVe5y#O*euCj^HjjH
qcz8RK)~~EQuZW9t<4?!`-?`bt=N881RM^}L6Jr)HLU)=aJMtgg@ABgS

delta 545
zcmX9*ZAepL6n=Jh-}i32cX!*JEuG|`){vq#s0?yHLK36}mBfAs8B2qO5EXJ^SVqSF
zRAl3=5Q)k@OvMr!6>89jMITboeih|{h9D*gWzE2>BmFv@_nhbJyuDRt)}CL{ARPwS
z6TtHk@})jN^+WFK0i>0XALIdT6_|MeP;Bsy+@igss9skfjDlV7CTV{T$y5Na_oKc4
z097kacG>{fY^JkfjW%j2e>Mo{6PD&hV&i_v(^Ns|xD+0!C-zz?H&#OPROU<ggwtSl
zUz)JPEE4MgoJnTRX92XZHrqYY?qyvsYN*e#fme^I-_8c5F~E4vKFw{T_l^In5o7tL
z`+(y#kG$VN9=myD%1gX;yrmc<wIJ{LyX3WokNluL=UF~}^(V@q@8Q!^UjcWJ&m<O!
z_#FS!UP=88F=X-iT`6T>ww0a(O2@aC#2>fGR~jkBaiK^7`w>TI>jbgi7VD+5ox}4B
zq&%+Hy`dy(RL$JoL|3iX_QniSHnoKKPQ-cb*z|sKFsgMgJfcLuwb$2lN&@Zeb;3KV
zv|{`w)n8&r@@@8%>ZJun!-Bq}mCh%}^~=^;3g*^7JPi|F!j%l==(D1(i%S6=4-b;t
zVm4|uRWYeoiY`}!D0A-?cig5(c-q7vBP~MSYH`ZjDAFaX#q6?XVfsF2XO?fV{sRXU
BmvR6A

diff --git a/Locales/zh.qm b/Locales/zh.qm
index 751b0f0098f86c1a4500e5d72a0e9b0b813824c2..a766be217c9d739a6c0350f2ab9852064db0fa33 100644
GIT binary patch
delta 1540
zcmaJ<YfM`O6h3|2N89^qDNTXE3T{Z^Kn9zb=?@1ZGJzH-;vSA#=<QmE#gxLFIBJMX
z4CrigMbRw4rYyuwOooq)O+cxU&A2Eo*%GpixL_(ivN_zAIKWd#%Zg?{Zf@>(zweyy
zeCPa;^?H6Fb*I7zK#Tz-ZU*H$0|4r3P!1dckS&1n^D6+135bU-0I;`!s3`{E6+pDS
z4M4sG3B&yW`k&yj>}vqZeyBJ<1E9G9+vn#1w4VfR26=)jxGzo3^0Jh#ParlK>^10^
zCi$BsApl`oJ~^&O)Dj%c@v}}sWjF|su#w0uZ3p1C5-oRz0Ki7H(kIa$L3Dpph~Hzx
zM-!vi_haIOd>p`#N=(gdMLcKuoj5>Tss9W>6(Vzg%tt>hWNtVCK(~q9dwVVVw~$8`
zMF6^;9KMM>&P9IL`#1POV9D9=&uHL1@^||JHk={n+p@5cno3;60W}3wN-N^>>(tu$
zi}?POdi23WEbOFgLq6ocO11y?EjA8Nf#yNPd#KR9Ke6Ef>epcmL_^TZo>~m_IQ_`k
z4{&TPJv@WonsfB!<nz*LS&C{}o%zIN{BuCMDogVBZ8M`fq&{`$F0%SHCFd{}b&JL-
zl;HcgCOEhWU94yFI?xsOF0;E-hhv>&?9yN8dJFT)Y#rhg%=>rGpu3&S***?q0_OXp
zSdTL@w`)Gc`VX+FrAM(|IvbjJ96)iAoqihQ(YN|J<23^JUcjY~b)oDkSLUn2J=5G_
zMKPLO<VI9!IA)l;^i>YV_5&~5GKpL5<2TM0qV6<ba0?3y4&IfCI61(-+=+a)gZF<i
zf_NU^71@L81|JS#JWQb*mszGjhe~hBp7r!lkGx+kaV(|Z^=0ibI%1u~M_VL%e4<w>
z(<MtqZ07c^b+$T>V7(M02t|z^cfGyA^rYABa3h&Q6=C)5ZxCgX>P%G8IpX)kR7tB<
zlAkq7F1DIiil?fzF`i1Yb4KY5TbV&uKir%Z*O@Q&*y|d^SYv5{ZB3^m6jy<bkCot}
z#!O45r02Pga=P+hAZ#hW#}L2G)8uxDri#WUx6j?^Sv^Hm(0#bw8!Mf-B$D3ZO}gE`
z1i~>~StdGt(hPSfgEnV(&BZq=cRL*DI@(Bb@K0&w;`EBx+~^UdUfwMYYUoT1qr$TP
zpV;3u7N@gG^qCr+rsd6;%G^kQj!Vkrx`S_QXd8{>7bi(ykyu|8>wVtl7owtMNhPc^
z?=Y+iL$Eaa?wdwb5toKxS%q<|$q;I$sz`IG86vaCvnreI-pEA-__Swe+iTU@_@!3i
z72W5WqJp?<GOiLW9n*Dzkn)6GdZqQ|J*y$A+<RO;sZE&LpfhLN#+UPYc605qy%#K<
fv6$1Wc+%qkq@1r?N%=o2Q%tow=%k??TD{_5RQjbd

delta 545
zcmXAmYe-XJ7{~uRJMY;!+q-jiYgCd($U&mkLZrw(gcSr9Rz`?q%T{322Z=QbLunA$
zC%4|Lkf@A=wN?X1MiO{gVOJ?X6_QaRiCv(}&<{3yq)!je?e~BF@7rGfy)3?>UTOx|
zAmAE-d^ri&_d!l}1C|2hz6rol3l_ZuD5v4=@1eOvs9ZY<$UWFSIz|0bG@U5{)G4&y
zIZAOW&UL7Oo=<cXuXcR06b+{VXWnw8Ks44Rxx>Y@{X+_*_R{t#X)NcXerMuipp9>2
zn*TiQ4zXZ$4B+i7I+q0yVl8SfX<uYlpH@*m$WqS+DBr}=QVwvZ*!Z7qR1f@*?g};$
zegJ4sl;GQP^7KXtPJ4-4ryQRxCABK0dtvd`n9~27=6G6pc_WV^IGdH3>Cb>+D&HCl
z1U{+!Z7rkxipW^}%k>MkP&Ptkr!Dq%g!pk)zJ8Eg+!HpbM7wJ@w|pRaPOOub)jXP;
zC*=jlju+&_9(5${R{+u)-cao!<zC(>ei3+-pPe~O7mV|+`N!nw3x9r7Cnw;qZ_z$K
zz-Ra0CZ=CxB>x7NsxO^nRMzyJ5qdsZ)vsB%ld)C$yP*K#8jL1$j6N%AbS@gyejcN1
z-)A>lGj_33H^oD}R;)Mnh^%o!)VNwiox4q_o=Oq+)QeqSQ^b8C;aT!38}a+B{{YWl
BnIr%J

diff --git a/Locales/zh_TW.qm b/Locales/zh_TW.qm
index f43bac11dd6fb8fce1ce6596475a61f5021acbf9..7673028209ddd7fa15dbe13d1a69fb5bff99c4eb 100644
GIT binary patch
delta 1540
zcmaJ<eN0<*6utd;udnU<YAH>DzzUm4;vfi{ESrBg7?BCId=2+WE%X(-VXLJuC$bt6
z69ZA({Dz`2z@{w3O-zO#8Cy1#8rh7C;*uH3HsXS*IL+qfw!{J6LRwZd`{U*1op;W?
z=bn52$a+0Lkh)W00-(kK5;ubK?I8e74Jd~W1IXq<`S}$9)(q5R7Xi3CK-Crl2nwLu
z4gt_FLBi-DfZ<2jlzk0AIS3UOW&pG|Vf)-|0Np1+n^B(76x^St;RIRASH}^X4E7uK
zY>WJjk`RD6EuS1WAZiVs&GB<iN^N`%AYmPqTiOZ0Z=u@mjR1g+YG+QMKZ@%8x)8s|
zsE;PjV&9Lc<MMF;V=6Uudkf+@OYg)X>Po|B0O}B(`$InZX`^$)2>|-_^uD`m(7%;F
zydVKEo%HA}<nc}PxBY*EA4HCx4gZ1$-lebG=ds}oJ$En*8);OD3pk**K$X&txcr7{
z&D<q?f2!K>Xd)JNs%#@Z<iD!w{QVnj98d*XhY{~nh4%l64Lel7jbb2Lic$8}VW7vD
zC(eC<W9yjF8T{6sXD%mSAg5$0>S;~pQ<w2i2e~Rs@(*mapgN>EdG9{52DK&UF&0gm
zwpuK~_c3j7cs;sU%jR{VEB+mJPpKZqI>Fk>U+8)>`^s!R;uGw9_fMm{o$R>*9%BOb
zyCYbSH?enXKg9a0xzy4lSTCImO*{#pxWr9w!*~qse%^GA!o3&p>0>=8yULgOs&LN?
z|GuIaO)l_f)M+?onE&a^9E|OILAH4kw>luKn=M4$DWTvF78V^sQzqi{knnOh^0_X-
z|HT=^^Mszr9@IC5a0ugJ3thO(G6gzRdP^GDG9!KRK@H(Km0{QQx}!|QI*pI6NOJom
zFDcU}lOis2I}vU5o(<hyF@jj+al0Dq&E}`Qc83eeDpXO`z5~sYEK;3~D!Q`$?wBfR
zrHc4D6KUdV1f_JcMi=9$iJdo*(_Cc+v(46;71voPcH8TlrC4J!&$XvB5z5}xHX&Am
zj~X*Cnj(Aou5zZbF%Y(vKVV4M>TYp4By)wQ#pQE(+$*Pu3VN-b-dO3xMG<*RFzfgH
z8VJX5Wtrskks1EY491e(L*g5iyBrR59c@G$!ZSMgi|NZ^i^naIe!)eCwM-_4QDHss
zPwek1tJB#c`OF@td1*7|G8fXH<CAjv-c8-RJARJj7bi(ymQ=qWHTb-(&qqbcL@hpI
z*<oA}hG=c|Jv5D|A}$T%k_zKkl_AznRneAG3q)p*XH~Y^y^)Iw2x-qUwqT7eeyLS>
zMGv{As37i|Oe;i-$8<xaNS?UMpsc?2z-p)}S7Vcp92BP>*ITk}<4bw%-dJ~Z-$iS8
fEatRoJZb5FQqI>er~Dt4Ii^|}bkfKUok8(0n%<&$

delta 545
zcmXAmYe-XJ7{~uRJMY;!+q-jiYgCd($U&mkLZrw(gcSr9Rz`?q%T{322Z=QbLunA$
zC%4|Lkf@A=wN?X1MiO{gVOJ?X6_QaRiCv(}&<{3yq)!je?e~BF@7rGfy)3?>UTOx|
zAmAE-d^ri&_d!l}1C|2hz6rol3l_ZuD5v4=@1eOvs9ZY<$UWFSIz|0bG@U5{)G4&y
zIZAOW&UL7Oo=<cXuXcR06b+{VXWnw8Ks44Rxx>Y@{X+_*_R{t#X)NcXerMuipp9>2
zn*TiQ4zXZ$4B+i7I+q0yVl8SfX<uYlpH@*m$WqS+DBr}=QVwvZ*!Z7qR1f@*?g};$
zegJ4sl;GQP^7KXtPJ4-4ryQRxCABK0dtvd`n9~27=6G6pc_WV^IGdH3>Cb>+D&HCl
z1U{+!Z7rkxipW^}%k>MkP&Ptkr!Dq%g!pk)zJ8Eg+!HpbM7wJ@w|pRaPOOub)jXP;
zC*=jlju+&_9(5${R{+u)-cao!<zC(>ei3+-pPe~O7mV|+`N!nw3x9r7Cnw;qZ_z$K
zz-Ra0CZ=CxB>x7NsxO^nRMzyJ5qdsZ)vsB%ld)C$yP*K#8jL1$j6N%AbS@gyejcN1
z-)A>lGj_33H^oD}R;)Mnh^%o!)VNwiox4q_o=Oq+)QeqSQ^b8C;aT!38}a+B{{YWl
BnIr%J

diff --git a/Presets/Circle/preview.png b/Presets/Circle/preview.png
index 9d1a61976c43a0af9d40413c05301ca80d113c8b..34d3b54acc69a1f826c0acbfb8688abdbce90def 100644
GIT binary patch
delta 3685
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
DABbZ<

delta 4222
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
UM97ixsQ>@~07*qoM6N<$f(+$iH2?qr

diff --git a/Presets/Circle/settings.xml b/Presets/Circle/settings.xml
index 69253ab..98b0473 100644
--- a/Presets/Circle/settings.xml
+++ b/Presets/Circle/settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map>
     <value name="current_style">"nvg://advp.widget.mashiros.top/advp-style-preset/circle"</value>
-    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/circle">{"Main Color":"#ff4500","Line Position":0,"Line Width":1,"Max Range":50,"Data Length":0,"Channel":2,"Reverse":false,"Rotate":false,"Ratate Speed":10,"Angle":0,"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
+    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/circle">{"Gradient Style":0,"Radial Gradient Settings":{"Inside Position Color":"#f44336","Middle Position Color":"#4caf50","Outside Position Color":"#03a9f4","Inside Position":40,"Middle Position":60,"Outside Position":80},"Conical Gradient Settings":{"Start Position Color":"#f44336","Quarter Position Color":"#4caf50","Middle Position Color":"#03a9f4","End Position Color":"#ffeb3b"},"Main Color":"#ff4500","Line Position":0,"Line Width":1,"Max Range":80,"Data Length":0,"Channel":2,"Reverse":false,"Rotate":false,"Ratate Speed":10,"Angle":0,"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
 </map>
\ No newline at end of file
diff --git a/Presets/Gradient_Line/preset.json b/Presets/Gradient_Line/preset.json
deleted file mode 100644
index 8d2612c..0000000
--- a/Presets/Gradient_Line/preset.json
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  "source": "nvg://advp.widget.mashiros.top/widget",
-  "settings": "settings.xml"
-}
\ No newline at end of file
diff --git a/Presets/Gradient_Line/preview.png b/Presets/Gradient_Line/preview.png
deleted file mode 100644
index 46191eb654ca7e0152d7de956337baf966545333..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 5383
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

diff --git a/Presets/Gradient_Line/settings.xml b/Presets/Gradient_Line/settings.xml
deleted file mode 100644
index a14c747..0000000
--- a/Presets/Gradient_Line/settings.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<map>
-    <value name="current_style">"nvg://advp.widget.mashiros.top/advp-style-preset/gradient_line"</value>
-    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/gradient_line">{"Gradient Direction":0,"Start Position Color":"#f44336","Middle Position Color":"#4caf50","End Position Color":"#03a9f4","Center Line":true,"Line Position":0,"Data Length":0,"Channel":2,"Rotate Settings":{"Center Enable":false,"Center Angle":10,"Line Enable":false,"Line Angle":10},"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
-</map>
\ No newline at end of file
diff --git a/Presets/Line/settings.xml b/Presets/Line/settings.xml
index 9b4df8e..cfe4c52 100644
--- a/Presets/Line/settings.xml
+++ b/Presets/Line/settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map>
-    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/line">{"Center Line":true,"Center Color":"#ff4500","Line Color":"#ff4500","Line Position":0,"Data Length":0,"Channel":2,"Rotate Settings":{"Center Enable":false,"Center Angle":10,"Line Enable":false,"Line Angle":10},"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
+    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/line">{"Enable Gradient":false,"Gradient Direction":0,"Start Position Color":"#f44336","Middle Position Color":"#4caf50","End Position Color":"#03a9f4","Center Line":true,"Center Color":"#ff4500","Center Width":20,"Line Color":"#ff4500","Line Position":0,"Data Length":0,"Channel":2,"Direction":0,"Rotate Settings":{"Center Enable":false,"Center Angle":10,"Line Enable":false,"Line Angle":10,"X Scale":100,"Y Scale":100,"X Offset":0,"Y Offset":0},"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
     <value name="current_style">"nvg://advp.widget.mashiros.top/advp-style-preset/line"</value>
 </map>
\ No newline at end of file
diff --git a/Presets/Solidcircle/preview.png b/Presets/Solidcircle/preview.png
index e13d40cc61666c595829f18aef129ade344f6649..b2157d9a282a2ea330393853a8290ced518262dd 100644
GIT binary patch
literal 5629
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
Mk@3UNIu0@a2a&`3{{R30

literal 6788
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

diff --git a/Presets/Solidcircle/settings.xml b/Presets/Solidcircle/settings.xml
index eb8e7b6..85e540d 100644
--- a/Presets/Solidcircle/settings.xml
+++ b/Presets/Solidcircle/settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map>
     <value name="current_style">"nvg://advp.widget.mashiros.top/advp-style-preset/solidcircle"</value>
-    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/solidcircle">{"Main Color":"#ff4500","Line Position":0,"Line Width":1,"Max Range":50,"Data Length":0,"Channel":2,"Reverse":false,"Rotate":false,"Ratate Speed":10,"Angle":0,"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
+    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/solidcircle">{"Gradient Style":0,"Radial Gradient Settings":{"Inside Position Color":"#f44336","Middle Position Color":"#4caf50","Outside Position Color":"#03a9f4","Inside Position":40,"Middle Position":60,"Outside Position":80},"Conical Gradient Settings":{"Start Position Color":"#f44336","Quarter Position Color":"#4caf50","Middle Position Color":"#03a9f4","End Position Color":"#ffeb3b"},"Main Color":"#ff4500","Line Position":0,"Line Width":1,"Max Range":80,"Data Length":0,"Channel":2,"Reverse":false,"Rotate":false,"Ratate Speed":10,"Angle":0,"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
 </map>
\ No newline at end of file
diff --git a/Presets/Waves/settings.xml b/Presets/Waves/settings.xml
index c2bc705..f519fd9 100644
--- a/Presets/Waves/settings.xml
+++ b/Presets/Waves/settings.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <map>
     <value name="current_style">"nvg://advp.widget.mashiros.top/advp-style-preset/waves"</value>
-    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/waves">{"Line Width":1,"Line Color":"#ff4500","Data Length":0,"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
+    <value name="nvg://advp.widget.mashiros.top/advp-style-preset/waves">{"Enable Gradient":false,"Gradient Direction":0,"Start Position Color":"#f44336","Middle Position Color":"#4caf50","End Position Color":"#03a9f4","Direction":0,"Line Color":"#ff4500","Line Width":1,"Data Length":0,"Rotate Settings":{"Center Enable":false,"Center Angle":10,"Line Enable":false,"Line Angle":10,"X Scale":100,"Y Scale":100,"X Offset":0,"Y Offset":0},"Data Settings":{"Auto Normalizing":true,"Amplitude":10,"Unit Style":0}}</value>
 </map>
\ No newline at end of file
diff --git a/package.json b/package.json
index 68a3b65..09ea770 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
-{
+{
     "name": "top.mashiros.widget.advp",
-    "version": "1.3.0",
+    "version": "1.4.0",
 
     "title": {
         "en": "ADV Plugin",
@@ -62,17 +62,6 @@
             "entry": "./styles/Preset_line/Style.qml"
         },
         {
-            "location": "/advp-style-preset/gradient_line",
-            "catalog": "top.mashiros.advp-style",
-            "title": {
-                "en": "Gradient Line",
-                "zh": "渐变线",
-                "zh_TW": "漸變線",
-                "ja": "グラデーションライン"
-            },
-            "entry": "./styles/Preset_gradient_line/Style.qml"
-        },
-        {
             "location": "/advp-style-preset/waves",
             "catalog": "top.mashiros.advp-style",
             "title": {
@@ -187,6 +176,17 @@
             },
            "preview": "Presets/Ordinal_Scale_UI_bottom/preview.png",
            "entry": "Presets/Ordinal_Scale_UI_bottom/preset.json"
+        },
+        {
+            "location": "/advp-style-preset/gradient_line",
+            "catalog": "top.mashiros.advp-style-temp",
+            "title": {
+                "en": "Gradient Line",
+                "zh": "渐变线",
+                "zh_TW": "漸變線",
+                "ja": "グラデーションライン"
+            },
+            "entry": "./styles/Preset_line/Style.qml"
         }
     ]
 }
diff --git a/qml/Common.qml b/qml/Common.qml
index 326c519..09fab2c 100644
--- a/qml/Common.qml
+++ b/qml/Common.qml
@@ -128,6 +128,8 @@ Item {
         for (let prop in sourceObj) {
             if (sourceObj.hasOwnProperty(prop) && sourceObj[prop] !== undefined) {
                 if (typeof sourceObj[prop] === 'object') {
+                    if (targetObj[prop] === undefined)
+                        targetObj[prop] = {};
                     Object.assign(targetObj[prop], sourceObj[prop]);
                 } else {
                     targetObj[prop] = sourceObj[prop];
diff --git a/qml/Main.qml b/qml/Main.qml
index a55db76..810edaa 100644
--- a/qml/Main.qml
+++ b/qml/Main.qml
@@ -37,12 +37,6 @@ T.Widget {
             preference = item.preference;
             defaultValues = item.defaultValues;
             style = item.style;
-            if (!widget.settings[widget.settings.current_style]) {
-                widget.settings[widget.settings.current_style] = defaultValues;
-            }else if(widget.settings[widget.settings.current_style]["Version"] !== defaultValues["Version"]) {
-                delete widget.settings[widget.settings.current_style]["Version"];
-                widget.settings[widget.settings.current_style] = Common.updateObject(Common.deepClone(defaultValues), widget.settings[widget.settings.current_style]);
-            }
         }
     }
 
@@ -72,7 +66,7 @@ T.Widget {
 
     Component.onCompleted: {
         Common.widgetsNum++;
-        if ((!widget.settings.current_style) || (Common.stylesURL.indexOf(widget.settings.current_style) === -1)) {
+        if (!widget.settings.current_style) {
             widget.settings.current_style = Common.stylesURL[0];
         }
     }
diff --git a/qml/api/AdvpCanvasTemplate.qml b/qml/api/AdvpCanvasTemplate.qml
index fc70e12..3be503f 100644
--- a/qml/api/AdvpCanvasTemplate.qml
+++ b/qml/api/AdvpCanvasTemplate.qml
@@ -11,8 +11,20 @@ Canvas {
 
     signal audioDataUpdeted(var data)
     signal configsUpdated()
+    signal completed()
+    signal versionUpdated(string old)
+
     readonly property var configs: widget.settings[widget.settings.current_style] ?? defaultValues
 
+    function updateObject(target, source) {
+        return Common.updateObject(Common.deepClone(target), Common.deepClone(source));
+    }
+
+    onVersionUpdated: {
+        delete widget.settings[widget.settings.current_style]["Version"];
+        widget.settings[widget.settings.current_style] = updateObject(defaultValues, widget.settings[widget.settings.current_style]);
+    }
+
     onConfigsChanged: {
         if (context) {
             configsUpdated();
@@ -30,4 +42,13 @@ Canvas {
         target: Common
         onAudioDataUpdated: audioDataUpdeted(audioData)
     }
+
+    Component.onCompleted: {
+        if (!widget.settings[widget.settings.current_style]) {
+            widget.settings[widget.settings.current_style] = defaultValues;
+        }else if(widget.settings[widget.settings.current_style]["Version"] !== defaultValues["Version"]) {
+            versionUpdated(widget.settings[widget.settings.current_style]["Version"]);
+        }
+        completed();
+    }
 }
diff --git a/readme.md b/readme.md
index 1174479..1c05330 100644
--- a/readme.md
+++ b/readme.md
@@ -12,7 +12,7 @@
 
 ## 特色
 * 整合客户端与服务器端的功能，使用更简单
-* 预设6种频谱显示形式，其中每种都可以进一步自定义设置其样式
+* 预设5种频谱显示形式，其中每种都可以进一步自定义设置其样式
 * 提供了Style的开发接口，供开发者添加更多的可视化样式
 * 导入第三方Style类似其他插件，预计支持steam创意工坊下载
 * 服务端崩溃后自启动
@@ -21,7 +21,7 @@
 
 安装并启用插件后，默认加载第一种预设Style样式。右键点击挂件可调出菜单，在挂件菜单中点击“样式设置...”选项，呼出样式设置窗口。点击其中的样式选项可切换不同的样式风格，若此样式提供可配置项，则在样式选项下方会出现配置项。
 
-<div align="center"><img src="https://s3.bmp.ovh/imgs/2022/05/25/ad36cd0eccc8dd61.png" style="zoom:80%;" /></div>
+<div align="center"><img src="https://s3.bmp.ovh/imgs/2022/06/04/b608a46f85afc715.png" style="zoom:80%;" /></div>
 
 ## 服务器设置
 
diff --git a/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml b/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml
index 3e5a9e3..6ace99c 100644
--- a/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml
+++ b/styles/Preset_Ordinal_Scale_UI_bottom/Style.qml
@@ -110,7 +110,7 @@ AdvpStyleTemplate {
             requestPaint();
         }
 
-        Component.onCompleted: {
+        onCompleted: {
             for (let i = 0; i < 128; i++) {
                 audioData[i] = 0;
             }
diff --git a/styles/Preset_circle/Style.qml b/styles/Preset_circle/Style.qml
index 00ee6e1..fb54291 100644
--- a/styles/Preset_circle/Style.qml
+++ b/styles/Preset_circle/Style.qml
@@ -1,115 +1,185 @@
 import QtQuick 2.12
+import QtGraphicalEffects 1.12
 import NERvGear.Preferences 1.0 as P
 
 import "../../qml/api"
 
 AdvpStyleTemplate {
-    style: AdvpCanvasTemplate {
-        readonly property var audioData: new Array(128)
-
-        //configs
-        readonly property int linePosition: configs["Line Position"]
-        readonly property real maxRange: configs["Max Range"] / 100
-        readonly property int uDataLen: Math.pow(2, configs["Data Length"])
-        readonly property int dataLength: 64/uDataLen
-        readonly property int channel: configs["Channel"]
-        readonly property bool reverse: configs["Reverse"]
-        readonly property bool rotateFlag: configs["Rotate"]
-        readonly property real rSpeed: configs["Ratate Speed"] / 100
-        readonly property real angle: configs["Angle"]
-        readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
-        readonly property real amplitude: 400/configs["Data Settings"]["Amplitude"]
-        readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
-
-        readonly property int total: channel*dataLength
-
-        readonly property real dotGap: 360/total
-        property real offsetAngle: 0
-        property var outerPos: []
-        property var innerPos: []
-        readonly property real degUnit: Math.PI/180
-
-        readonly property real subRatio: 0.2*maxRange
-        readonly property real mainRatio: 1-subRatio*2.5
-
-        readonly property real minLength: Math.min(width, height)
-        readonly property real ratio:minLength*subRatio
-        readonly property real halfWidth: width/2
-        readonly property real halfHeight: height/2
-        readonly property real halfMinLength: minLength/2
-
-
-        onConfigsUpdated: {
-            context.lineWidth = configs["Line Width"];
-            context.strokeStyle = configs["Main Color"];
+    style: Rectangle {
+        id: main
+        width: widget.width;
+        height: widget.height;
+
+        property int gradientStyle
+
+        RadialGradient {
+            id: radialGradient
+            anchors.fill: parent
+            visible: gradientStyle===1
+            horizontalRadius: Math.min(width, height)/2
+            verticalRadius: horizontalRadius
+            gradient: Gradient {
+                GradientStop {id: radialGradient_pstart}
+                GradientStop {id: radialGradient_pmiddle}
+                GradientStop {id: radialGradient_pend}
+            }
         }
 
-        function createPoint() {
-            outerPos.length = 0;
-            innerPos.length = 0;
-            let deg, deltaR, r1, r2, _rhmLen;
-            _rhmLen = mainRatio*halfMinLength;
-
-            for (let j=0; j < channel; j++) {
-                for (let i=0; i < dataLength; i++) {
-                    deg = degUnit*((i+j*dataLength)*dotGap + offsetAngle);
-                    deltaR = audioData[reverse*(dataLength-i-1)+(!reverse)*(i+j*dataLength)] * ratio;
-                    r1 = _rhmLen+1+deltaR*(linePosition!==2);
-                    r2 = _rhmLen-1-deltaR*(linePosition!==1);
-                    outerPos.push([halfWidth+Math.cos(deg)*r1,halfHeight+Math.sin(deg)*r1]);
-                    innerPos.push([halfWidth+Math.cos(deg)*r2,halfHeight+Math.sin(deg)*r2]);
-                }
+        ConicalGradient {
+            id: conicalGradient
+            anchors.fill: parent
+            visible: gradientStyle===2
+            angle: -90;
+            gradient: Gradient {
+                GradientStop{id: conicalGradient_pstart; position: 0.0}
+                GradientStop{id: conicalGradient_pquarter; position: 0.25}
+                GradientStop {id: conicalGradient_phalf; position: 0.5}
+                GradientStop {id: conicalGradient_p3quarter; position: 0.75}
+                GradientStop{id: conicalGradient_pend; position: 1.0}
             }
-            offsetAngle = rotateFlag ? ((offsetAngle + rSpeed) % 360) : angle;
         }
 
-        onAudioDataUpdeted: {
-            let normalizing_ratio = autoNormalizing ? data[128] : amplitude;
-            if (unitStyle) {
-                //对数化显示
-                for(let i=0; i<total; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
+        layer.enabled: true
+        layer.effect: OpacityMask{
+            maskSource: AdvpCanvasTemplate {
+                readonly property var audioData: new Array(128)
+
+                //configs
+                readonly property int linePosition: configs["Line Position"]
+                readonly property real maxRange: configs["Max Range"] / 100
+                readonly property int uDataLen: Math.pow(2, configs["Data Length"])
+                readonly property int dataLength: 64/uDataLen
+                readonly property int channel: configs["Channel"]
+                readonly property bool reverse: configs["Reverse"]
+                readonly property bool rotateFlag: configs["Rotate"]
+                readonly property real rSpeed: configs["Ratate Speed"] / 100
+                readonly property real angle: configs["Angle"]
+                readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
+                readonly property real amplitude: 400/configs["Data Settings"]["Amplitude"]
+                readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
+
+                readonly property int total: channel*dataLength
+
+                readonly property real dotGap: 360/total
+                property real offsetAngle: 0
+                property var outerPos: []
+                property var innerPos: []
+                readonly property real degUnit: Math.PI/180
+
+                readonly property real subRatio: 0.2*maxRange
+                readonly property real mainRatio: 1-subRatio*2.5
+
+                readonly property real minLength: Math.min(width, height)
+                readonly property real ratio:minLength*subRatio
+                readonly property real halfWidth: width/2
+                readonly property real halfHeight: height/2
+                readonly property real halfMinLength: minLength/2
+
+
+                onConfigsUpdated: {
+                    gradientStyle = configs["Gradient Style"];
+                    context.lineWidth = configs["Line Width"];
+                    main.color = configs["Main Color"];
+                    if (gradientStyle === 1) {
+                        radialGradient_pstart.color = configs["Radial Gradient Settings"]["Inside Position Color"];
+                        radialGradient_pstart.position = configs["Radial Gradient Settings"]["Inside Position"]/100;
+                        radialGradient_pmiddle.color = configs["Radial Gradient Settings"]["Middle Position Color"];
+                        radialGradient_pmiddle.position = configs["Radial Gradient Settings"]["Middle Position"]/100;
+                        radialGradient_pend.color = configs["Radial Gradient Settings"]["Outside Position Color"];
+                        radialGradient_pend.position = configs["Radial Gradient Settings"]["Outside Position"]/100;
+                    } else if (gradientStyle === 2) {
+                        conicalGradient_pstart.color = configs["Conical Gradient Settings"]["Start Position Color"];
+                        conicalGradient_pquarter.color = configs["Conical Gradient Settings"]["Quarter Position Color"];
+                        conicalGradient_phalf.color = configs["Conical Gradient Settings"]["Middle Position Color"];
+                        conicalGradient_p3quarter.color = configs["Conical Gradient Settings"]["End Position Color"];
+                        conicalGradient_pend.color = configs["Conical Gradient Settings"]["Start Position Color"];
                     }
-                    audioData[i] /= uDataLen;
                 }
-            } else {
-                //线性化显示
-                for(let i=0; i<total; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += data[i*uDataLen+j];
+
+                function createPoint() {
+                    outerPos.length = 0;
+                    innerPos.length = 0;
+                    let deg, deltaR, r1, r2, _rhmLen;
+                    _rhmLen = mainRatio*halfMinLength;
+
+                    for (let j=0; j < channel; j++) {
+                        for (let i=0; i < dataLength; i++) {
+                            deg = degUnit*((i+j*dataLength)*dotGap+offsetAngle);
+                            deltaR = audioData[reverse*(dataLength-i-1)+(!reverse)*(i+j*dataLength)] * ratio;
+                            r1 = _rhmLen+1+deltaR*(linePosition!==2);
+                            r2 = _rhmLen-1-deltaR*(linePosition!==1);
+                            outerPos.push([halfWidth+Math.cos(deg)*r1,halfHeight+Math.sin(deg)*r1]);
+                            innerPos.push([halfWidth+Math.cos(deg)*r2,halfHeight+Math.sin(deg)*r2]);
+                        }
                     }
-                    audioData[i] /= (uDataLen * normalizing_ratio);
+                    conicalGradient.rotation = offsetAngle;
+                    offsetAngle = rotateFlag ? ((offsetAngle + rSpeed) % 360) : angle;
                 }
-            }
 
-            context.clearRect(0, 0, width+32, height+32);
-            createPoint();
+                onAudioDataUpdeted: {
+                    let normalizing_ratio = autoNormalizing ? data[128] : amplitude;
+                    if (unitStyle) {
+                        //对数化显示
+                        for(let i=0; i<total; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
+                            }
+                            audioData[i] /= uDataLen;
+                        }
+                    } else {
+                        //线性化显示
+                        for(let i=0; i<total; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += data[i*uDataLen+j];
+                            }
+                            audioData[i] /= (uDataLen * normalizing_ratio);
+                        }
+                    }
 
-            context.beginPath();
-            for(let i=0; i<total; i++) {
-                context.moveTo(outerPos[i][0], outerPos[i][1]);
-                context.lineTo(innerPos[i][0], innerPos[i][1]);
-            }
-            context.stroke();
-            requestPaint();
-        }
+                    context.clearRect(0, 0, width+32, height+32);
+                    createPoint();
+
+                    context.beginPath();
+                    for(let i=0; i<total; i++) {
+                        context.moveTo(outerPos[i][0], outerPos[i][1]);
+                        context.lineTo(innerPos[i][0], innerPos[i][1]);
+                    }
+                    context.stroke();
+                    requestPaint();
+                }
 
-        Component.onCompleted: {
-            for (let i = 0; i < 128; i++) {
-                audioData[i] = 0;
+                onCompleted: {
+                    for (let i = 0; i < 128; i++) {
+                        audioData[i] = 0;
+                    }
+                }
             }
         }
     }
 
     defaultValues: {
-        "Version": "1.1.0",
+        "Version": "1.2.0",
+        "Gradient Style": 0,
+        "Radial Gradient Settings": {
+            "Inside Position Color": "#f44336",
+            "Middle Position Color": "#4caf50",
+            "Outside Position Color": "#03a9f4",
+            "Inside Position": 40,
+            "Middle Position": 60,
+            "Outside Position": 80
+        },
+        "Conical Gradient Settings": {
+            "Start Position Color": "#f44336",
+            "Quarter Position Color": "#4caf50",
+            "Middle Position Color": "#03a9f4",
+            "End Position Color": "#ffeb3b"
+        },
         "Main Color": "#ff4500",
         "Line Position": 0,
         "Line Width": 1,
-        "Max Range": 50,
+        "Max Range": 80,
         "Data Length": 0,
         "Channel": 2,
         "Reverse": false,
@@ -126,9 +196,107 @@ AdvpStyleTemplate {
     preference: AdvpPreference {
         version: defaultValues["Version"]
 
+        P.SelectPreference {
+            id: _cfg_gradient_style
+            name: "Gradient Style"
+            label: qsTr("Gradient Style")
+            defaultValue: defaultValues["Gradient Style"]
+            model: [qsTr("None"), qsTr("Radial Gradient"), qsTr("Conical Gradient")]
+        }
+
+        P.DialogPreference {
+            name: "Radial Gradient Settings"
+            label: qsTr("Radial Gradient Settings")
+            live: true
+            visible: _cfg_gradient_style.value===1
+
+            P.ColorPreference {
+                name: "Inside Position Color"
+                label: qsTr("Inside Position Color")
+                defaultValue: defaultValues["Radial Gradient Settings"]["Inside Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Middle Position Color"
+                label: qsTr("Middle Position Color")
+                defaultValue: defaultValues["Radial Gradient Settings"]["Middle Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Outside Position Color"
+                label: qsTr("Outside Position Color")
+                defaultValue: defaultValues["Radial Gradient Settings"]["Outside Position Color"]
+            }
+
+            P.SliderPreference {
+                id: _cfg_gradient_settings_inside_position
+                name: "Inside Position"
+                label: qsTr("Inside Position")
+                from: 0
+                to: 75
+                stepSize: 1
+                defaultValue: defaultValues["Radial Gradient Settings"]["Inside Position"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                id: _cfg_gradient_settings_middle_position
+                name: "Middle Position"
+                label: qsTr("Middle Position")
+                from: _cfg_gradient_settings_inside_position.value + 1
+                to: 90
+                stepSize: 1
+                defaultValue: defaultValues["Radial Gradient Settings"]["Middle Position"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "Outside Position"
+                label: qsTr("Outside Position")
+                from: _cfg_gradient_settings_middle_position.value + 1
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Radial Gradient Settings"]["Outside Position"]
+                displayValue: value + "%"
+            }
+
+        }
+
+        P.DialogPreference {
+            name: "Conical Gradient Settings"
+            label: qsTr("Conical Gradient Settings")
+            live: true
+            visible: _cfg_gradient_style.value===2
+
+            P.ColorPreference {
+                name: "Start Position Color"
+                label: qsTr("Start Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["Start Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Quarter Position Color"
+                label: qsTr("Quarter Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["Quarter Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Middle Position Color"
+                label: qsTr("Middle Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["Middle Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "End Position Color"
+                label: qsTr("End Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["End Position Color"]
+            }
+        }
+
         P.ColorPreference {
             name: "Main Color"
             label: qsTr("Spectrum Line Color")
+            visible: !_cfg_gradient_style.value
             defaultValue: defaultValues["Main Color"]
         }
 
@@ -179,8 +347,6 @@ AdvpStyleTemplate {
             defaultValue: defaultValues["Channel"]
         }
 
-        P.Separator {}
-
         P.SwitchPreference {
             name: "Reverse"
             label: qsTr("Reverse Spectrum")
diff --git a/styles/Preset_gradient_line/Style.qml b/styles/Preset_gradient_line/Style.qml
deleted file mode 100644
index b2e325f..0000000
--- a/styles/Preset_gradient_line/Style.qml
+++ /dev/null
@@ -1,310 +0,0 @@
-import QtQuick 2.12
-import QtGraphicalEffects 1.12
-import NERvGear.Preferences 1.0 as P
-
-import "../../qml/api"
-
-AdvpStyleTemplate {
-    style: Rectangle {
-        width: widget.width;
-        height: widget.height;
-
-        LinearGradient {
-            id: gradient_mask
-            anchors.fill: parent
-            gradient: Gradient {
-                GradientStop { id: p_start;  position: 0.0 }
-                GradientStop { id: p_middle;  position: 0.5 }
-                GradientStop { id: p_end; position: 1.0 }
-            }
-        }
-
-        layer.enabled: true
-        layer.effect: OpacityMask{
-            maskSource: AdvpCanvasTemplate {
-                readonly property var audioData: new Array(128)
-
-                readonly property bool centerLineFlag: configs["Center Line"]
-                readonly property int linePosition: configs["Line Position"]
-                readonly property int uDataLen: Math.pow(2, configs["Data Length"]);
-                readonly property int dataLength: 64/uDataLen
-                readonly property int channel: configs["Channel"]
-                readonly property bool centerRotateFlag: configs["Rotate Settings"]["Center Enable"]
-                readonly property real centerRotateAngle: configs["Rotate Settings"]["Center Angle"]*Math.PI/180
-                readonly property bool lineRotateFlag: configs["Rotate Settings"]["Line Enable"]
-                readonly property real lineRotateAngle: configs["Rotate Settings"]["Line Angle"]*Math.PI/180
-                readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
-                readonly property real amplitude: 400.0/configs["Data Settings"]["Amplitude"]
-                readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
-
-                property real halfWidth: width/2
-                property real halfHeight: height/2
-
-                readonly property int l_start: (channel===1)*dataLength
-                readonly property int r_stop: dataLength+dataLength*(channel!==0)
-
-                readonly property int total: r_stop-l_start
-                readonly property real _y_dy: centerRotateFlag*Math.tan(centerRotateAngle)*halfWidth
-                readonly property real _ux: width/(r_stop-l_start)
-                readonly property real _dx: Math.round(_ux/2)
-
-                onConfigsUpdated: {
-                    context.fillStyle = "black";
-                    gradient_mask.start = Qt.point(0, height*(configs["Gradient Direction"]===2))
-                    gradient_mask.end = Qt.point(width*(configs["Gradient Direction"]!==1), height*(configs["Gradient Direction"]%2))
-                    p_start.color = configs["Start Position Color"];
-                    p_middle.color = configs["Middle Position Color"];
-                    p_end.color = configs["End Position Color"];
-                }
-
-                onAudioDataUpdeted: {
-                    let normalizing_ratio = autoNormalizing ? data[128] : amplitude;
-                    if (unitStyle) {
-                        //对数化显示
-                        for(let i=l_start; i<dataLength; i++) {
-                            audioData[i] = 0;
-                            for(let j=0; j<uDataLen; j++) {
-                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[63-i*uDataLen-j]/normalizing_ratio)) + 1.0);
-                            }
-                            audioData[i] /= uDataLen;
-                        }
-                        for(let i=dataLength; i<r_stop; i++) {
-                            audioData[i] = 0;
-                            for(let j=0; j<uDataLen; j++) {
-                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
-                            }
-                            audioData[i] /= uDataLen;
-                        }
-                    } else {
-                        //线性化显示
-                        for(let i=l_start; i<dataLength; i++) {
-                            audioData[i] = 0;
-                            for(let j=0; j<uDataLen; j++) {
-                                audioData[i] += data[63-i*uDataLen-j];
-                            }
-                            audioData[i] /= (uDataLen * normalizing_ratio);
-                        }
-                        for(let i=dataLength; i<r_stop; i++) {
-                            audioData[i] = 0;
-                            for(let j=0; j<uDataLen; j++) {
-                                audioData[i] += data[i*uDataLen+j];
-                            }
-                            audioData[i] /= (uDataLen * normalizing_ratio);
-                        }
-                    }
-
-                    context.clearRect(0, 0, width+32, height+32);
-
-                    let _y;
-                    let _dy;
-                    //绘制频谱
-                    if(lineRotateFlag || centerRotateFlag) {
-                        context.transform(1, Math.sin(centerRotateFlag*centerRotateAngle), -Math.sin(lineRotateFlag*lineRotateAngle), 1, Math.sin(lineRotateFlag*lineRotateAngle)*(halfHeight-_y_dy), 0);
-                        for (let i=l_start; i<r_stop; i++) {
-                            _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
-                            _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
-                            context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
-                        }
-                        if (centerLineFlag) {
-                            context.fillRect(0, halfHeight-_y_dy, width, 2);
-                        }
-                        context.resetTransform();
-                    } else if (linePosition) {
-                        let _flag = 1-2*(linePosition===1);
-                        _y = halfHeight + halfHeight*(3-2*linePosition)*Boolean(linePosition);
-                        for (let i=l_start; i<r_stop; i++) {
-                            _dy = height*audioData[i]*_flag;
-                            context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
-                        }
-                        if (centerLineFlag) {
-                            context.fillRect(0, _y-(2-linePosition)*2, width, 2);
-                        }
-                    } else {
-                        for (let i=l_start; i<r_stop; i++) {
-                            _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
-                            _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
-                            context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
-                        }
-                        if (centerLineFlag) {
-                            context.fillRect(0, halfHeight-_y_dy, width, 2);
-                        }
-                    }
-
-                    context.fill();
-                    requestPaint();
-                }
-
-                Component.onCompleted: {
-                    for (let i = 0; i < 128; i++) {
-                        audioData[i] = 0;
-                    }
-                }
-            }
-        }
-    }
-
-    defaultValues: {
-        "Version": "1.2.0",
-        "Gradient Direction": 0,
-        "Start Position Color": "#f44336",
-        "Middle Position Color": "#4caf50",
-        "End Position Color": "#03a9f4",
-        "Center Line": true,
-        "Line Position": 0,
-        "Data Length": 0,
-        "Channel": 2,
-        "Rotate Settings": {
-            "Center Enable": false,
-            "Center Angle": 10,
-            "Line Enable": false,
-            "Line Angle": 10
-        },
-        "Data Settings": {
-            "Auto Normalizing": true,
-            "Amplitude": 10,
-            "Unit Style": 0
-        }
-    }
-
-    preference: AdvpPreference {
-        version: defaultValues["Version"]
-
-        P.SelectPreference {
-            name: "Gradient Direction"
-            label: qsTr("Gradient Direction")
-            defaultValue: defaultValues["Gradient Direction"]
-            model: [qsTr("Horizontal"), qsTr("Vertical"), qsTr("Oblique Upward"), qsTr("Oblique downward")]
-        }
-
-        P.ColorPreference {
-            name: "Start Position Color"
-            label: qsTr("Start Position Color")
-            defaultValue: defaultValues["Start Position Color"]
-        }
-
-        P.ColorPreference {
-            name: "Middle Position Color"
-            label: qsTr("Middle Position Color")
-            defaultValue: defaultValues["Middle Position Color"]
-        }
-
-        P.ColorPreference {
-            name: "End Position Color"
-            label: qsTr("End Position Color")
-            defaultValue: defaultValues["End Position Color"]
-        }
-
-        P.Separator {}
-
-        P.SwitchPreference {
-            name: "Center Line"
-            label: qsTr("Show Center Line")
-            defaultValue: defaultValues["Center Line"]
-        }
-
-        P.SelectPreference {
-            name: "Line Position"
-            label: qsTr("Spectrum Line Position")
-            defaultValue: defaultValues["Line Position"]
-            model: [qsTr("Both"), qsTr("Up"), qsTr("Down")]
-        }
-
-        P.SelectPreference {
-            name: "Data Length"
-            label: qsTr("Spectrum Length")
-            defaultValue: defaultValues["Data Length"]
-            model: [64, 32, 16, 8]
-        }
-
-        P.SelectPreference {
-            name: "Channel"
-            label: qsTr("Channel")
-            defaultValue: defaultValues["Channel"]
-            model: [qsTr("Left Channel"), qsTr("Right Channel"), qsTr("Stereo")]
-        }
-
-        P.Separator {}
-
-        P.DialogPreference {
-            name: "Rotate Settings"
-            label: qsTr("Rotate Settings")
-            live: true
-            icon.name: "regular:\uf1de"
-
-            P.SwitchPreference {
-                id: _cfg_preset_line_Rotate_Center_Enable
-                name: "Center Enable"
-                label: qsTr("Rotate Center Line")
-                defaultValue: defaultValues["Rotate Settings"]["Center Enable"]
-            }
-
-            P.SliderPreference {
-                name: "Center Angle"
-                label: qsTr("Angle of Center Line")
-                enabled: _cfg_preset_line_Rotate_Center_Enable.value
-                from: -45
-                to: 45
-                stepSize: 1
-                defaultValue: defaultValues["Rotate Settings"]["Center Angle"]
-                displayValue: value + "°"
-            }
-
-            P.Separator {}
-
-            P.SwitchPreference {
-                id: _cfg_preset_line_Rotate_Line_Enable
-                name: "Line Enable"
-                label: qsTr("Rotate Spectrum Line")
-                defaultValue: defaultValues["Rotate Settings"]["Line Enable"]
-            }
-
-            P.SliderPreference {
-                name: "Line Angle"
-                label: qsTr("Angle of Spectrum Line")
-                enabled: _cfg_preset_line_Rotate_Line_Enable.value
-                from: -75
-                to: 75
-                stepSize: 1
-                defaultValue: defaultValues["Rotate Settings"]["Line Angle"]
-                displayValue: value + "°"
-            }
-        }
-
-        P.Separator {}
-
-        P.DialogPreference {
-            name: "Data Settings"
-            label: qsTr("Data Settings")
-            live: true
-            icon.name: "regular:\uf1de"
-
-            P.SwitchPreference {
-                id: _cfg_preset_line_dataSettings_autoNormalizing
-                name: "Auto Normalizing"
-                label: qsTr("Auto Normalizing")
-                defaultValue: defaultValues["Data Settings"]["Auto Normalizing"]
-            }
-
-            P.SpinPreference {
-                name: "Amplitude"
-                label: qsTr("Amplitude Ratio")
-                enabled: !_cfg_preset_line_dataSettings_autoNormalizing.value
-                message: "1 to 100"
-                display: P.TextFieldPreference.ExpandLabel
-                editable: true
-                from: 1
-                to: 100
-                defaultValue: defaultValues["Data Settings"]["Amplitude"]
-            }
-
-            P.Separator {}
-
-            P.SelectPreference {
-                name: "Unit Style"
-                label: qsTr("Display Style")
-                defaultValue: defaultValues["Data Settings"]["Unit Style"]
-                model: [qsTr("Linear"), qsTr("Decibel")]
-            }
-        }
-    }
-}
diff --git a/styles/Preset_line/Style.qml b/styles/Preset_line/Style.qml
index 5180619..86bf86b 100644
--- a/styles/Preset_line/Style.qml
+++ b/styles/Preset_line/Style.qml
@@ -1,140 +1,288 @@
-import QtQuick 2.12
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 import NERvGear.Preferences 1.0 as P
 
 import "../../qml/api"
 
 AdvpStyleTemplate {
-    style: AdvpCanvasTemplate {
-        readonly property var audioData: new Array(128)
-
-        readonly property bool centerLineFlag: configs["Center Line"]
-        readonly property string center_color: configs["Center Color"]
-        readonly property string line_color: configs["Line Color"]
-        readonly property int linePosition: configs["Line Position"]
-        readonly property int uDataLen: Math.pow(2, configs["Data Length"]);
-        readonly property int dataLength: 64/uDataLen
-        readonly property int channel: configs["Channel"]
-        readonly property bool centerRotateFlag: configs["Rotate Settings"]["Center Enable"]
-        readonly property real centerRotateAngle: configs["Rotate Settings"]["Center Angle"]*Math.PI/180
-        readonly property bool lineRotateFlag: configs["Rotate Settings"]["Line Enable"]
-        readonly property real lineRotateAngle: configs["Rotate Settings"]["Line Angle"]*Math.PI/180
-        readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
-        readonly property real amplitude: 400.0/configs["Data Settings"]["Amplitude"]
-        readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
-
-        property real halfWidth: width/2
-        property real halfHeight: height/2
-
-        readonly property int l_start: (channel===1)*dataLength
-        readonly property int r_stop: dataLength+dataLength*(channel!==0)
-        readonly property int total: r_stop-l_start
-        readonly property real _y_dy: centerRotateFlag*Math.tan(centerRotateAngle)*halfWidth
-        readonly property real _ux: width/(r_stop-l_start)
-        readonly property real _dx: Math.round(_ux/2)
-
-        onAudioDataUpdeted: {
-            let normalizing_ratio = autoNormalizing ? data[128] : amplitude;
-            if (unitStyle) {
-                //对数化显示
-                for(let i=l_start; i<dataLength; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += Math.max(0, 0.4 * (Math.log10(data[63-i*uDataLen-j]/normalizing_ratio)) + 1.0);
+    style: Rectangle {
+        id: main
+        width: widget.width;
+        height: widget.height;
+
+        property bool gradientEnable
+        property bool centerLineFlag
+        property string center_color
+        property real center_width
+        property int linePosition
+        property bool vertical_flag
+        property real _y_dy
+
+        LinearGradient {
+            id: gradient_mask
+            anchors.fill: parent
+            visible: gradientEnable
+            gradient: Gradient {
+                GradientStop { id: p_start;  position: 0.0 }
+                GradientStop { id: p_middle;  position: 0.5 }
+                GradientStop { id: p_end; position: 1.0 }
+            }
+        }
+
+        Canvas {
+            id: centerLine
+            anchors.fill: parent
+            contextType: "2d"
+            renderTarget: Canvas.FramebufferObject
+            renderStrategy: Canvas.Cooperative
+            visible: centerLineFlag && !gradientEnable
+            onPaint: {
+                context.clearRect(0, 0, width+32, height+32);
+                context.fillStyle = center_color;
+                if (vertical_flag) {
+                    if (linePosition) {
+                        let _y = width/2 + width/2*(3-2*linePosition)*Boolean(linePosition);
+                        context.fillRect(_y+(linePosition-2)*center_width, 0, center_width, height);
+                    } else {
+                        context.fillRect(width/2-_y_dy-center_width/2, 0, center_width, width);
                     }
-                    audioData[i] /= uDataLen;
-                }
-                for(let i=dataLength; i<r_stop; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
+                } else {
+                    if (linePosition) {
+                        let _y = height/2 + height/2*(3-2*linePosition)*Boolean(linePosition);
+                        context.fillRect(0, _y+(linePosition-2)*center_width, width, center_width);
+                    } else {
+                        context.fillRect(0, height/2-_y_dy-center_width/2, width, center_width);
                     }
-                    audioData[i] /= uDataLen;
                 }
-            } else {
-                //线性化显示
-                for(let i=l_start; i<dataLength; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += data[63-i*uDataLen-j];
+            }
+        }
+
+        layer.enabled: true
+        layer.effect: OpacityMask{
+            maskSource: AdvpCanvasTemplate {
+                readonly property var audioData: new Array(128)
+
+                readonly property string line_color: configs["Line Color"]
+                readonly property int uDataLen: Math.pow(2, configs["Data Length"]);
+                readonly property int dataLength: 64/uDataLen
+                readonly property int channel: configs["Channel"]
+                readonly property bool centerRotateFlag: configs["Rotate Settings"]["Center Enable"]
+                readonly property real centerRotateAngleTangent: centerRotateFlag*Math.tan(configs["Rotate Settings"]["Center Angle"]*Math.PI/180)
+                readonly property bool lineRotateFlag: configs["Rotate Settings"]["Line Enable"]
+                readonly property real lineRotateAngleTangent: lineRotateFlag*Math.tan(configs["Rotate Settings"]["Line Angle"]*Math.PI/180)
+                readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
+                readonly property real amplitude: 400.0/configs["Data Settings"]["Amplitude"]
+                readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
+
+                readonly property real xOffset: configs["Rotate Settings"]["X Offset"]/100
+                readonly property real yOffset: configs["Rotate Settings"]["Y Offset"]/100
+                readonly property real xScale: configs["Rotate Settings"]["X Scale"]/100
+                readonly property real yScale: configs["Rotate Settings"]["Y Scale"]/100
+
+                readonly property real halfWidth: vertical_flag ? height/2 : width/2
+                readonly property real halfHeight: vertical_flag ? width/2 : height/2
+
+                readonly property int l_start: (channel===1)*dataLength
+                readonly property int r_stop: dataLength+dataLength*(channel!==0)
+                readonly property int total: r_stop-l_start
+                readonly property real _ux: halfWidth*2/(r_stop-l_start)
+                readonly property real _dx: Math.round(_ux/2)
+
+                onWidthChanged: {
+                    if (gradientEnable) {
+                        gradient_mask.end = Qt.point(width*(configs["Gradient Direction"]!==1), height*(configs["Gradient Direction"]%2));
                     }
-                    audioData[i] /= (uDataLen * normalizing_ratio);
+                    centerLine.requestPaint();
                 }
-                for(let i=dataLength; i<r_stop; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += data[i*uDataLen+j];
+
+                onHeightChanged: {
+                    if (gradientEnable) {
+                        gradient_mask.start = Qt.point(0, height*(configs["Gradient Direction"]===2));
+                        gradient_mask.end = Qt.point(width*(configs["Gradient Direction"]!==1), height*(configs["Gradient Direction"]%2));
                     }
-                    audioData[i] /= (uDataLen * normalizing_ratio);
+                    centerLine.requestPaint();
                 }
-            }
 
-            context.clearRect(0, 0, width+32, height+32);
-
-            let _y;
-            let _dy;
-            //绘制频谱
-            if(lineRotateFlag || centerRotateFlag) {
-                context.transform(1, Math.sin(centerRotateFlag*centerRotateAngle), -Math.sin(lineRotateFlag*lineRotateAngle), 1, Math.sin(lineRotateFlag*lineRotateAngle)*(halfHeight-_y_dy), 0);
-                context.fillStyle = line_color;
-                for (let i=l_start; i<r_stop; i++) {
-                    _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
-                    _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
-                    context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
-                }
-                if (centerLineFlag) {
-                    context.fillStyle = center_color;
-                    context.fillRect(0, halfHeight-_y_dy, width, 2);
-                }
-                context.resetTransform();
-            } else if (linePosition) {
-                let _flag = 1-2*(linePosition===1);
-                _y = halfHeight + halfHeight*(3-2*linePosition)*Boolean(linePosition);
-                context.fillStyle = line_color;
-                for (let i=l_start; i<r_stop; i++) {
-                    _dy = height*audioData[i]*_flag;
-                    context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
-                }
-                if (centerLineFlag) {
-                    context.fillStyle = center_color;
-                    context.fillRect(0, _y-(2-linePosition)*2, width, 2);
-                }
-            } else {
-                context.fillStyle = line_color;
-                for (let i=l_start; i<r_stop; i++) {
-                    _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
-                    _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
-                    context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                onConfigsUpdated: {
+                    //尽量不要使用绑定configs的属性以免造成竞争，若一定要使用推荐使用Qt.callLater(()=>{})
+                    centerLineFlag = configs["Center Line"];
+                    center_color = configs["Center Color"];
+                    center_width = configs["Center Width"]/10;
+                    linePosition = configs["Line Position"];
+                    vertical_flag = configs["Direction"];
+                    gradientEnable = configs["Enable Gradient"];
+                    context.lineWidth = configs["Line Width"];
+                    main.color = configs["Line Color"];
+                    _y_dy = configs["Rotate Settings"]["Center Enable"]*Math.tan(configs["Rotate Settings"]["Center Angle"]*Math.PI/180)*(vertical_flag ? height/2 : width/2);
+                    if (gradientEnable) {
+                        gradient_mask.start = Qt.point(0, height*(configs["Gradient Direction"]===2));
+                        gradient_mask.end = Qt.point(width*(configs["Gradient Direction"]!==1), height*(configs["Gradient Direction"]%2));
+                        p_start.color = configs["Start Position Color"];
+                        p_middle.color = configs["Middle Position Color"];
+                        p_end.color = configs["End Position Color"];
+                    }
+                    centerLine.requestPaint();
                 }
-                if (centerLineFlag) {
-                    context.fillStyle = center_color;
-                    context.fillRect(0, halfHeight-_y_dy, width, 2);
+
+                onAudioDataUpdeted: {
+                    let normalizing_ratio = autoNormalizing ? data[128] : amplitude;
+                    if (unitStyle) {
+                        //对数化显示
+                        for(let i=l_start; i<dataLength; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[63-i*uDataLen-j]/normalizing_ratio)) + 1.0);
+                            }
+                            audioData[i] /= uDataLen;
+                        }
+                        for(let i=dataLength; i<r_stop; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
+                            }
+                            audioData[i] /= uDataLen;
+                        }
+                    } else {
+                        //线性化显示
+                        for(let i=l_start; i<dataLength; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += data[63-i*uDataLen-j];
+                            }
+                            audioData[i] /= (uDataLen * normalizing_ratio);
+                        }
+                        for(let i=dataLength; i<r_stop; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += data[i*uDataLen+j];
+                            }
+                            audioData[i] /= (uDataLen * normalizing_ratio);
+                        }
+                    }
+
+                    context.clearRect(0, 0, width+32, height+32);
+
+                    let _y;
+                    let _dy;
+                    if (vertical_flag) {
+                        if(lineRotateFlag || centerRotateFlag) {
+                            context.transform(yScale, lineRotateAngleTangent, -centerRotateAngleTangent, xScale, 2*_y_dy+yOffset*height, xOffset*width-lineRotateAngleTangent*(halfHeight-_y_dy));
+                            context.fillStyle = line_color;
+                            for (let i=l_start; i<r_stop; i++) {
+                                _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                                _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                                context.fillRect(_y, _ux * (i-l_start), _dy, _dx);
+                            }
+                            if (centerLineFlag) {
+                                context.fillRect(halfHeight-_y_dy-center_width/2, 0, center_width, height);
+                            }
+                            context.resetTransform();
+                        } else if (linePosition) {
+                            let _flag = 1-2*(linePosition===1);
+                            _y = halfHeight + halfHeight*(3-2*linePosition)*Boolean(linePosition);
+                            context.fillStyle = line_color;
+                            for (let i=l_start; i<r_stop; i++) {
+                                _dy = width*audioData[i]*_flag;
+                                context.fillRect(_y, _ux * (i-l_start), _dy, _dx);
+                            }
+                            if (centerLineFlag) {
+                                context.fillRect(_y+(linePosition-2)*center_width, 0, center_width, height);
+                            }
+                        } else {
+                            context.fillStyle = line_color;
+                            for (let i=l_start; i<r_stop; i++) {
+                                _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                                _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                                context.fillRect(_y, _ux * (i-l_start), _dy, _dx);
+                            }
+                            if (centerLineFlag) {
+                                context.fillRect(halfHeight-_y_dy-center_width/2, 0, center_width, height);
+                            }
+                        }
+                    } else {
+                        //绘制频谱
+                        if(lineRotateFlag || centerRotateFlag) {
+                            context.transform(xScale, centerRotateAngleTangent, -lineRotateAngleTangent, yScale, xOffset*width+lineRotateAngleTangent*(halfHeight-_y_dy), yOffset*height);
+                            context.fillStyle = line_color;
+                            for (let i=l_start; i<r_stop; i++) {
+                                _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                                _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                                context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                            }
+                            if (centerLineFlag) {
+                                context.fillRect(0, halfHeight-_y_dy-center_width/2, width, center_width);
+                            }
+                            context.resetTransform();
+                        } else if (linePosition) {
+                            let _flag = 1-2*(linePosition===1);
+                            _y = halfHeight + halfHeight*(3-2*linePosition)*Boolean(linePosition);
+                            context.fillStyle = line_color;
+                            for (let i=l_start; i<r_stop; i++) {
+                                _dy = height*audioData[i]*_flag;
+                                context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                            }
+                            if (centerLineFlag) {
+                                context.fillRect(0, _y+(linePosition-2)*center_width, width, center_width);
+                            }
+                        } else {
+                            context.fillStyle = line_color;
+                            for (let i=l_start; i<r_stop; i++) {
+                                _y = halfHeight*(1-(linePosition!==2)*audioData[i])-_y_dy;
+                                _dy = (halfHeight + (!linePosition)*halfHeight)*audioData[i];
+                                context.fillRect(_ux * (i-l_start), _y, _dx, _dy);
+                            }
+                            if (centerLineFlag) {
+                                context.fillRect(0, halfHeight-_y_dy-center_width/2, width, center_width);
+                            }
+                        }
+                    }
+                    context.fill();
+                    requestPaint();
                 }
-            }
 
-            context.fill();
-            requestPaint();
-        }
+                onCompleted: {
+                    for (let i = 0; i < 128; i++) {
+                        audioData[i] = 0;
+                    }
+                }
 
-        Component.onCompleted: {
-            for (let i = 0; i < 128; i++) {
-                audioData[i] = 0;
+                onVersionUpdated: {
+                    if (widget.settings.current_style === "nvg://advp.widget.mashiros.top/advp-style-preset/gradient_line") {
+                        widget.settings.current_style = "nvg://advp.widget.mashiros.top/advp-style-preset/line";
+                        widget.settings[widget.settings.current_style] = updateObject(widget.settings["nvg://advp.widget.mashiros.top/advp-style-preset/gradient_line"], widget.settings[widget.settings.current_style]);
+                        widget.settings[widget.settings.current_style]["Enable Gradient"] = true;
+                    }
+                    delete widget.settings[widget.settings.current_style]["Version"];
+                    widget.settings[widget.settings.current_style] = updateObject(defaultValues, widget.settings[widget.settings.current_style]);
+                }
             }
         }
     }
 
     defaultValues: {
-        "Version": "1.2.0",
+        "Version": "1.3.0",
+        "Enable Gradient": false,
+        "Gradient Direction": 0,
+        "Start Position Color": "#f44336",
+        "Middle Position Color": "#4caf50",
+        "End Position Color": "#03a9f4",
         "Center Line": true,
         "Center Color": "#ff4500",
+        "Center Width": 20,
         "Line Color": "#ff4500",
         "Line Position": 0,
         "Data Length": 0,
         "Channel": 2,
+        "Direction": 0,
         "Rotate Settings": {
             "Center Enable": false,
             "Center Angle": 10,
             "Line Enable": false,
-            "Line Angle": 10
+            "Line Angle": 10,
+            "X Scale": 100,
+            "Y Scale": 100,
+            "X Offset": 0,
+            "Y Offset": 0
         },
         "Data Settings": {
             "Auto Normalizing": true,
@@ -147,6 +295,44 @@ AdvpStyleTemplate {
         version: defaultValues["Version"]
 
         P.SwitchPreference {
+            id: _cfg_enable_gradient
+            name: "Enable Gradient"
+            label: qsTr("Enable Gradient")
+            defaultValue: defaultValues["Enable Gradient"]
+        }
+
+        P.SelectPreference {
+            name: "Gradient Direction"
+            label: qsTr("Gradient Direction")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["Gradient Direction"]
+            model: [qsTr("Horizontal"), qsTr("Vertical"), qsTr("Oblique Upward"), qsTr("Oblique downward")]
+        }
+
+        P.ColorPreference {
+            name: "Start Position Color"
+            label: qsTr("Start Position Color")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["Start Position Color"]
+        }
+
+        P.ColorPreference {
+            name: "Middle Position Color"
+            label: qsTr("Middle Position Color")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["Middle Position Color"]
+        }
+
+        P.ColorPreference {
+            name: "End Position Color"
+            label: qsTr("End Position Color")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["End Position Color"]
+        }
+
+        P.Separator {}
+
+        P.SwitchPreference {
             id: _cfg_preset_line_Center_Line
             name: "Center Line"
             label: qsTr("Show Center Line")
@@ -156,15 +342,35 @@ AdvpStyleTemplate {
         P.ColorPreference {
             name: "Center Color"
             label: qsTr("Center Line Color")
-            enabled: _cfg_preset_line_Center_Line.value
+            visible: !_cfg_enable_gradient.value && _cfg_preset_line_Center_Line.value
             defaultValue: defaultValues["Center Color"]
         }
 
+        P.SliderPreference {
+            name: "Center Width"
+            label: qsTr("Center Line Width")
+            visible: _cfg_preset_line_Center_Line.value
+            from: 1
+            to: 100
+            stepSize: 1
+            defaultValue: defaultValues["Center Width"]
+            displayValue: value + "%"
+        }
+
         P.Separator {}
 
+        P.SelectPreference {
+            id: _cfg_direction
+            name: "Direction"
+            label: qsTr("Direction")
+            defaultValue: defaultValues["Direction"]
+            model: [qsTr("Horizontal"), qsTr("Vertical")]
+        }
+
         P.ColorPreference {
             name: "Line Color"
             label: qsTr("Spectrum Line Color")
+            visible: !_cfg_enable_gradient.value
             defaultValue: defaultValues["Line Color"]
         }
 
@@ -172,7 +378,7 @@ AdvpStyleTemplate {
             name: "Line Position"
             label: qsTr("Spectrum Line Position")
             defaultValue: defaultValues["Line Position"]
-            model: [qsTr("Both"), qsTr("Up"), qsTr("Down")]
+            model: [qsTr("Both"), [qsTr("Up"), qsTr("Left")][_cfg_direction.value], [qsTr("Down"), qsTr("Right")][_cfg_direction.value]]
         }
 
         P.SelectPreference {
@@ -228,12 +434,58 @@ AdvpStyleTemplate {
                 name: "Line Angle"
                 label: qsTr("Angle of Spectrum Line")
                 enabled: _cfg_preset_line_Rotate_Line_Enable.value
-                from: -75
-                to: 75
+                from: -45
+                to: 45
                 stepSize: 1
                 defaultValue: defaultValues["Rotate Settings"]["Line Angle"]
                 displayValue: value + "°"
             }
+
+            P.Separator {}
+
+            P.SliderPreference {
+                name: "X Scale"
+                label: qsTr("Scale of Center Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: 1
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["X Scale"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "Y Scale"
+                label: qsTr("Scale of Spectrum Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: 1
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["Y Scale"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "X Offset"
+                label: qsTr("Offset of Center Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: -100
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["X Offset"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "Y Offset"
+                label: qsTr("Offset of Spectrum Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: -100
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["Y Offset"]
+                displayValue: value + "%"
+            }
         }
 
         P.Separator {}
diff --git a/styles/Preset_solidcircle/Style.qml b/styles/Preset_solidcircle/Style.qml
index 2396004..069825e 100644
--- a/styles/Preset_solidcircle/Style.qml
+++ b/styles/Preset_solidcircle/Style.qml
@@ -1,131 +1,201 @@
 import QtQuick 2.12
+import QtGraphicalEffects 1.12
 import NERvGear.Preferences 1.0 as P
 
 import "../../qml/api"
 
 AdvpStyleTemplate {
-    style: AdvpCanvasTemplate {
-        readonly property var audioData: new Array(128)
-
-        //configs
-        readonly property int linePosition: configs["Line Position"]
-        readonly property real maxRange: configs["Max Range"] / 100
-        readonly property int uDataLen: Math.pow(2, configs["Data Length"])
-        readonly property int dataLength: 64/uDataLen
-        readonly property int channel: configs["Channel"]
-        readonly property bool reverse: configs["Reverse"]
-        readonly property bool rotateFlag: configs["Rotate"]
-        readonly property real rSpeed: configs["Ratate Speed"] / 100
-        readonly property real angle: configs["Angle"]
-        readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
-        readonly property real amplitude: 400/configs["Data Settings"]["Amplitude"]
-        readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
-
-        readonly property int total: channel*dataLength
-
-        readonly property real dotGap: 360/total
-        property real offsetAngle: 0
-        property var outerPos: []
-        property var innerPos: []
-        readonly property real degUnit: Math.PI/180
-
-        readonly property real subRatio: 0.2*maxRange
-        readonly property real mainRatio: 1-subRatio*2.5
-
-        readonly property real minLength: Math.min(width, height)
-        readonly property real ratio:minLength*subRatio
-        readonly property real halfWidth: width/2
-        readonly property real halfHeight: height/2
-        readonly property real halfMinLength: minLength/2
-
-
-        onConfigsUpdated: {
-            context.lineWidth = configs["Line Width"];
-            context.strokeStyle = configs["Main Color"];
+    style: Rectangle {
+        id: main
+        width: widget.width;
+        height: widget.height;
+
+        property int gradientStyle
+
+        RadialGradient {
+            id: radialGradient
+            anchors.fill: parent
+            visible: gradientStyle===1
+            horizontalRadius: Math.min(width, height)/2
+            verticalRadius: horizontalRadius
+            gradient: Gradient {
+                GradientStop {id: radialGradient_pstart}
+                GradientStop {id: radialGradient_pmiddle}
+                GradientStop {id: radialGradient_pend}
+            }
         }
 
-        function createPoint() {
-            outerPos.length = 0;
-            innerPos.length = 0;
-            let deg, deltaR, r1, r2, _rhmLen;
-            _rhmLen = mainRatio*halfMinLength;
-
-            for (let j=0; j < channel; j++) {
-                for (let i=0; i < dataLength; i++) {
-                    deg = degUnit*((i+j*dataLength)*dotGap + offsetAngle);
-                    deltaR = audioData[reverse*(dataLength-i-1)+(!reverse)*(i+j*dataLength)] * ratio;
-                    r1 = _rhmLen+1+deltaR*(linePosition!==2);
-                    r2 = _rhmLen-1-deltaR*(linePosition!==1);
-                    outerPos.push([halfWidth+Math.cos(deg)*r1,halfHeight+Math.sin(deg)*r1]);
-                    innerPos.push([halfWidth+Math.cos(deg)*r2,halfHeight+Math.sin(deg)*r2]);
-                }
+        ConicalGradient {
+            id: conicalGradient
+            anchors.fill: parent
+            visible: gradientStyle===2
+            angle: -90;
+            gradient: Gradient {
+                GradientStop{id: conicalGradient_pstart; position: 0.0}
+                GradientStop{id: conicalGradient_pquarter; position: 0.25}
+                GradientStop {id: conicalGradient_phalf; position: 0.5}
+                GradientStop {id: conicalGradient_p3quarter; position: 0.75}
+                GradientStop{id: conicalGradient_pend; position: 1.0}
             }
-            offsetAngle = rotateFlag ? ((offsetAngle + rSpeed) % 360) : angle;
         }
 
-        onAudioDataUpdeted: {
-            let normalizing_ratio = autoNormalizing ? data[128] : amplitude;
-            if (unitStyle) {
-                //对数化显示
-                for(let i=0; i<total; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
+        layer.enabled: true
+        layer.effect: OpacityMask{
+            maskSource: AdvpCanvasTemplate {
+                readonly property var audioData: new Array(128)
+
+                //configs
+                readonly property int linePosition: configs["Line Position"]
+                readonly property real maxRange: configs["Max Range"] / 100
+                readonly property int uDataLen: Math.pow(2, configs["Data Length"])
+                readonly property int dataLength: 64/uDataLen
+                readonly property int channel: configs["Channel"]
+                readonly property bool reverse: configs["Reverse"]
+                readonly property bool rotateFlag: configs["Rotate"]
+                readonly property real rSpeed: configs["Ratate Speed"] / 100
+                readonly property real angle: configs["Angle"]
+                readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
+                readonly property real amplitude: 400/configs["Data Settings"]["Amplitude"]
+                readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
+
+                readonly property int total: channel*dataLength
+
+                readonly property real dotGap: 360/total
+                property real offsetAngle: 0
+                property var outerPos: []
+                property var innerPos: []
+                readonly property real degUnit: Math.PI/180
+
+                readonly property real subRatio: 0.2*maxRange
+                readonly property real mainRatio: 1-subRatio*2.5
+
+                readonly property real minLength: Math.min(width, height)
+                readonly property real ratio:minLength*subRatio
+                readonly property real halfWidth: width/2
+                readonly property real halfHeight: height/2
+                readonly property real halfMinLength: minLength/2
+
+
+                onConfigsUpdated: {
+                    gradientStyle = configs["Gradient Style"];
+                    context.lineWidth = configs["Line Width"];
+                    main.color = configs["Main Color"];
+                    if (gradientStyle === 1) {
+                        radialGradient_pstart.color = configs["Radial Gradient Settings"]["Inside Position Color"];
+                        radialGradient_pstart.position = configs["Radial Gradient Settings"]["Inside Position"]/100;
+                        radialGradient_pmiddle.color = configs["Radial Gradient Settings"]["Middle Position Color"];
+                        radialGradient_pmiddle.position = configs["Radial Gradient Settings"]["Middle Position"]/100;
+                        radialGradient_pend.color = configs["Radial Gradient Settings"]["Outside Position Color"];
+                        radialGradient_pend.position = configs["Radial Gradient Settings"]["Outside Position"]/100;
+                    } else if (gradientStyle === 2) {
+                        conicalGradient_pstart.color = configs["Conical Gradient Settings"]["Start Position Color"];
+                        conicalGradient_pquarter.color = configs["Conical Gradient Settings"]["Quarter Position Color"];
+                        conicalGradient_phalf.color = configs["Conical Gradient Settings"]["Middle Position Color"];
+                        conicalGradient_p3quarter.color = configs["Conical Gradient Settings"]["End Position Color"];
+                        conicalGradient_pend.color = configs["Conical Gradient Settings"]["Start Position Color"];
                     }
-                    audioData[i] /= uDataLen;
                 }
-            } else {
-                //线性化显示
-                for(let i=0; i<total; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += data[i*uDataLen+j];
+
+                function createPoint() {
+                    outerPos.length = 0;
+                    innerPos.length = 0;
+                    let deg, deltaR, r1, r2, _rhmLen;
+                    _rhmLen = mainRatio*halfMinLength;
+
+                    for (let j=0; j < channel; j++) {
+                        for (let i=0; i < dataLength; i++) {
+                            deg = degUnit*((i+j*dataLength)*dotGap+offsetAngle);
+                            deltaR = audioData[reverse*(dataLength-i-1)+(!reverse)*(i+j*dataLength)] * ratio;
+                            r1 = _rhmLen+1+deltaR*(linePosition!==2);
+                            r2 = _rhmLen-1-deltaR*(linePosition!==1);
+                            outerPos.push([halfWidth+Math.cos(deg)*r1,halfHeight+Math.sin(deg)*r1]);
+                            innerPos.push([halfWidth+Math.cos(deg)*r2,halfHeight+Math.sin(deg)*r2]);
+                        }
                     }
-                    audioData[i] /= (uDataLen * normalizing_ratio);
+                    conicalGradient.rotation = offsetAngle;
+                    offsetAngle = rotateFlag ? ((offsetAngle + rSpeed) % 360) : angle;
                 }
-            }
 
-            context.clearRect(0, 0, width+32, height+32);
-            createPoint();
+                onAudioDataUpdeted: {
+                    let normalizing_ratio = autoNormalizing ? data[128] : amplitude;
+                    if (unitStyle) {
+                        //对数化显示
+                        for(let i=0; i<total; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
+                            }
+                            audioData[i] /= uDataLen;
+                        }
+                    } else {
+                        //线性化显示
+                        for(let i=0; i<total; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += data[i*uDataLen+j];
+                            }
+                            audioData[i] /= (uDataLen * normalizing_ratio);
+                        }
+                    }
 
-            context.beginPath();
-            context.moveTo(outerPos[0][0], outerPos[0][1]);
-            for(let i=0; i<total; i++) {
-                context.lineTo(outerPos[i][0], outerPos[i][1]);
-            }
-            context.closePath();
-            context.stroke();
+                    context.clearRect(0, 0, width+32, height+32);
+                    createPoint();
 
-            context.beginPath();
-            context.moveTo(innerPos[0][0], innerPos[0][1]);
-            for(let i=0; i<total; i++) {
-                context.lineTo(innerPos[i][0], innerPos[i][1]);
-            }
-            context.closePath();
-            context.stroke();
+                    context.beginPath();
+                    context.moveTo(outerPos[0][0], outerPos[0][1]);
+                    for(let i=0; i<total; i++) {
+                        context.lineTo(outerPos[i][0], outerPos[i][1]);
+                    }
+                    context.closePath();
+                    context.stroke();
 
-            context.beginPath();
-            for(let i=0; i<total; i++) {
-                context.moveTo(outerPos[i][0], outerPos[i][1]);
-                context.lineTo(innerPos[i][0], innerPos[i][1]);
-            }
-            context.stroke();
-            requestPaint();
-        }
+                    context.beginPath();
+                    context.moveTo(innerPos[0][0], innerPos[0][1]);
+                    for(let i=0; i<total; i++) {
+                        context.lineTo(innerPos[i][0], innerPos[i][1]);
+                    }
+                    context.closePath();
+                    context.stroke();
+
+                    context.beginPath();
+                    for(let i=0; i<total; i++) {
+                        context.moveTo(outerPos[i][0], outerPos[i][1]);
+                        context.lineTo(innerPos[i][0], innerPos[i][1]);
+                    }
+                    context.stroke();
+                    requestPaint();
+                }
 
-        Component.onCompleted: {
-            for (let i = 0; i < 128; i++) {
-                audioData[i] = 0;
+                onCompleted: {
+                    for (let i = 0; i < 128; i++) {
+                        audioData[i] = 0;
+                    }
+                }
             }
         }
     }
 
     defaultValues: {
-        "Version": "1.1.0",
+        "Version": "1.2.0",
+        "Gradient Style": 0,
+        "Radial Gradient Settings": {
+            "Inside Position Color": "#f44336",
+            "Middle Position Color": "#4caf50",
+            "Outside Position Color": "#03a9f4",
+            "Inside Position": 40,
+            "Middle Position": 60,
+            "Outside Position": 80
+        },
+        "Conical Gradient Settings": {
+            "Start Position Color": "#f44336",
+            "Quarter Position Color": "#4caf50",
+            "Middle Position Color": "#03a9f4",
+            "End Position Color": "#ffeb3b"
+        },
         "Main Color": "#ff4500",
         "Line Position": 0,
         "Line Width": 1,
-        "Max Range": 50,
+        "Max Range": 80,
         "Data Length": 0,
         "Channel": 2,
         "Reverse": false,
@@ -142,9 +212,107 @@ AdvpStyleTemplate {
     preference: AdvpPreference {
         version: defaultValues["Version"]
 
+        P.SelectPreference {
+            id: _cfg_gradient_style
+            name: "Gradient Style"
+            label: qsTr("Gradient Style")
+            defaultValue: defaultValues["Gradient Style"]
+            model: [qsTr("None"), qsTr("Radial Gradient"), qsTr("Conical Gradient")]
+        }
+
+        P.DialogPreference {
+            name: "Radial Gradient Settings"
+            label: qsTr("Radial Gradient Settings")
+            live: true
+            visible: _cfg_gradient_style.value===1
+
+            P.ColorPreference {
+                name: "Inside Position Color"
+                label: qsTr("Inside Position Color")
+                defaultValue: defaultValues["Radial Gradient Settings"]["Inside Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Middle Position Color"
+                label: qsTr("Middle Position Color")
+                defaultValue: defaultValues["Radial Gradient Settings"]["Middle Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Outside Position Color"
+                label: qsTr("Outside Position Color")
+                defaultValue: defaultValues["Radial Gradient Settings"]["Outside Position Color"]
+            }
+
+            P.SliderPreference {
+                id: _cfg_gradient_settings_inside_position
+                name: "Inside Position"
+                label: qsTr("Inside Position")
+                from: 0
+                to: 75
+                stepSize: 1
+                defaultValue: defaultValues["Radial Gradient Settings"]["Inside Position"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                id: _cfg_gradient_settings_middle_position
+                name: "Middle Position"
+                label: qsTr("Middle Position")
+                from: _cfg_gradient_settings_inside_position.value + 1
+                to: 90
+                stepSize: 1
+                defaultValue: defaultValues["Radial Gradient Settings"]["Middle Position"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "Outside Position"
+                label: qsTr("Outside Position")
+                from: _cfg_gradient_settings_middle_position.value + 1
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Radial Gradient Settings"]["Outside Position"]
+                displayValue: value + "%"
+            }
+
+        }
+
+        P.DialogPreference {
+            name: "Conical Gradient Settings"
+            label: qsTr("Conical Gradient Settings")
+            live: true
+            visible: _cfg_gradient_style.value===2
+
+            P.ColorPreference {
+                name: "Start Position Color"
+                label: qsTr("Start Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["Start Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Quarter Position Color"
+                label: qsTr("Quarter Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["Quarter Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "Middle Position Color"
+                label: qsTr("Middle Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["Middle Position Color"]
+            }
+
+            P.ColorPreference {
+                name: "End Position Color"
+                label: qsTr("End Position Color")
+                defaultValue: defaultValues["Conical Gradient Settings"]["End Position Color"]
+            }
+        }
+
         P.ColorPreference {
             name: "Main Color"
             label: qsTr("Spectrum Line Color")
+            visible: !_cfg_gradient_style.value
             defaultValue: defaultValues["Main Color"]
         }
 
@@ -195,8 +363,6 @@ AdvpStyleTemplate {
             defaultValue: defaultValues["Channel"]
         }
 
-        P.Separator {}
-
         P.SwitchPreference {
             name: "Reverse"
             label: qsTr("Reverse Spectrum")
diff --git a/styles/Preset_waves/Style.qml b/styles/Preset_waves/Style.qml
index 10d37b7..351d41d 100644
--- a/styles/Preset_waves/Style.qml
+++ b/styles/Preset_waves/Style.qml
@@ -1,94 +1,179 @@
-import QtQuick 2.12
+import QtQuick 2.12
+import QtGraphicalEffects 1.12
 import NERvGear.Preferences 1.0 as P
 
 import "../../qml/api"
 
 AdvpStyleTemplate {
-    style: AdvpCanvasTemplate {
-        readonly property var audioData: new Array(128)
+    style: Rectangle {
+        id: main
+        width: widget.width;
+        height: widget.height;
 
-        readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
-        readonly property real amplitude: 400/configs["Data Settings"]["Amplitude"]
+        property bool gradientEnable
 
-        readonly property int uDataLen: Math.pow(2, configs["Data Length"]);
-        readonly property int dataLength: 64/uDataLen
-        readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
+        LinearGradient {
+            id: gradient_mask
+            anchors.fill: parent
+            visible: gradientEnable
+            gradient: Gradient {
+                GradientStop { id: p_start;  position: 0.0 }
+                GradientStop { id: p_middle;  position: 0.5 }
+                GradientStop { id: p_end; position: 1.0 }
+            }
+        }
 
-        readonly property int total: dataLength*2
+        layer.enabled: true
+        layer.effect: OpacityMask{
+            maskSource: AdvpCanvasTemplate {
+                readonly property var audioData: new Array(128)
 
-        readonly property real ux: width/(total+1)
-        readonly property real halfHeight: height/2
+                readonly property bool autoNormalizing: configs["Data Settings"]["Auto Normalizing"]
+                readonly property real amplitude: 400/configs["Data Settings"]["Amplitude"]
 
-        onConfigsUpdated: {
-            //尽量不要使用绑定configs的属性以免造成竞争，若一定要使用推荐使用Qt.callLater(()=>{})
-            context.lineWidth = configs["Line Width"];
-            context.strokeStyle = configs["Line Color"];
-        }
+                readonly property int uDataLen: Math.pow(2, configs["Data Length"]);
+                readonly property int dataLength: 64/uDataLen
+                readonly property int unitStyle: configs["Data Settings"]["Unit Style"]
 
-        onAudioDataUpdeted: {
-            let normalizing_ratio = autoNormalizing ? data[128]*2 : amplitude;
-            if (unitStyle) {
-                //对数化显示
-                for(let i=0; i<dataLength; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += Math.max(0, 0.4 * (Math.log10(data[63-i*uDataLen-j]/normalizing_ratio)) + 1.0);
-                    }
-                    audioData[i] /= uDataLen;
+                readonly property int total: dataLength*2
+
+                readonly property bool vertical_flag: configs["Direction"]
+                readonly property real halfWidth: vertical_flag ? height/2 : width/2
+                readonly property real halfHeight: vertical_flag ? width/2 : height/2
+                readonly property real ux: halfWidth*2/(total+1)
+                readonly property real _y_dy: centerRotateAngleTangent*halfWidth
+
+                readonly property bool centerRotateFlag: configs["Rotate Settings"]["Center Enable"]
+                readonly property real centerRotateAngleTangent: centerRotateFlag*Math.tan(configs["Rotate Settings"]["Center Angle"]*Math.PI/180)
+                readonly property bool lineRotateFlag: configs["Rotate Settings"]["Line Enable"]
+                readonly property real lineRotateAngleTangent: lineRotateFlag*Math.tan(configs["Rotate Settings"]["Line Angle"]*Math.PI/180)
+
+                readonly property real xOffset: configs["Rotate Settings"]["X Offset"]/100
+                readonly property real yOffset: configs["Rotate Settings"]["Y Offset"]/100
+                readonly property real xScale: configs["Rotate Settings"]["X Scale"]/100
+                readonly property real yScale: configs["Rotate Settings"]["Y Scale"]/100
+
+                onWidthChanged: {
+                    gradient_mask.end = Qt.point(width*(configs["Gradient Direction"]!==1), height*(configs["Gradient Direction"]%2));
                 }
-                for(let i=dataLength; i<total; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
-                    }
-                    audioData[i] /= uDataLen;
+
+                onHeightChanged: {
+                    gradient_mask.start = Qt.point(0, height*(configs["Gradient Direction"]===2));
+                    gradient_mask.end = Qt.point(width*(configs["Gradient Direction"]!==1), height*(configs["Gradient Direction"]%2));
                 }
-            } else {
-                //线性化显示
-                for(let i=0; i<dataLength; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += data[63-i*uDataLen-j];
+
+                onConfigsUpdated: {
+                    //尽量不要使用绑定configs的属性以免造成竞争，若一定要使用推荐使用Qt.callLater(()=>{})
+                    gradientEnable = configs["Enable Gradient"];
+                    context.lineWidth = configs["Line Width"];
+                    main.color = configs["Line Color"];
+                    if (gradientEnable) {
+                        gradient_mask.start = Qt.point(0, height*(configs["Gradient Direction"]===2));
+                        gradient_mask.end = Qt.point(width*(configs["Gradient Direction"]!==1), height*(configs["Gradient Direction"]%2));
+                        p_start.color = configs["Start Position Color"];
+                        p_middle.color = configs["Middle Position Color"];
+                        p_end.color = configs["End Position Color"];
                     }
-                    audioData[i] /= (uDataLen * normalizing_ratio);
                 }
-                for(let i=dataLength; i<total; i++) {
-                    audioData[i] = 0;
-                    for(let j=0; j<uDataLen; j++) {
-                        audioData[i] += data[i*uDataLen+j];
+
+                onAudioDataUpdeted: {
+                    let normalizing_ratio = autoNormalizing ? data[128]*2 : amplitude;
+                    if (unitStyle) {
+                        //对数化显示
+                        for(let i=0; i<dataLength; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[63-i*uDataLen-j]/normalizing_ratio)) + 1.0);
+                            }
+                            audioData[i] /= uDataLen;
+                        }
+                        for(let i=dataLength; i<total; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += Math.max(0, 0.4 * (Math.log10(data[i*uDataLen+j]/normalizing_ratio)) + 1.0);
+                            }
+                            audioData[i] /= uDataLen;
+                        }
+                    } else {
+                        //线性化显示
+                        for(let i=0; i<dataLength; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += data[63-i*uDataLen-j];
+                            }
+                            audioData[i] /= (uDataLen * normalizing_ratio);
+                        }
+                        for(let i=dataLength; i<total; i++) {
+                            audioData[i] = 0;
+                            for(let j=0; j<uDataLen; j++) {
+                                audioData[i] += data[i*uDataLen+j];
+                            }
+                            audioData[i] /= (uDataLen * normalizing_ratio);
+                        }
                     }
-                    audioData[i] /= (uDataLen * normalizing_ratio);
-                }
-            }
 
-            context.clearRect(0, 0, width+32, height+32);
+                    context.clearRect(0, 0, width+32, height+32);
+                    context.beginPath();
+                    context.resetTransform();
+                    if (vertical_flag) {
+                        if (lineRotateFlag || centerRotateFlag) {
+                            context.transform(yScale, lineRotateAngleTangent, -centerRotateAngleTangent, xScale, _y_dy+yOffset*height, xOffset*width-lineRotateAngleTangent*(halfHeight));
+                        }
+                        context.moveTo(halfHeight, 0);
 
-            context.beginPath();
-            context.moveTo(0, halfHeight);
+                        for (let i=0; i<dataLength*2; i+=2) {
+                            context.lineTo(halfHeight*(1+audioData[i]), ux*i);
+                            context.lineTo(halfHeight*(1-audioData[i+1]), ux*(i+1));
+                        }
 
-            for (let i=0; i<dataLength*2; i+=2) {
-                context.lineTo(ux*i, halfHeight*(1+audioData[i]));
-                context.lineTo(ux*(i+1), halfHeight*(1-audioData[i+1]));
-            }
+                        context.lineTo(halfHeight, height);
+                    } else {
+                        if (lineRotateFlag || centerRotateFlag) {
+                            context.transform(xScale, centerRotateAngleTangent, -lineRotateAngleTangent, yScale, xOffset*width+lineRotateAngleTangent*(halfHeight), yOffset*height-_y_dy);
+                        }
+                        context.moveTo(0, halfHeight);
 
-            context.lineTo(width, halfHeight);
-            context.stroke();
+                        for (let i=0; i<dataLength*2; i+=2) {
+                            context.lineTo(ux*i, halfHeight*(1+audioData[i]));
+                            context.lineTo(ux*(i+1), halfHeight*(1-audioData[i+1]));
+                        }
 
-            requestPaint();
-        }
+                        context.lineTo(width, halfHeight);
+                    }
+                    context.stroke();
+                    requestPaint();
+                }
 
-        Component.onCompleted: {
-            for (let i = 0; i < 128; i++) {
-                audioData[i] = 0;
+                onCompleted: {
+                    for (let i = 0; i < 128; i++) {
+                        audioData[i] = 0;
+                    }
+                }
             }
         }
     }
 
     defaultValues: {
-        "Version": "1.1.0",
-        "Line Width": 1,
+        "Version": "1.2.0",
+        "Enable Gradient": false,
+        "Gradient Direction": 0,
+        "Start Position Color": "#f44336",
+        "Middle Position Color": "#4caf50",
+        "End Position Color": "#03a9f4",
         "Line Color": "#ff4500",
+        "Line Width": 1,
         "Data Length": 0,
+        "Direction": 0,
+        "Rotate Settings": {
+            "Center Enable": false,
+            "Center Angle": 10,
+            "Line Enable": false,
+            "Line Angle": 10,
+            "X Scale": 100,
+            "Y Scale": 100,
+            "X Offset": 0,
+            "Y Offset": 0
+        },
         "Data Settings": {
             "Auto Normalizing": true,
             "Amplitude": 10,
@@ -99,6 +184,58 @@ AdvpStyleTemplate {
     preference: AdvpPreference {
         version: defaultValues["Version"]
 
+        P.SwitchPreference {
+            id: _cfg_enable_gradient
+            name: "Enable Gradient"
+            label: qsTr("Enable Gradient")
+            defaultValue: defaultValues["Enable Gradient"]
+        }
+
+        P.SelectPreference {
+            name: "Gradient Direction"
+            label: qsTr("Gradient Direction")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["Gradient Direction"]
+            model: [qsTr("Horizontal"), qsTr("Vertical"), qsTr("Oblique Upward"), qsTr("Oblique downward")]
+        }
+
+        P.ColorPreference {
+            name: "Start Position Color"
+            label: qsTr("Start Position Color")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["Start Position Color"]
+        }
+
+        P.ColorPreference {
+            name: "Middle Position Color"
+            label: qsTr("Middle Position Color")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["Middle Position Color"]
+        }
+
+        P.ColorPreference {
+            name: "End Position Color"
+            label: qsTr("End Position Color")
+            visible: _cfg_enable_gradient.value
+            defaultValue: defaultValues["End Position Color"]
+        }
+
+        P.Separator {}
+
+        P.SelectPreference {
+            name: "Direction"
+            label: qsTr("Direction")
+            defaultValue: defaultValues["Direction"]
+            model: [qsTr("Horizontal"), qsTr("Vertical")]
+        }
+
+        P.ColorPreference {
+            name: "Line Color"
+            label: qsTr("Spectrum Line Color")
+            visible: !_cfg_enable_gradient.value
+            defaultValue: defaultValues["Line Color"]
+        }
+
         P.SliderPreference {
             name: "Line Width"
             label: qsTr("Spectrum Line Width")
@@ -109,14 +246,6 @@ AdvpStyleTemplate {
             displayValue: value.toFixed(1) + "px"
         }
 
-        P.ColorPreference {
-            name: "Line Color"
-            label: qsTr("Spectrum Line Color")
-            defaultValue: defaultValues["Line Color"]
-        }
-
-        P.Separator {}
-
         P.SelectPreference {
             name: "Data Length"
             label: qsTr("Spectrum Length")
@@ -124,6 +253,101 @@ AdvpStyleTemplate {
             model: [64, 32, 16, 8]
         }
 
+        P.Separator {}
+
+        P.DialogPreference {
+            name: "Rotate Settings"
+            label: qsTr("Rotate Settings")
+            live: true
+            icon.name: "regular:\uf1de"
+
+            P.SwitchPreference {
+                id: _cfg_preset_line_Rotate_Center_Enable
+                name: "Center Enable"
+                label: qsTr("Rotate Center Line")
+                defaultValue: defaultValues["Rotate Settings"]["Center Enable"]
+            }
+
+            P.SliderPreference {
+                name: "Center Angle"
+                label: qsTr("Angle of Center Line")
+                enabled: _cfg_preset_line_Rotate_Center_Enable.value
+                from: -45
+                to: 45
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["Center Angle"]
+                displayValue: value + "°"
+            }
+
+            P.Separator {}
+
+            P.SwitchPreference {
+                id: _cfg_preset_line_Rotate_Line_Enable
+                name: "Line Enable"
+                label: qsTr("Rotate Spectrum Line")
+                defaultValue: defaultValues["Rotate Settings"]["Line Enable"]
+            }
+
+            P.SliderPreference {
+                name: "Line Angle"
+                label: qsTr("Angle of Spectrum Line")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value
+                from: -45
+                to: 45
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["Line Angle"]
+                displayValue: value + "°"
+            }
+
+            P.Separator {}
+
+            P.SliderPreference {
+                name: "X Scale"
+                label: qsTr("Scale of Center Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: 1
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["X Scale"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "Y Scale"
+                label: qsTr("Scale of Spectrum Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: 1
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["Y Scale"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "X Offset"
+                label: qsTr("Offset of Center Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: -100
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["X Offset"]
+                displayValue: value + "%"
+            }
+
+            P.SliderPreference {
+                name: "Y Offset"
+                label: qsTr("Offset of Spectrum Line Direction")
+                enabled: _cfg_preset_line_Rotate_Line_Enable.value || _cfg_preset_line_Rotate_Center_Enable.value
+                from: -100
+                to: 100
+                stepSize: 1
+                defaultValue: defaultValues["Rotate Settings"]["Y Offset"]
+                displayValue: value + "%"
+            }
+        }
+
+        P.Separator {}
+
         P.DialogPreference {
             name: "Data Settings"
             label: qsTr("Data Settings")