From fbbe05493353067a2523e9bae7c1beb5dbdb91ae Mon Sep 17 00:00:00 2001 From: Lars Brubaker Date: Fri, 19 Mar 2021 10:53:26 -0700 Subject: [PATCH] Put in images for all bend settings --- .../DesignTools/Operations/CurveObject3D_3.cs | 10 +++++++++- StaticData/Icons/curve.png | Bin 1121 -> 440 bytes 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/MatterControlLib/DesignTools/Operations/CurveObject3D_3.cs b/MatterControlLib/DesignTools/Operations/CurveObject3D_3.cs index d6c7be7db..df9a19947 100644 --- a/MatterControlLib/DesignTools/Operations/CurveObject3D_3.cs +++ b/MatterControlLib/DesignTools/Operations/CurveObject3D_3.cs @@ -70,13 +70,20 @@ namespace MatterHackers.MatterControl.DesignTools [EnumDisplay(Mode = EnumDisplayAttribute.PresentationMode.Tabs)] public BendTypes BendType { get; set; } = BendTypes.Angle; + [MaxDecimalPlaces(2)] + [Description("Set the radius that the bend will wrap around")] + [DescriptionImage("https://lh3.googleusercontent.com/PpQKIIOqD-49UMhgM_HCvig9Mw_UtUwO08UoRVSLJlCv9h5cGBLMvaXbtORrVQrWYPcKZ4_DfrDoKfcu2TuyYVQOl3AeZNoYflgnijc")] public double Diameter { get; set; } = double.MaxValue; [MaxDecimalPlaces(1)] + [Description("Set the angle of the curvature")] + [DescriptionImage("https://lh3.googleusercontent.com/TYe-CZfwJMKvP2JWBQihkvHD1PyB_nvyf0h3DhvyJu1RBjQWgqeOEsSH3sYcwA4alJjJmziueYGCbB_mic_QoYKuhKrmipkV2eG4_A")] public double Angle { get; set; } = 90; [EnumDisplay(Mode = EnumDisplayAttribute.PresentationMode.Buttons)] + [Description("The part will bend around the z axis either up or down")] + [DescriptionImage("https://lh3.googleusercontent.com/h-s2FyBKO5etYDr_9YSLtGmGmQTcmSGMu4p0mRqX4_7Z62Ndn2QRLoFICC6X9scbhr1EP29RiYRj4EmhLMUwiNTAG-PIiFbzI_jAses")] public BendDirections BendDirection { get; set; } = BendDirections.Bend_Up; [Range(3, 360, ErrorMessage = "Value for {0} must be between {1} and {2}.")] @@ -85,7 +92,8 @@ namespace MatterHackers.MatterControl.DesignTools public double MinSidesPerRotation { get; set; } = 30; [Range(0, 100, ErrorMessage = "Value for {0} must be between {1} and {2}.")] - [Description("Where to start the bend as a percent of the width of the part")] + [Description("Where to start the bend as a percent from the left side")] + [DescriptionImage("https://lh3.googleusercontent.com/eOeWjr98uz_E924PnNaXrasepv15nWEuvhqH-jbaQyvrOVdX5MHXF00HdZQGC8NLpJc9ok1sToMtyPx1wnnDgFwTTGA5MjoMFu612AY1")] public double StartPercent { get; set; } = 50; [DescriptionImage("https://lh3.googleusercontent.com/arAJFTHAOPKn9BQtm1xEyct4LuA2jUAxW11q4cdQPz_JfoCTjS1rxtVTUdE1ND0Q_eigUa27Yc28U08zY2LDiQgS7kKkXKY_FY838p-5")] diff --git a/StaticData/Icons/curve.png b/StaticData/Icons/curve.png index 694296f436de84f2b7748a896e1ce41eff7badc0..0862ca8d4798e5cdba39423f7c6e62f61dc602df 100644 GIT binary patch delta 415 zcmaFJv4eSnay# zDYLMEs8r+vIXwmjMpsW4#}JFtYbV=#I3%q-yHDjcj4g@Y)qo5;PFS^zKR(7z4_t|q*?`^-|sXpJT z_TgvEul$dCRxKIJH!sUvl-jgjrMD}4!oLd>Z7KxTYE8U7OX=^z$G7-g42@4m{s?1J zK9{yB)!>ne;BLXAXLuSI8|v75{8q=fJSwVGZcBAIoMYXy?)-h`6K89u29@>I+;X=v zJa=SK=MT-&rZ@Gn8g4UUj6Mc^n6&d-*YcEzbu7gS0#EmZZr^?2ZR@c%W7RLP z-<|aNuIw)vJ-21M0&HKbVn4tY5bb2i90`g SJbeZR1_n=8KbLh*2~7a$YqJah delta 1101 zcmdnN{E%aUay_GTW=KRygs+cPa(=E}VoH8es$NBI0Rsrw*jE%JCTFLXC?ut(XXe=| zz2CiGNg*@ERw>-n*TA>HIW;5GqpB!1xXLdixhgx^GDXSWj?1RPsv@@_H?<^Dp&~aY zuh^=>RtapbRbH_bNLXJ<0j#7X+g7PQ!Z$#{Ilm}X!Bo#w&p^qJOTnfnCCw_x#SN;v zC?(BSDWjyMz)D}gyu4hm+*mKaC|%#s($Z4jz)0W7NVg~@O}Dr*uOzWTH?LS3WCX+v zm(=3qqRfJl%=|nBkeP`|`K2YcN=o`5OY}h^K`!-fc3d|4VCR6GX2*r_b823Stx}Pa zy`7ZT>Q@X5j7^!&&H=?i?oJAxuFhtLmS$$UMtX(}3>p(lC+_xUb`)sef5gK@nJX%y zgQYVp(8MW#ySu~9QFju@zFAK`34OA7C!}(NYa1i$#bel?QX(O|_pezo(f-41d-t#+(V3xK8EYmfc=ByuQMpoXvV^#;nzHM` zH~;VNd-YM#f90;j>|g!cK3-$~ru#!r>e%yzi8b<$ca>vOw0_=XmZ%fo8*wq__k~T2 z>C;8)bvH3TpMBxug0`(6)`zI)^&Wrtm1UOr!naaV)4grA-xt^LFD(7JO8ds$<~Ymy zn?5mTa-~0Ct+2v@fq{Xuz$3Dlfr0M`2s2LA=96Y%V2ty0aSXBOT{?NMzH_3;vHJIK zT~}RPw#xK}-b*dR2o;ZII{slibl`x3&i7faH92fzf>s@B zOPstG*;W0HVp+P~?$?_4mGhqOd2YjgZ^7$bPp1EfS^Z~P3j4(KHw}0`PX4_6z;$-( zBD;xmZv8*EAmhoF)vnWTdmKyO5cjHZMV!~^y9_q=cM?!mV{XyL z=}&ITOy$*W*(FjxXWpN(mm+g=Qg>R~AH8prc8twDl%cRP=hQpFfYT2?$_cr5yterC zPK%Z4;ks`pR;hh3b;_Ra^h{Hw?3u5_3Wkd8gH?@xmzo&u?zT=iQS^S6rR^Ms3rVX@ zRs4Tj-o7m8#r`%?U9_=Z|Aq78AS*ASE8EIuO)S`R;lh@cQx(M9Z@V3;T4yMh*2<(1 zyRWp$?e(XL``4Z6X?eV*#KdEI{^Q$XTod0irD=bd-XVU(f2H;>sdz@gwe{OBn*Y%N Ol@Ok;elF{r5}E+#+Sj-M