Index: geo_cases.dot =================================================================== --- geo_cases.dot (revision 893) +++ geo_cases.dot (revision 894) @@ -12,8 +12,8 @@ in1 [label="one end\noutside" shape=square] in2 [label="both ends\ninside" shape=square] - cross0 [label="S1\ncrossing\nor too\nclose to\nobstacle\n"] - cross1 [label="S2\ncrossing\nobstacle"] + cross0 [label="S1\ncrossing\nor too\nclose to\nobstacle\nCW or CCW"] + cross1 [label="S2\ncrossing\nobstacle\nCW or CCW"] cross2 [label="S3\ncrossing\nor too\nclose to\nobstacle\n"] Index: geo_cases.png =================================================================== Cannot display: file marked as a binary type. svn:mime-type = application/octet-stream Index: geo_hpierce.lht =================================================================== --- geo_hpierce.lht (revision 893) +++ geo_hpierce.lht (revision 894) @@ -253,6 +253,60 @@ clearline=1 } } + ha:line.4869 { + x1=55.5mm; y1=14.25mm; x2=58.0mm; y2=14.25mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.4942 { + x1=76.25mm; y1=0.75mm; x2=76.25mm; y2=5.75mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.4945 { + x1=74.5mm; y1=1.5mm; x2=78.0mm; y2=5.0mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.4948 { + x1=74.5mm; y1=5.0mm; x2=77.75mm; y2=1.75mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.4951 { + x1=73.75mm; y1=3.25mm; x2=78.5mm; y2=3.25mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.5020 { + x1=71.5mm; y1=9.5mm; x2=71.5mm; y2=14.5mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.5023 { + x1=69.75mm; y1=10.25mm; x2=73.25mm; y2=13.75mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.5026 { + x1=69.75mm; y1=13.75mm; x2=73.0mm; y2=10.5mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.5029 { + x1=69.0mm; y1=12.0mm; x2=73.75mm; y2=12.0mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } ha:arc.4684 { x=2.0mm; y=19.5mm; width=0.6mm; height=0.6mm; astart=0.000000; adelta=360.000000; thickness=0.8mm; clearance=50.0mil; ha:flags { @@ -466,12 +520,18 @@ clearline=1 } } - ha:line.3737 { - x1=88.0mm; y1=12.75mm; x2=78.25mm; y2=6.5mm; thickness=0.35mm; clearance=50.0mil; + ha:line.5053 { + x1=85.0mm; y1=9.5mm; x2=88.0mm; y2=12.75mm; thickness=0.35mm; clearance=50.0mil; ha:flags { clearline=1 } } + ha:line.5056 { + x1=78.25mm; y1=6.5mm; x2=85.0mm; y2=9.5mm; thickness=0.35mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } ha:text.2044 { string=N1; x=16.5mm; y=8.75mm; scale=100; fid=0; ha:flags { @@ -678,30 +738,66 @@ clearline=1 } } - ha:line.3725 { - x1=78.25mm; y1=6.5mm; x2=83.25mm; y2=14.25mm; thickness=0.15mm; clearance=50.0mil; + ha:line.4978 { + x1=81.75mm; y1=16.75mm; x2=86.0mm; y2=17.75mm; thickness=0.15mm; clearance=50.0mil; ha:flags { clearline=1 } } - ha:line.3728 { - x1=83.25mm; y1=14.25mm; x2=85.0mm; y2=15.75mm; thickness=0.15mm; clearance=50.0mil; + ha:line.4981 { + x1=74.5mm; y1=1.5mm; x2=69.75mm; y2=10.25mm; thickness=0.15mm; clearance=50.0mil; ha:flags { clearline=1 } } - ha:line.3731 { - x1=85.0mm; y1=15.75mm; x2=86.5mm; y2=16.75mm; thickness=0.15mm; clearance=50.0mil; + ha:line.4984 { + x1=69.75mm; y1=10.25mm; x2=69.0mm; y2=12.0mm; thickness=0.15mm; clearance=50.0mil; ha:flags { clearline=1 } } - ha:line.3734 { - x1=86.5mm; y1=16.75mm; x2=88.25mm; y2=16.0mm; thickness=0.15mm; clearance=50.0mil; + ha:line.4987 { + x1=69.0mm; y1=12.0mm; x2=69.75mm; y2=13.75mm; thickness=0.15mm; clearance=50.0mil; ha:flags { clearline=1 } } + ha:line.4990 { + x1=69.75mm; y1=13.75mm; x2=71.5mm; y2=14.5mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.4993 { + x1=71.5mm; y1=14.5mm; x2=81.75mm; y2=16.75mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.4996 { + x1=76.25mm; y1=0.75mm; x2=74.5mm; y2=1.5mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.4999 { + x1=77.75mm; y1=1.75mm; x2=76.25mm; y2=0.75mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.5047 { + x1=77.75mm; y1=1.75mm; x2=79.2mm; y2=3.3mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } + ha:line.5050 { + x1=79.2mm; y1=3.3mm; x2=78.25mm; y2=6.5mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } ha:arc.1856 { x=55.0mm; y=17.75mm; width=0.5mm; height=0.5mm; astart=0.000000; adelta=360.000000; thickness=0.15mm; clearance=50.0mil; ha:flags { @@ -736,6 +832,12 @@ clearline=1 } } + ha:line.5032 { + x1=47.25mm; y1=6.5mm; x2=48.2mm; y2=3.3mm; thickness=0.15mm; clearance=50.0mil; + ha:flags { + clearline=1 + } + } ha:text.3177 { string=TODO!!; x=52.25mm; y=4.75mm; scale=100; fid=0; ha:flags { @@ -743,6 +845,62 @@ } rot = 0.000000 } + ha:text.4864 { + string=P1; x=54.85mm; y=8.85mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } + ha:text.4865 { + string=P2; x=48.65mm; y=1.85mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } + ha:text.4873 { + string=P1; x=85.75mm; y=8.25mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } + ha:text.4926 { + string=P2; x=79.75mm; y=2.25mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } + ha:text.5060 { + string=P0; x=45.15mm; y=7.6mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } + ha:text.5062 { + string=P0; x=76.4mm; y=7.6mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } + ha:text.5064 { + string=P4; x=2.2007874in; y=17.1mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } + ha:text.5066 { + string=P4; x=86.9mm; y=17.1mm; scale=100; fid=0; + ha:flags { + clearline=1 + } + rot = 0.000000 + } } color = {#548b54} } @@ -823,10 +981,10 @@ ha:design { text_font_id = 0 text_scale = 100 - via_thickness = 275.60 mil + via_thickness = 137.80 mil via_drilling_hole = 47.24 mil text_thickness = 0 - line_thickness = 150.00 um + line_thickness = 350.00 um clearance = 25.00 mil } ha:editor {