From b721f519ac3fd765f6b24acab75477396be380fe Mon Sep 17 00:00:00 2001 From: Greg Ercolano Date: Thu, 24 May 2018 19:48:41 +0000 Subject: [PATCH] Added separate diagram for fl_arc(x,y,r,a1,a2) (very different from fl_arc(x,y,w,h,a1,a2)) git-svn-id: file:///fltk/svn/fltk/branches/branch-1.4@12935 ea41ed52-d2ee-0310-a9c1-e6b18d33e121 --- FL/fl_draw.H | 5 ++++- documentation/src/drawing.dox | 6 +++++- documentation/src/fl_arc_xyr_diagram.png | Bin 0 -> 5330 bytes 3 files changed, 9 insertions(+), 2 deletions(-) create mode 100644 documentation/src/fl_arc_xyr_diagram.png diff --git a/FL/fl_draw.H b/FL/fl_draw.H index b7a1c4d49..11a7f3bc6 100644 --- a/FL/fl_draw.H +++ b/FL/fl_draw.H @@ -408,6 +408,9 @@ inline void fl_curve(double X0, double Y0, double X1, double Y1, double X2, doub counter-clockwise from 3 o'clock. If \p end is less than \p start then it draws the arc in a clockwise direction. + \image html fl_arc_xyr_diagram.png "fl_arc(x,y,r,a1,a2)" + \image latex fl_arc_xyr_diagram.png "fl_arc(x,y,r,a1,a2)" width=6cm + Examples: \code // Draw an arc of points @@ -428,7 +431,7 @@ inline void fl_curve(double X0, double Y0, double X1, double Y1, double X2, doub */ inline void fl_arc(double x, double y, double r, double start, double end) {fl_graphics_driver->arc(x,y,r,start,end); } /** - fl_circle() is equivalent to fl_arc(x,y,r,0,360), but may be faster. + fl_circle(x,y,r) is equivalent to fl_arc(x,y,r,0,360), but may be faster. It must be the \e only thing in the path: if you want a circle as part of a complex polygon you must use fl_arc() diff --git a/documentation/src/drawing.dox b/documentation/src/drawing.dox index a803507cd..dad58652f 100644 --- a/documentation/src/drawing.dox +++ b/documentation/src/drawing.dox @@ -654,10 +654,14 @@ in degrees counter-clockwise from 3 o'clock. If \p end is less than \p start then it draws the arc in a clockwise direction. +\par +\image html fl_arc_xyr_diagram.png "fl_arc(x,y,r,a1,a2)" +\image latex fl_arc_xyr_diagram.png "fl_arc(x,y,r,a1,a2)" width=6cm + void fl_circle(double x, double y, double r) \par -\p fl_circle(...) is equivalent to \p fl_arc(...,0,360) but may +\p fl_circle(x,y,r) is equivalent to \p fl_arc(x,y,r,0,360) but may be faster. It must be the \e only thing in the path: if you want a circle as part of a complex polygon you must use \p %fl_arc(). diff --git a/documentation/src/fl_arc_xyr_diagram.png b/documentation/src/fl_arc_xyr_diagram.png new file mode 100644 index 0000000000000000000000000000000000000000..e47aab2bc750b9a21b51fd407d61ad9601dc233a GIT binary patch literal 5330 zcmZvg2{e@N+sCbCSIXdr$dc_rlvy6&+}ZL>$#ujobPjA*L|Hk(aOS@o#ihU8X6jQu!(^U z4GkS|I?gfBpAxG%Nw(7q?L8Y~J({Wy0xPG^RVy=FLn#?a9bN4>O;s-=eKQM4vw{NL z&Be#h`+hJAlaf?kQ8rWfqJMxi{&j3|dExlv&)sjrkkh%$K_;+!G&CGNe-GMB84mta zcoqdVH#|Gf$a_KhYW{oLm{Y`uGK8Y^0|NpOcThC?NQ5g2;UOICgYp(O2Af;iM{@Ac z&|IVk8|d1Gd|jV%^5X|L(ah#G-)khYEHFIv48CUnU2#I_B{;>K*5y3+|=iHhQjz?c7=2|DTKGg4O=Z)S%U0$+`V`=$qp(&es+tFL2 zKjm7L7Q#>!KR4b7KB{dx9L<-NJio*d$7TJP5&9p-f}>&mrw!0UV$bc~mc^CbIMnQ9 z&&=;nH4#*5)*RpGKay_}IJfH*8OVO5+HkpzqXftubr2&$R|LP@kaJ4>e16=!VAfoM zurcy(Dz%VzCL&DG7v>91UZU@fNH~o`%NCaMvzySc`Bkfan=4Ky&mJ`MDmOQL*6qbCkfJ@oDspyX6Zr=$S$hV`He|pBbeQLF} zqW*6F=k;AV_Rsrj6a$ERQQIGMW7{OOwDj|RjBCWf6E;;6>a0t1S}3bKH*pFb6$+x3UWW_`PKmq z-%c&NVtZCoJN^aNlymndXw{b7{h8M;p~vJn{^0coC2fS8-7AETt)omnq3xdpIhA*n zKUO1uxm+j`C!{)aqo@>b*XGMH`^|6X=8QJUcLEo33|IwiTMAI2*B!pLM(zri2j)1& zM}+%_hP9td1x;c=8eFpbYpgH8GdAUiM|$eG;nmwe&OG!U+CJ_{mn3kU{2AX}5lx?| z*Vz0mtAb1aEgP~YU77A3Wa|HMqJ3)HIQ;>pxZ1h|B)=Ul`ysoh> z=o4`;E+iOzGiM;*DbGsEjhSTQC>#~MQz7*x`ddb-4*fvD2(N#bHXNoJE8`vFPWvxQ z?DMm^8iujkN{2JJ1UsES87*|xaemvPA3JyG&_unX`Q31rixrP4&cXZe)al zf*0QzjNgwT4$@$hjOLT_Gs75T3}PVDMMS|+yf}G&xqz4y@=m5l&&0N2Kpn%~Isf4~ zF-1iNvRF|pBMkFMPXWp7ELDlIlGHK$2S`Xqra?S8uja`Q#hX}%dTswO^$qaie%DiMZR<>RzQ~4>= zcZE&pp^VVP&UXveg;C$ex$Qihq-z9!+%pOcq2}Q4)oM*m=FC^}wWbzSub~C&C|@_! z{1e~Rqwo{NT&h$2Q9#3oFBGGm7osmOu2pA(R@Jm-uLb5bv|lZFL^f)*D}A^YI2IS& zsEI{lC|I3O-co3cu3tq-$fZ{AZR{M?Malqj1$rZRygvveTT6v%xnZj8kF7WH6e_5> z)fBvch|RP7eh7@-@9#PUsr9XW8$54eUE2i(7;t}0u=y*|Q~h8QZ|mR{ zP;IaJ&Qh{p>-I&9T&_?`3Q3ThXr(>#k>mW4H6IjlTc%{lQpQHa~>W@GVc zM2EUxUQSPGM7N7CuSAojTYQ)U@A3y1^bPQf#7%2O=TT70wX`spV~I5WEzdpeh*>bVbf#GDrw7=|IaG?iXS+&;3$|zTZZa zkfB^S%{iI*Rv32eODES!q;_MO&RLAYe<_ℑYZd|8dj99U5f+x_3wU3{t|5QRauN zdYgq~q)Rt;>%6xsU*m6$mUmF@w=W}%?*?6SXoyN@WS!*x;lU^G=4JSCeDD#Tr2-!- za0bT^=(5LipQ$OedNErSqu$mFSvy^uye?{9I<@C6;!Vwp>15o%t{X5T`PnG?YEMo`Q} zHE8LQ5so-!G&6VgPt-mj|mbx}Xy3PF!BaK`jb#XTUMm8GWM#EeqmSOWAt@lIssiDa>| z#qrkD+-jkd5rHb!IjWMR@2s$hL=kbsb!MTzcv(T+mtsxqB9%Y@41QO9h~@n0ONZek zqgp7^i`#TE`wg94G)8ee!Lh97uasWPB$}J5d1$(vV#uz7Zb4+ zE=5pubuGx?vy7^;_i;KF5KV3!3-TM5(?G4vVr}vp8l=Mx{*?Fm@Y&Ozf{Igstoa9k z{SC@bLDJtdP2Qgc(4Gp{OU1y(6nPrYqzNbar}! zc8r=+{8FblB%s&SMCfw|0@s{4Uf#j8u9$6TJXq!Q;QDJ6G#0rl`a*RL8{8OvJf&qagmm5 z1;SMd%^0z+sm@reuky*8PH=NA-6WC8S%4$_{w6Xw%D`m30pm31hJl!|8z`tb3| zRpqc+IprL@q*aww!o3{05?Jd2E0)IX6nwJ5_#NMK@O8zTAx>paaO+}(igb%lEv5vH zsGRO}i%^3Me=j&@j zvZ$KhpU$W`{p^+_f$jBmi31fGlj-bOZxR_s`+x1>zm>gHcR-ePvG#h?e+FnU!;IXI z5iJ+B+ZeIi$i1mtI$UyQ$xk&L8~K+~GUPS~0?iCW6T;DRv+LxW{wKSa4zaqb`%6pA zZBX@~t)W|RzGUqwx{b-!uD5{~S|_2{T)H-xS}&yFv3MUchCD?r*veo9I&G*6qPS!p z>H_uNmxR@S!yfFN{qh`XHNUL z7Jzlj*mGE3VEHPOcJec;ofd-oa}@84W&k?4rjVD|PX4f8L+>!@i?ZM~cAYNKK@u1v zsNI|qC08TpvFBLtq4(LV$$xOOo8ck-P1$EV6x9SC4Xr9#0-s~@_~NI`nSUoM|TdD z9wV_OAU^q09|CYk3H&7X$=>bQ^r}6dejrz@si!7Evq_=V5;nQId9OpSulki%+ynWv z5f2#7&9-k{PYob0iE?!!Lle5LO-o1-CId3|chuOi^G7=T9Jq7H$gXS6r7L(do6C#0 z#2`Ma60tyNr(hhEsVvU8$k+!TmiI>Qj*GV!^Payb(8JfLV;Wy#^qPARAXbu^+rvTo z%cQx&RK(r#{;ivZ*w_7&Sl~Pn~&fiUzpWrZIfhCnfvJ)U_qg%N`m1mHUPqTrS zZR1c%7RMObRQmmkYff!rLxi4tRunZIA+qAwkob7B#_*7y3K=g4Y9_rq*^AX_(D*p$ zwoO1O;V*Kka0=tFcl1i%Cd3A1Sw4hfL-rzWGMU{MT0ug%_GfVS;?q-v*8Z5y|)ouuB>2Z?ZMX@W6B67K} zNPC_C0qbgo_{-RI*mx)6DWN>~0f-w_h{I@x_)dfo;E$3%3bO7M;RPat&;rUuH#=-D zATB4tqzkE=Y`2GRIsuHXnbZ7i{m`BWxoG9$<6{FJjQ9tndaup5fYPxzI-Zfc`n4LY zU@NT@e3(Tz?;de)M%HY_u^6^-#q~g~H{;JG2Ylw@cf}>7^>c(gGkLwn8kE>=(uLGO zEQ<_|n04tnzj2>1A)IV%NjtDY3U4f?8Tvw#&L(oey>?D&nP+JCj+Ym_Pd`!90G_wK+hgmJIC&TWrJ~i@I#Ws^*ZPKn%bzDLn zrC=Tm5`d6kRig$FBsNY98@&h=zlk!O|2`7BI%0xdU!-mx@~qGJ{y^q(0oAs+HL!rr zXtmyvQo2DJFwLBpyW~wk5%VpR5Eir}Bx_jwykuup-4Nhz zEZX7m6L&9jeB%i-Ea1lXrO+Qy7ZP7+g}R4sijV|#zNuhmlBz!QH@@1FZB3|bsrsHy zv}Eah5#<%}u%_cq)r>uohPT?qQRQcoqY{ueq?-j}QKfESqBk#X%nEV7Wr6KRe64z$ zTVLEym?&%ouai5+<~z?mRH}&^#XtLScgfEeP#$vL5#ZijED&GU=qmZpb=A5=1Vnvy zQ~)BA@=x*}+WPtV4XtE#lL(vRowcvap;Z$nrh$W&(u3+3PI8=ds}Ewc5J%*2%_j_F z{i5Uo=@W%a!4C;bnnTbglxNnh->wq(ySqc-`)ooYzC2w8k_q-nvhnQ zB)=?!rpLS45k9#H^EAdXPuG=k`OiusBkkT=s4x6zFJ`e#dm`cJy|q#)P?9p_*KqJD zEuV3-=+ZL+5Ef?NCq?#L-DRtusryM>Cts_;BK|zhM|Qgf;)8|9?R}nvnDJreLqC4% z@BbF-7qff*P-Ldw;8_a+aIS1I^!`23l?lR%lU61xpdXLJ&%Y|E-%EXm6IKNUdjfl~ zY@lwleWXi-`WoSC2jmLwuEHvrfKDX-y^dD6ZU>j-o&|P1+B0{ogUghbQW#V>ZUlM% z9J*T!bsnrZkC#YIwf0DR8)bNBKFX6spcLZlKX;3$7U+k>0ZcG2CMc>E|1wPLI~_R; ze^DuA28{y~IQKb(WJaGweWC~m% z+7NJ5i6XLr@IiA-AbqGoSF8k-&GkGp&kMLhY^=6pLlp5M=s0MO1>_D*%9BfwfhN0l zhD|`7+TaTDjK7NA*MrJ=d%8X)tK>cb0|IiB(pT`a!|akjBoipeRtV ze`~;vFEQ&XMyDdXH%h;8Q6DfdAYKOv{J~|>K#a`{QxWFn{;ryG(Q(&3(Bf}Ih&CDS zcWZI8^RxO-4}mqXd?#CaFb+)&O)8skKj`+u72eA3o9`B;d~c^bRM=)2@YqI#VGXKp zU}LfGIl0;|{_`k-iy#b7gyZD};e7I|C1-F3IAI>B2y{yUN0BRHoi3@(N^4wO5;y}& zKGD^xDRmBHB_7@5eMv1r{rXku9(WXX6WTPPNsA3f+j*enH=XCczK!KL?L=4*FfF-D zv-7UB&@&}<-EB$64dV=0*Ub?`LH))>&Xwv8MM<*#v$*FvwJ}jkecMQXp1oIr%ohHz zI{{dD=q9m?J=x$0Ng+RvR{n|7QG0a24LuA