haskal
/
kicad
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update clipper library version (from 6.21) to the latest (currently 6.4.0 , 2 July 2015) which fixes some bugs.

This commit is contained in:
jean-pierre charras 2015-11-02 13:45:33 +01:00
parent ae506e8223
commit 01be350851
3 changed files with 725 additions and 536 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

276
demos/interf_u/interf_u.kicad_pcb
View File

@ -1,4 +1,4 @@
(kicad_pcb (version 4) (host pcbnew "(2015-09-30 BZR 6230)-product")
(kicad_pcb (version 4) (host pcbnew "(2015-10-31 BZR 6288)-product")
(general
(links 200)
@ -334,6 +334,157 @@
(add_net VCC)
)
(module LOGO (layer Composant) (tedit 0) (tstamp 56372FFF)
(at 89.027 98.552)
(fp_text reference G*** (at 0 0) (layer F.SilkS) hide
(effects (font (thickness 0.3)))
)
(fp_text value LOGO (at 0.75 0) (layer F.SilkS) hide
(effects (font (thickness 0.3)))
)
(fp_poly (pts (xy 0.519278 -10.339833) (xy 1.157328 -10.155714) (xy 1.745126 -9.87217) (xy 2.246924 -9.499206)
(xy 2.59633 -9.094067) (xy 2.812739 -8.749225) (xy 2.977082 -8.425215) (xy 3.098214 -8.087398)
(xy 3.184985 -7.701133) (xy 3.246249 -7.231783) (xy 3.290859 -6.644708) (xy 3.309278 -6.30442)
(xy 3.34037 -5.740001) (xy 3.37324 -5.309547) (xy 3.412895 -4.977717) (xy 3.464343 -4.709174)
(xy 3.532592 -4.468578) (xy 3.593972 -4.295399) (xy 3.898734 -3.603436) (xy 4.296975 -2.872617)
(xy 4.749215 -2.168944) (xy 5.215973 -1.558417) (xy 5.265805 -1.500584) (xy 5.668554 -0.999211)
(xy 6.000933 -0.486857) (xy 6.280595 0.073315) (xy 6.525195 0.718145) (xy 6.75239 1.484471)
(xy 6.818925 1.740145) (xy 6.979833 2.566258) (xy 7.0144 3.297388) (xy 6.920356 3.953797)
(xy 6.695429 4.555744) (xy 6.458347 4.956343) (xy 6.258208 5.238534) (xy 6.068927 5.488459)
(xy 5.934744 5.648329) (xy 5.643621 5.845324) (xy 5.263884 5.955496) (xy 4.853992 5.974956)
(xy 4.472407 5.899812) (xy 4.218713 5.762519) (xy 4.117425 5.654252) (xy 4.05996 5.50396)
(xy 4.033955 5.264115) (xy 4.027973 5.029087) (xy 4.016814 4.722617) (xy 3.993623 4.48071)
(xy 3.963434 4.355775) (xy 3.946239 4.225092) (xy 3.970803 3.999546) (xy 3.993178 3.890108)
(xy 4.033013 3.583607) (xy 4.04615 3.158221) (xy 4.035052 2.661867) (xy 4.002182 2.142465)
(xy 3.950004 1.647932) (xy 3.880981 1.226186) (xy 3.849156 1.088407) (xy 3.621181 0.406604)
(xy 3.30768 -0.174826) (xy 3.094498 -0.465667) (xy 2.84284 -0.898935) (xy 2.710111 -1.343052)
(xy 2.619598 -1.658423) (xy 2.470412 -2.056723) (xy 2.287699 -2.473748) (xy 2.187737 -2.676785)
(xy 2.018292 -3.014468) (xy 1.882985 -3.301076) (xy 1.798327 -3.50058) (xy 1.778 -3.570733)
(xy 1.725626 -3.705212) (xy 1.636067 -3.826501) (xy 1.545732 -3.969617) (xy 1.590781 -4.079946)
(xy 1.593733 -4.082934) (xy 1.664843 -4.244125) (xy 1.690598 -4.490206) (xy 1.672404 -4.747706)
(xy 1.611664 -4.943152) (xy 1.57646 -4.986929) (xy 1.513657 -5.074006) (xy 1.531961 -5.202127)
(xy 1.624681 -5.399463) (xy 1.725343 -5.710453) (xy 1.750811 -6.068087) (xy 1.703895 -6.407483)
(xy 1.587406 -6.663759) (xy 1.568947 -6.685779) (xy 1.465265 -6.837711) (xy 1.439333 -6.922022)
(xy 1.37839 -7.032964) (xy 1.229707 -7.179597) (xy 1.210164 -7.195308) (xy 0.990263 -7.314289)
(xy 0.758675 -7.314387) (xy 0.485547 -7.188946) (xy 0.183306 -6.966292) (xy -0.027285 -6.782791)
(xy -0.131791 -6.641709) (xy -0.160131 -6.484584) (xy -0.148982 -6.316954) (xy -0.112735 -6.064264)
(xy -0.067124 -5.871654) (xy -0.05579 -5.842) (xy -0.050804 -5.775988) (xy -0.129737 -5.737234)
(xy -0.32191 -5.719122) (xy -0.618588 -5.715) (xy -1.239067 -5.715) (xy -1.151308 -5.947825)
(xy -1.113759 -6.233807) (xy -1.182983 -6.537615) (xy -1.333162 -6.820316) (xy -1.538475 -7.042972)
(xy -1.773101 -7.166646) (xy -1.96113 -7.169033) (xy -2.172212 -7.035122) (xy -2.335803 -6.776881)
(xy -2.443983 -6.434629) (xy -2.488834 -6.048679) (xy -2.462438 -5.659348) (xy -2.356875 -5.306953)
(xy -2.335475 -5.263143) (xy -2.227673 -5.086342) (xy -2.14054 -5.044306) (xy -2.067015 -5.086074)
(xy -1.941651 -5.161381) (xy -1.913689 -5.098745) (xy -1.983113 -4.898728) (xy -2.077285 -4.701568)
(xy -2.193904 -4.460195) (xy -2.236316 -4.31561) (xy -2.210071 -4.215229) (xy -2.138083 -4.125553)
(xy -1.873621 -3.900265) (xy -1.558088 -3.77455) (xy -1.149932 -3.735695) (xy -0.894753 -3.745092)
(xy -0.450334 -3.804555) (xy -0.024099 -3.93206) (xy 0.430912 -4.145472) (xy 0.918165 -4.434865)
(xy 1.171178 -4.584994) (xy 1.293992 -4.635894) (xy 1.287201 -4.595888) (xy 1.151398 -4.473296)
(xy 0.907912 -4.291096) (xy 0.401899 -3.964094) (xy -0.050512 -3.748891) (xy -0.500526 -3.624289)
(xy -0.802109 -3.583113) (xy -1.122259 -3.546531) (xy -1.294506 -3.503388) (xy -1.340175 -3.441192)
(xy -1.280592 -3.347448) (xy -1.253067 -3.318934) (xy -1.051824 -3.22714) (xy -0.729712 -3.212376)
(xy -0.314928 -3.271338) (xy 0.164332 -3.40072) (xy 0.508 -3.525368) (xy 0.804333 -3.643755)
(xy 0.550333 -3.429486) (xy 0.098494 -3.120982) (xy -0.363486 -2.93724) (xy -0.805845 -2.885369)
(xy -1.198822 -2.972479) (xy -1.253038 -2.998689) (xy -1.442924 -3.128726) (xy -1.67865 -3.330125)
(xy -1.81573 -3.46372) (xy -2.032774 -3.663245) (xy -2.173024 -3.719324) (xy -2.251258 -3.624911)
(xy -2.282255 -3.372961) (xy -2.284704 -3.240145) (xy -2.329157 -2.927747) (xy -2.474613 -2.595319)
(xy -2.570561 -2.435811) (xy -2.866796 -1.94524) (xy -3.068992 -1.541663) (xy -3.19493 -1.184914)
(xy -3.255225 -0.889) (xy -3.32625 -0.614048) (xy -3.473167 -0.221302) (xy -3.684914 0.261729)
(xy -3.885575 0.678674) (xy -4.186371 1.311071) (xy -4.402353 1.842939) (xy -4.544031 2.313704)
(xy -4.621914 2.762789) (xy -4.646512 3.229622) (xy -4.640976 3.512334) (xy -4.614334 4.188335)
(xy -3.640667 4.971993) (xy -3.139717 5.379869) (xy -2.759198 5.703449) (xy -2.483929 5.959844)
(xy -2.298733 6.166166) (xy -2.188429 6.339526) (xy -2.137836 6.497035) (xy -2.131777 6.655806)
(xy -2.132965 6.671568) (xy -2.168666 6.875182) (xy -2.263276 7.009117) (xy -2.46218 7.129996)
(xy -2.525058 7.160757) (xy -2.891116 7.336515) (xy -2.608484 7.707069) (xy -2.330589 8.024098)
(xy -2.041285 8.235449) (xy -1.69361 8.363692) (xy -1.240601 8.431397) (xy -1.07648 8.443317)
(xy -0.310719 8.441182) (xy 0.375356 8.327381) (xy 1.03823 8.0909) (xy 1.250483 7.989631)
(xy 1.547379 7.816732) (xy 1.879444 7.586195) (xy 2.21756 7.323087) (xy 2.532613 7.052476)
(xy 2.795485 6.799431) (xy 2.97706 6.589019) (xy 3.048222 6.446308) (xy 3.048361 6.441722)
(xy 3.078282 6.36673) (xy 3.105976 6.379753) (xy 3.129816 6.481945) (xy 3.15323 6.719376)
(xy 3.173698 7.057965) (xy 3.188696 7.463629) (xy 3.190021 7.515698) (xy 3.205102 8.048893)
(xy 3.224139 8.444169) (xy 3.252268 8.732936) (xy 3.294625 8.946606) (xy 3.356347 9.116588)
(xy 3.442571 9.274293) (xy 3.489649 9.34797) (xy 3.757338 9.60845) (xy 4.128467 9.755721)
(xy 4.571579 9.778925) (xy 4.693572 9.763479) (xy 4.89288 9.705181) (xy 5.200394 9.584518)
(xy 5.574922 9.418834) (xy 5.975269 9.225472) (xy 5.994203 9.215905) (xy 6.45744 8.984033)
(xy 6.783191 8.826909) (xy 6.969013 8.745466) (xy 7.01246 8.740634) (xy 6.911088 8.813347)
(xy 6.678682 8.954943) (xy 6.426932 9.128271) (xy 6.118128 9.375384) (xy 5.812321 9.647757)
(xy 5.763662 9.694333) (xy 5.423007 10.013968) (xy 5.152548 10.229277) (xy 4.907919 10.360635)
(xy 4.644759 10.428414) (xy 4.318702 10.45299) (xy 4.106333 10.455464) (xy 3.741955 10.448375)
(xy 3.493917 10.41868) (xy 3.309629 10.355425) (xy 3.147954 10.255881) (xy 2.946694 10.077634)
(xy 2.807569 9.892708) (xy 2.792434 9.859549) (xy 2.732286 9.763135) (xy 2.62167 9.686565)
(xy 2.443239 9.627717) (xy 2.179641 9.58447) (xy 1.813529 9.554703) (xy 1.327553 9.536293)
(xy 0.704364 9.52712) (xy 0.056674 9.525) (xy -0.55435 9.526136) (xy -1.017954 9.53065)
(xy -1.356041 9.540202) (xy -1.590515 9.55645) (xy -1.74328 9.581051) (xy -1.836241 9.615666)
(xy -1.891301 9.661952) (xy -1.899993 9.673166) (xy -2.026542 9.793141) (xy -2.101888 9.821333)
(xy -2.217205 9.873323) (xy -2.400208 10.004683) (xy -2.489883 10.079855) (xy -2.903041 10.354442)
(xy -3.355504 10.476577) (xy -3.871389 10.451506) (xy -4.038959 10.416819) (xy -4.306186 10.333909)
(xy -4.590357 10.21924) (xy -4.611237 10.209477) (xy -4.811486 10.130759) (xy -5.129846 10.0232)
(xy -5.520505 9.900431) (xy -5.937654 9.776084) (xy -6.335483 9.663789) (xy -6.66818 9.577177)
(xy -6.889936 9.529878) (xy -6.900334 9.528362) (xy -7.085216 9.486768) (xy -7.366375 9.405716)
(xy -7.698286 9.300472) (xy -8.035424 9.1863) (xy -8.332264 9.078465) (xy -8.543279 8.992233)
(xy -8.614834 8.953473) (xy -8.686427 8.815342) (xy -8.709137 8.604466) (xy -8.69574 8.454651)
(xy -8.674057 8.469396) (xy -8.661721 8.524018) (xy -8.583626 8.716006) (xy -8.513764 8.80138)
(xy -8.355508 8.87148) (xy -8.036447 8.955788) (xy -7.564368 9.052685) (xy -6.947057 9.160556)
(xy -6.288483 9.263483) (xy -5.879992 9.332229) (xy -5.490189 9.411057) (xy -5.17892 9.487333)
(xy -5.072405 9.520226) (xy -4.780975 9.599458) (xy -4.412908 9.669316) (xy -4.134889 9.70529)
(xy -3.807798 9.727865) (xy -3.58472 9.712258) (xy -3.402794 9.649036) (xy -3.273805 9.576071)
(xy -2.929034 9.269874) (xy -2.708413 8.874504) (xy -2.624774 8.42839) (xy -2.690949 7.969961)
(xy -2.714792 7.901975) (xy -2.802226 7.723035) (xy -2.969461 7.426714) (xy -3.202169 7.036392)
(xy -3.486023 6.575448) (xy -3.806693 6.067261) (xy -4.149852 5.535211) (xy -4.379926 5.185015)
(xy -4.765168 4.65126) (xy -5.111827 4.276065) (xy -5.426947 4.05492) (xy -5.717572 3.983314)
(xy -5.990747 4.056737) (xy -6.067658 4.104477) (xy -6.196284 4.176593) (xy -6.275047 4.135744)
(xy -6.350286 3.978644) (xy -6.409651 3.670125) (xy -6.387713 3.289862) (xy -6.293651 2.909244)
(xy -6.181603 2.667) (xy -5.769243 1.919213) (xy -5.439734 1.161363) (xy -5.254707 0.635)
(xy -5.078431 0.104558) (xy -4.936727 -0.291709) (xy -4.816883 -0.582224) (xy -4.706185 -0.79541)
(xy -4.591922 -0.959689) (xy -4.490291 -1.074079) (xy -4.340295 -1.24672) (xy -4.12465 -1.516591)
(xy -3.870235 -1.847593) (xy -3.603929 -2.203624) (xy -3.352609 -2.548582) (xy -3.143156 -2.846366)
(xy -3.002448 -3.060876) (xy -2.973544 -3.111241) (xy -2.94244 -3.227379) (xy -2.918991 -3.451064)
(xy -2.902869 -3.794076) (xy -2.893745 -4.268195) (xy -2.891294 -4.885202) (xy -2.895185 -5.656877)
(xy -2.896994 -5.862907) (xy -2.921 -8.424334) (xy -2.653499 -8.932334) (xy -2.323672 -9.451615)
(xy -1.934898 -9.842568) (xy -1.445416 -10.145322) (xy -1.338926 -10.195577) (xy -0.764596 -10.36977)
(xy -0.133279 -10.41452) (xy 0.519278 -10.339833)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy 7.253111 8.579555) (xy 7.241488 8.629889) (xy 7.196666 8.636) (xy 7.126976 8.605021)
(xy 7.140222 8.579555) (xy 7.240701 8.569422) (xy 7.253111 8.579555)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy 7.450666 8.509) (xy 7.408333 8.551333) (xy 7.366 8.509) (xy 7.408333 8.466666)
(xy 7.450666 8.509)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy 7.789333 8.339666) (xy 7.747 8.382) (xy 7.704666 8.339666) (xy 7.747 8.297333)
(xy 7.789333 8.339666)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -8.504191 8.099893) (xy -8.519029 8.165935) (xy -8.587351 8.285109) (xy -8.63153 8.265145)
(xy -8.636 8.217663) (xy -8.574509 8.102853) (xy -8.552304 8.086266) (xy -8.504191 8.099893)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -8.410223 7.817555) (xy -8.40009 7.918035) (xy -8.410223 7.930444) (xy -8.460557 7.918822)
(xy -8.466667 7.874) (xy -8.435689 7.804309) (xy -8.410223 7.817555)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -8.325927 6.836833) (xy -8.314745 7.010175) (xy -8.325927 7.0485) (xy -8.35683 7.059136)
(xy -8.368632 6.942666) (xy -8.355327 6.822471) (xy -8.325927 6.836833)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -8.410223 5.954888) (xy -8.40009 6.055368) (xy -8.410223 6.067777) (xy -8.460557 6.056155)
(xy -8.466667 6.011333) (xy -8.435689 5.941643) (xy -8.410223 5.954888)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -8.247311 5.295723) (xy -8.304132 5.418666) (xy -8.405169 5.616403) (xy -8.455269 5.671456)
(xy -8.466667 5.618293) (xy -8.418266 5.494019) (xy -8.334996 5.371348) (xy -8.247462 5.267263)
(xy -8.247311 5.295723)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -7.704667 5.122333) (xy -7.747 5.164666) (xy -7.789334 5.122333) (xy -7.747 5.08)
(xy -7.704667 5.122333)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -6.823671 5.088202) (xy -6.826603 5.097694) (xy -6.919384 5.137975) (xy -7.089595 5.161859)
(xy -7.262004 5.164616) (xy -7.361377 5.141519) (xy -7.366 5.131596) (xy -7.291823 5.100919)
(xy -7.109841 5.068851) (xy -7.075606 5.064624) (xy -6.895538 5.058892) (xy -6.823671 5.088202)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy 0.931333 -3.683) (xy 0.889 -3.640667) (xy 0.846666 -3.683) (xy 0.889 -3.725334)
(xy 0.931333 -3.683)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy 1.439333 -3.937) (xy 1.397 -3.894667) (xy 1.354666 -3.937) (xy 1.397 -3.979334)
(xy 1.439333 -3.937)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -1.760869 -6.560016) (xy -1.586353 -6.399017) (xy -1.436849 -6.105421) (xy -1.325929 -5.693834)
(xy -1.309601 -5.493818) (xy -1.367474 -5.420596) (xy -1.38875 -5.418667) (xy -1.535213 -5.359025)
(xy -1.608667 -5.291667) (xy -1.739518 -5.178699) (xy -1.86197 -5.2098) (xy -1.965665 -5.312834)
(xy -2.198787 -5.666805) (xy -2.280608 -6.009645) (xy -2.208143 -6.321266) (xy -2.132578 -6.436043)
(xy -1.947308 -6.576373) (xy -1.760869 -6.560016)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy 1.015915 -6.603784) (xy 1.19215 -6.447166) (xy 1.308729 -6.219262) (xy 1.347988 -5.952711)
(xy 1.292259 -5.680151) (xy 1.154457 -5.465363) (xy 1.000818 -5.315703) (xy 0.871334 -5.267266)
(xy 0.692409 -5.30502) (xy 0.57418 -5.346847) (xy 0.379178 -5.498082) (xy 0.274144 -5.742977)
(xy 0.25986 -6.031249) (xy 0.337107 -6.312616) (xy 0.397401 -6.392334) (xy 0.931333 -6.392334)
(xy 0.973666 -6.35) (xy 1.016 -6.392334) (xy 0.973666 -6.434667) (xy 0.931333 -6.392334)
(xy 0.397401 -6.392334) (xy 0.506664 -6.536795) (xy 0.555145 -6.572606) (xy 0.797691 -6.656477)
(xy 1.015915 -6.603784)) (layer F.SilkS) (width 0.01))
(fp_poly (pts (xy -0.160045 -5.538322) (xy -0.127 -5.503334) (xy -0.145245 -5.430079) (xy -0.201674 -5.418667)
(xy -0.347956 -5.468345) (xy -0.381 -5.503334) (xy -0.362756 -5.576588) (xy -0.306327 -5.588)
(xy -0.160045 -5.538322)) (layer F.SilkS) (width 0.01))
)
(module Capacitors_ThroughHole:C_Disc_D3_P2.5 (layer Composant) (tedit 560D307C) (tstamp 32307ECF)
(at 121.305 91.44)
(descr "Capacitor 3mm Disc, Pitch 2.5mm")
@ -362,129 +513,6 @@
)
)
(module "" (layer Composant) (tedit 4C43F7B1) (tstamp 513C86E6)
(at 25.9 181.9)
(fp_text reference G1 (at 0 12.192) (layer F.SilkS) hide
(effects (font (thickness 0.3048)))
)
(fp_text value LOGO (at 0 -12.192) (layer F.SilkS) hide
(effects (font (thickness 0.3048)))
)
(fp_poly (pts (xy -9.60882 11.47064) (xy -9.56564 -11.34364) (xy 9.779 -11.38682) (xy -9.652 -11.43)
(xy -9.60882 11.47064)) (layer F.SilkS) (width 0.00254))
(fp_poly (pts (xy 4.14528 10.49274) (xy 4.16052 10.49274) (xy 4.5212 10.48004) (xy 4.8006 10.41908)
(xy 5.08508 10.26922) (xy 5.45846 9.9822) (xy 6.00202 9.51738) (xy 6.62686 9.03732)
(xy 7.4295 8.55218) (xy 7.50062 8.51662) (xy 8.14832 8.12546) (xy 8.56996 7.74446)
(xy 8.7122 7.4168) (xy 8.70458 7.33806) (xy 8.65632 7.36346) (xy 8.51408 7.57936)
(xy 8.31342 7.70382) (xy 8.2931 7.70636) (xy 8.11784 7.84098) (xy 7.94258 7.96798)
(xy 7.53872 8.18896) (xy 7.02564 8.43788) (xy 6.5151 8.65886) (xy 6.11886 8.79856)
(xy 5.89788 8.86968) (xy 5.715 8.97128) (xy 5.57022 9.08812) (xy 5.19684 9.26846)
(xy 4.75996 9.41832) (xy 4.40944 9.48182) (xy 4.23926 9.47166) (xy 4.01828 9.37514)
(xy 3.76936 9.08812) (xy 3.75666 9.0678) (xy 3.57632 8.78332) (xy 3.48234 8.46582)
(xy 3.4544 8.01116) (xy 3.47726 7.32282) (xy 3.48996 6.82244) (xy 3.45694 6.3754)
(xy 3.34772 5.97154) (xy 3.26644 5.63372) (xy 3.21564 5.12318) (xy 3.19278 4.8006)
(xy 3.13182 4.61264) (xy 3.1242 4.6101) (xy 3.06832 4.75234) (xy 3.04546 5.18922)
(xy 3.04546 5.3594) (xy 3.0226 6.0071) (xy 2.94132 6.44144) (xy 2.77114 6.76656)
(xy 2.48158 7.0866) (xy 2.3368 7.22122) (xy 1.31064 7.94512) (xy 0.1778 8.35406)
(xy -1.02616 8.44042) (xy -1.61798 8.36168) (xy -2.16662 8.13308) (xy -2.58318 7.71398)
(xy -2.86004 7.33044) (xy -2.53746 7.18566) (xy -2.49682 7.16534) (xy -2.14122 6.88848)
(xy -2.08788 6.51002) (xy -2.08788 6.50748) (xy -2.17424 6.27888) (xy -2.37744 6.0198)
(xy -2.74828 5.67436) (xy -3.34264 5.18414) (xy -3.79222 4.826) (xy -4.2291 4.46278)
(xy -4.48818 4.21132) (xy -4.61264 4.00558) (xy -4.65074 3.78714) (xy -4.65328 3.49504)
(xy -4.61772 2.93878) (xy -4.52882 2.3368) (xy -4.52882 2.33426) (xy -4.3688 1.8161)
(xy -4.10718 1.17602) (xy -3.79476 0.52324) (xy -3.48488 -0.0254) (xy -3.23088 -0.36576)
(xy -3.14198 -0.45466) (xy -3.03022 -0.63246) (xy -3.10388 -0.8509) (xy -3.16992 -1.01346)
(xy -3.15722 -1.22174) (xy -3.0099 -1.5748) (xy -2.77622 -2.04216) (xy -2.48666 -2.5527)
(xy -2.47142 -2.58064) (xy -2.25806 -3.00482) (xy -2.22758 -3.2893) (xy -2.2479 -3.54584)
(xy -2.1971 -3.5814) (xy -2.1971 -5.10286) (xy -2.3622 -5.3467) (xy -2.42062 -5.62102)
(xy -2.45364 -6.0706) (xy -2.45364 -6.16204) (xy -2.39522 -6.53288) (xy -2.18694 -6.86054)
(xy -1.99644 -7.07898) (xy -1.86182 -7.19582) (xy -1.75768 -7.13232) (xy -1.50368 -6.91896)
(xy -1.38938 -6.80466) (xy -1.143 -6.3373) (xy -1.20904 -5.87756) (xy -1.32842 -5.64896)
(xy -1.37922 -5.96646) (xy -1.41986 -6.13918) (xy -1.62052 -6.48716) (xy -1.88976 -6.59384)
(xy -2.15392 -6.4135) (xy -2.27838 -6.02742) (xy -2.11328 -5.51688) (xy -2.02692 -5.34924)
(xy -1.99136 -5.15874) (xy -2.01676 -5.12572) (xy -2.1971 -5.10286) (xy -2.1971 -3.5814)
(xy -2.12852 -3.62966) (xy -1.85674 -3.4163) (xy -1.61798 -3.20802) (xy -1.19634 -2.94386)
(xy -1.04648 -2.88544) (xy -1.04648 -3.38582) (xy -1.22682 -3.46964) (xy -1.22936 -3.47726)
(xy -1.15062 -3.55346) (xy -1.04648 -3.5052) (xy -1.04648 -3.74142) (xy -1.56718 -3.79476)
(xy -1.87198 -3.99542) (xy -1.88722 -4.05638) (xy -1.82626 -4.37642) (xy -1.63576 -4.82346)
(xy -1.59004 -4.9149) (xy -1.524 -5.10794) (xy -1.4732 -5.19938) (xy -1.25984 -5.42544)
(xy -1.19888 -5.47878) (xy -0.93726 -5.63372) (xy -0.56134 -5.65912) (xy -0.31242 -5.64134)
(xy -0.3175 -5.61086) (xy -0.33782 -5.60832) (xy -0.50038 -5.4991) (xy -0.33782 -5.37464)
(xy -0.31242 -5.36702) (xy -0.08382 -5.37972) (xy -0.04572 -5.50672) (xy -0.06096 -5.57022)
(xy 0.12446 -5.54482) (xy 0.59182 -5.33146) (xy 0.6223 -5.31876) (xy 0.99314 -5.14858)
(xy 1.21412 -5.07746) (xy 1.2573 -5.06984) (xy 1.2573 -5.17398) (xy 1.07442 -5.2451)
(xy 1.18618 -5.48132) (xy 1.3208 -5.78104) (xy 1.30048 -6.20268) (xy 1.10236 -6.54558)
(xy 0.76962 -6.68782) (xy 0.5842 -6.62178) (xy 0.35052 -6.3246) (xy 0.24892 -5.8928)
(xy 0.24638 -5.54482) (xy 0.07874 -5.74548) (xy -0.1397 -6.15442) (xy -0.1143 -6.57606)
(xy 0.18796 -6.87832) (xy 0.36068 -6.96214) (xy 0.79502 -7.15264) (xy 1.04648 -7.21868)
(xy 1.20142 -7.18566) (xy 1.22936 -7.16788) (xy 1.35382 -6.95706) (xy 1.36144 -6.90626)
(xy 1.51384 -6.67258) (xy 1.63576 -6.50494) (xy 1.7399 -6.05282) (xy 1.67386 -5.54228)
(xy 1.55956 -5.29082) (xy 1.35128 -5.1816) (xy 1.2573 -5.17398) (xy 1.2573 -5.06984)
(xy 1.28524 -5.06222) (xy 1.53416 -4.9149) (xy 1.66624 -4.78028) (xy 1.6256 -4.64058)
(xy 1.55956 -4.5847) (xy 1.44526 -4.64312) (xy 1.42494 -4.67106) (xy 1.29794 -4.699)
(xy 1.04902 -4.5847) (xy 0.59944 -4.2926) (xy 0.22606 -4.08432) (xy -0.27432 -3.88112)
(xy -0.40386 -3.84302) (xy -1.04648 -3.74142) (xy -1.04648 -3.5052) (xy -0.97282 -3.46964)
(xy -0.96774 -3.46202) (xy -1.04648 -3.38582) (xy -1.04648 -2.88544) (xy -1.01346 -2.87274)
(xy -0.5588 -2.8194) (xy -0.05588 -2.9718) (xy 0.58928 -3.34772) (xy 0.82296 -3.49758)
(xy 1.30556 -3.75158) (xy 1.59512 -3.78714) (xy 1.73736 -3.6195) (xy 1.77038 -3.52552)
(xy 1.9304 -3.17246) (xy 2.159 -2.7051) (xy 2.24536 -2.5273) (xy 2.5019 -1.92278)
(xy 2.67462 -1.39192) (xy 2.83718 -0.90932) (xy 3.05562 -0.50546) (xy 3.51282 0.24638)
(xy 3.83794 1.143) (xy 3.90144 1.44018) (xy 4.00558 2.26568) (xy 4.03606 3.10896)
(xy 3.98018 3.79984) (xy 3.95224 3.9624) (xy 3.9243 4.2799) (xy 3.98526 4.4069)
(xy 4.01066 4.42976) (xy 4.02082 4.60502) (xy 3.8989 4.99618) (xy 3.89636 5.0038)
(xy 3.77444 5.37718) (xy 3.76174 5.61594) (xy 3.85064 5.89534) (xy 3.86588 5.9309)
(xy 4.21132 6.35508) (xy 4.72186 6.55828) (xy 5.27558 6.48716) (xy 5.27812 6.48716)
(xy 5.59054 6.28142) (xy 5.94106 5.95884) (xy 6.23062 5.62356) (xy 6.34746 5.3848)
(xy 6.41604 5.1562) (xy 6.5913 4.79298) (xy 6.64972 4.6863) (xy 6.94944 3.8354)
(xy 7.0104 2.86766) (xy 6.8326 1.74244) (xy 6.41604 0.42164) (xy 6.14426 -0.23114)
(xy 5.8039 -0.82804) (xy 5.35178 -1.39446) (xy 5.29336 -1.4605) (xy 4.54152 -2.46888)
(xy 3.84302 -3.72364) (xy 3.5814 -4.33578) (xy 3.42646 -4.98348) (xy 3.38582 -5.76326)
(xy 3.38074 -6.13664) (xy 3.2639 -7.4168) (xy 2.97434 -8.4328) (xy 2.49428 -9.22274)
(xy 1.8034 -9.8171) (xy 0.88646 -10.25144) (xy 0.45466 -10.36828) (xy -0.50038 -10.414)
(xy -1.38684 -10.17524) (xy -1.62306 -10.05586) (xy -2.23774 -9.58596) (xy -2.68224 -8.91032)
(xy -2.921 -8.42264) (xy -2.921 -3.25374) (xy -3.20548 -2.7813) (xy -3.33756 -2.58064)
(xy -3.69062 -2.09804) (xy -4.09448 -1.59766) (xy -4.11988 -1.56464) (xy -4.5085 -1.07188)
(xy -4.79298 -0.60452) (xy -5.03682 -0.04826) (xy -5.29844 0.71374) (xy -5.35686 0.88646)
(xy -5.59816 1.50114) (xy -5.842 2.01422) (xy -5.8674 2.06248) (xy -6.096 2.47904)
(xy -6.2484 2.76098) (xy -6.30936 2.91084) (xy -6.39826 3.32486) (xy -6.41858 3.74904)
(xy -6.35762 4.01066) (xy -6.31444 4.17322) (xy -6.44144 4.4831) (xy -6.68274 4.83616)
(xy -7.01294 5.02158) (xy -7.5565 5.10286) (xy -7.5946 5.1054) (xy -8.01116 5.16636)
(xy -8.25246 5.24764) (xy -8.36676 5.38988) (xy -8.47852 5.86232) (xy -8.44042 6.61416)
(xy -8.43534 6.6675) (xy -8.39216 7.13994) (xy -8.42264 7.47776) (xy -8.53694 7.87146)
(xy -8.65378 8.27024) (xy -8.70458 8.76554) (xy -8.5471 9.0551) (xy -8.16864 9.19226)
(xy -7.8359 9.26338) (xy -7.366 9.40054) (xy -6.90118 9.54278) (xy -6.35 9.68502)
(xy -5.56768 9.8933) (xy -4.35864 10.32002) (xy -4.10972 10.39114) (xy -4.10972 9.45896)
(xy -4.76758 9.31418) (xy -5.1816 9.19734) (xy -5.57276 9.11098) (xy -5.64642 9.10082)
(xy -6.1087 9.02462) (xy -6.68274 8.92556) (xy -7.25678 8.81888) (xy -7.71652 8.72998)
(xy -7.95528 8.67664) (xy -8.06704 8.5979) (xy -8.15848 8.30326) (xy -8.07212 7.97306)
(xy -8.04926 7.92734) (xy -7.98322 7.52856) (xy -7.99592 6.88594) (xy -8.0899 6.0706)
(xy -8.09752 6.01218) (xy -8.07466 5.64388) (xy -7.84352 5.46862) (xy -7.34822 5.43052)
(xy -6.84022 5.37718) (xy -6.37286 5.0927) (xy -6.14934 4.57708) (xy -6.0833 4.36372)
(xy -5.83946 4.06654) (xy -5.5245 4.0132) (xy -5.31368 4.13766) (xy -4.91744 4.55422)
(xy -4.40436 5.25526) (xy -3.76428 6.25856) (xy -2.86512 7.7343) (xy -2.921 8.24738)
(xy -2.96672 8.5217) (xy -3.17246 9.07288) (xy -3.47218 9.398) (xy -3.60172 9.44626)
(xy -4.10972 9.45896) (xy -4.10972 10.39114) (xy -3.93446 10.44194) (xy -3.3655 10.4902)
(xy -2.93624 10.4013) (xy -2.78384 10.30478) (xy -2.47142 10.06094) (xy -2.28854 9.9187)
(xy -2.10566 9.81964) (xy -2.09042 9.81964) (xy -1.89992 9.70026) (xy -1.85166 9.66724)
(xy -1.4859 9.57326) (xy -0.85598 9.5123) (xy -0.01778 9.48944) (xy 0.97028 9.50976)
(xy 1.65608 9.54278) (xy 2.20472 9.58596) (xy 2.53492 9.64438) (xy 2.71018 9.73582)
(xy 2.794 9.8679) (xy 2.90068 10.02538) (xy 3.19024 10.27938) (xy 3.38836 10.39876)
(xy 3.683 10.4775) (xy 4.14528 10.49274)) (layer F.SilkS) (width 0.00254))
(fp_poly (pts (xy 8.60298 7.112) (xy 8.59282 7.02564) (xy 8.49884 6.94182) (xy 8.509 7.02564)
(xy 8.60298 7.112)) (layer F.SilkS) (width 0.00254))
(fp_poly (pts (xy 8.33882 6.94182) (xy 8.382 6.89864) (xy 8.33882 6.858) (xy 8.29564 6.89864)
(xy 8.33882 6.94182)) (layer F.SilkS) (width 0.00254))
(fp_poly (pts (xy 8.16864 6.858) (xy 8.21182 6.81482) (xy 8.16864 6.77164) (xy 8.128 6.81482)
(xy 8.16864 6.858)) (layer F.SilkS) (width 0.00254))
(fp_poly (pts (xy 7.94766 6.68782) (xy 7.92226 6.63702) (xy 7.747 6.43382) (xy 7.5946 6.28396)
(xy 7.45998 6.17982) (xy 7.48284 6.23062) (xy 7.66064 6.43382) (xy 7.81304 6.58114)
(xy 7.94766 6.68782)) (layer F.SilkS) (width 0.00254))
(fp_poly (pts (xy 7.4168 6.096) (xy 7.40664 6.00964) (xy 7.31266 5.92582) (xy 7.32282 6.00964)
(xy 7.4168 6.096)) (layer F.SilkS) (width 0.00254))
(fp_poly (pts (xy 7.14248 5.53466) (xy 7.17042 5.5245) (xy 7.1755 5.48894) (xy 7.17042 5.1435)
(xy 7.14756 5.11048) (xy 7.13486 5.334) (xy 7.14248 5.53466)) (layer F.SilkS) (width 0.00254))
)
(module HC-18UH (layer Composant) (tedit 200000) (tstamp 32307EC0)
(at 113.665 95.25 270)
(descr "Quartz boitier HC-18 horizontal")

894
polygon/clipper.cpp
View File

File diff suppressed because it is too large Load Diff

91
polygon/clipper.hpp
View File

@ -1,10 +1,10 @@
/*******************************************************************************
* *
* Author : Angus Johnson *
* Version : 6.2.1 *
* Date : 31 October 2014 *
* Version : 6.4.0 *
* Date : 2 July 2015 *
* Website : http://www.angusj.com *
* Copyright : Angus Johnson 2010-2014 *
* Copyright : Angus Johnson 2010-2015 *
* *
* License: *
* Use, modification & distribution is subject to Boost Software License Ver 1. *
@ -34,7 +34,7 @@
#ifndef clipper_hpp
#define clipper_hpp
#define CLIPPER_VERSION "6.2.0"
#define CLIPPER_VERSION "6.2.6"
//use_int32: When enabled 32bit ints are used instead of 64bit ints. This
//improve performance but coordinate values are limited to the range +/- 46340
@ -44,12 +44,13 @@
//#define use_xyz
//use_lines: Enables line clipping. Adds a very minor cost to performance.
//#define use_lines
#define use_lines
//use_deprecated: Enables temporary support for the obsolete functions
//#define use_deprecated
#include <vector>
#include <list>
#include <set>
#include <stdexcept>
#include <cstring>
@ -200,7 +201,6 @@ enum EdgeSide { esLeft = 1, esRight = 2};
struct TEdge;
struct IntersectNode;
struct LocalMinimum;
struct Scanbeam;
struct OutPt;
struct OutRec;
struct Join;
@ -220,7 +220,7 @@ class ClipperBase
public:
ClipperBase();
virtual ~ClipperBase();
bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed);
virtual bool AddPath(const Path &pg, PolyType PolyTyp, bool Closed);
bool AddPaths(const Paths &ppg, PolyType PolyTyp, bool Closed);
virtual void Clear();
IntRect GetBounds();
@ -229,12 +229,18 @@ public:
protected:
void DisposeLocalMinimaList();
TEdge* AddBoundsToLML(TEdge *e, bool IsClosed);
void PopLocalMinima();
virtual void Reset();
TEdge* ProcessBound(TEdge* E, bool IsClockwise);
void DoMinimaLML(TEdge* E1, TEdge* E2, bool IsClosed);
TEdge* DescendToMin(TEdge *&E);
void AscendToMax(TEdge *&E, bool Appending, bool IsClosed);
void InsertScanbeam(const cInt Y);
bool PopScanbeam(cInt &Y);
bool LocalMinimaPending();
bool PopLocalMinima(cInt Y, const LocalMinimum *&locMin);
OutRec* CreateOutRec();
void DisposeAllOutRecs();
void DisposeOutRec(PolyOutList::size_type index);
void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2);
void DeleteFromAEL(TEdge *e);
void UpdateEdgeIntoAEL(TEdge *&e);
typedef std::vector<LocalMinimum> MinimaList;
MinimaList::iterator m_CurrentLM;
@ -242,8 +248,13 @@ protected:
bool m_UseFullRange;
EdgeList m_edges;
bool m_PreserveCollinear;
bool m_HasOpenPaths;
bool m_PreserveCollinear;
bool m_HasOpenPaths;
PolyOutList m_PolyOuts;
TEdge *m_ActiveEdges;
typedef std::priority_queue<cInt> ScanbeamList;
ScanbeamList m_Scanbeam;
};
//------------------------------------------------------------------------------
@ -251,16 +262,21 @@ class Clipper : public virtual ClipperBase
{
public:
Clipper(int initOptions = 0);
~Clipper();
bool Execute(ClipType clipType,
Paths &solution,
PolyFillType subjFillType = pftEvenOdd,
PolyFillType clipFillType = pftEvenOdd);
Paths &solution,
PolyFillType fillType = pftEvenOdd);
bool Execute(ClipType clipType,
PolyTree &polytree,
PolyFillType subjFillType = pftEvenOdd,
PolyFillType clipFillType = pftEvenOdd);
bool ReverseSolution() {return m_ReverseOutput;};
Paths &solution,
PolyFillType subjFillType,
PolyFillType clipFillType);
bool Execute(ClipType clipType,
PolyTree &polytree,
PolyFillType fillType = pftEvenOdd);
bool Execute(ClipType clipType,
PolyTree &polytree,
PolyFillType subjFillType,
PolyFillType clipFillType);
bool ReverseSolution() { return m_ReverseOutput; };
void ReverseSolution(bool value) {m_ReverseOutput = value;};
bool StrictlySimple() {return m_StrictSimple;};
void StrictlySimple(bool value) {m_StrictSimple = value;};
@ -269,17 +285,14 @@ public:
void ZFillFunction(ZFillCallback zFillFunc);
#endif
protected:
void Reset();
virtual bool ExecuteInternal();
private:
PolyOutList m_PolyOuts;
JoinList m_Joins;
JoinList m_GhostJoins;
IntersectList m_IntersectList;
ClipType m_ClipType;
typedef std::priority_queue<cInt> ScanbeamList;
ScanbeamList m_Scanbeam;
TEdge *m_ActiveEdges;
JoinList m_Joins;
JoinList m_GhostJoins;
IntersectList m_IntersectList;
ClipType m_ClipType;
typedef std::list<cInt> MaximaList;
MaximaList m_Maxima;
TEdge *m_SortedEdges;
bool m_ExecuteLocked;
PolyFillType m_ClipFillType;
@ -293,31 +306,25 @@ private:
void SetWindingCount(TEdge& edge);
bool IsEvenOddFillType(const TEdge& edge) const;
bool IsEvenOddAltFillType(const TEdge& edge) const;
void InsertScanbeam(const cInt Y);
cInt PopScanbeam();
void InsertLocalMinimaIntoAEL(const cInt botY);
void InsertEdgeIntoAEL(TEdge *edge, TEdge* startEdge);
void AddEdgeToSEL(TEdge *edge);
bool PopEdgeFromSEL(TEdge *&edge);
void CopyAELToSEL();
void DeleteFromSEL(TEdge *e);
void DeleteFromAEL(TEdge *e);
void UpdateEdgeIntoAEL(TEdge *&e);
void SwapPositionsInSEL(TEdge *edge1, TEdge *edge2);
bool IsContributing(const TEdge& edge) const;
bool IsTopHorz(const cInt XPos);
void SwapPositionsInAEL(TEdge *edge1, TEdge *edge2);
void DoMaxima(TEdge *e);
void ProcessHorizontals(bool IsTopOfScanbeam);
void ProcessHorizontal(TEdge *horzEdge, bool isTopOfScanbeam);
void ProcessHorizontals();
void ProcessHorizontal(TEdge *horzEdge);
void AddLocalMaxPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
OutPt* AddLocalMinPoly(TEdge *e1, TEdge *e2, const IntPoint &pt);
OutRec* GetOutRec(int idx);
void AppendPolygon(TEdge *e1, TEdge *e2);
void IntersectEdges(TEdge *e1, TEdge *e2, IntPoint &pt);
OutRec* CreateOutRec();
OutPt* AddOutPt(TEdge *e, const IntPoint &pt);
void DisposeAllOutRecs();
void DisposeOutRec(PolyOutList::size_type index);
OutPt* GetLastOutPt(TEdge *e);
bool ProcessIntersections(const cInt topY);
void BuildIntersectList(const cInt topY);
void ProcessIntersectList();
@ -328,6 +335,7 @@ private:
void DisposeIntersectNodes();
bool FixupIntersectionOrder();
void FixupOutPolygon(OutRec &outrec);
void FixupOutPolyline(OutRec &outrec);
bool IsHole(TEdge *e);
bool FindOwnerFromSplitRecs(OutRec &outRec, OutRec *&currOrfl);
void FixHoleLinkage(OutRec &outrec);
@ -339,7 +347,8 @@ private:
void JoinCommonEdges();
void DoSimplePolygons();
void FixupFirstLefts1(OutRec* OldOutRec, OutRec* NewOutRec);
void FixupFirstLefts2(OutRec* OldOutRec, OutRec* NewOutRec);
void FixupFirstLefts2(OutRec* InnerOutRec, OutRec* OuterOutRec);
void FixupFirstLefts3(OutRec* OldOutRec, OutRec* NewOutRec);
#ifdef use_xyz
void SetZ(IntPoint& pt, TEdge& e1, TEdge& e2);
#endif