diff --git a/paperbot_ee_autoroute/__pycache__/paperbot_draw.cpython-36.pyc b/paperbot_ee_autoroute/__pycache__/paperbot_draw.cpython-36.pyc index 4d730b385badff913874af320b0b7fc510ceed54..5d7a6291f4b167c9ce2b62597dc32a8dfe7c9259 100644 Binary files a/paperbot_ee_autoroute/__pycache__/paperbot_draw.cpython-36.pyc and b/paperbot_ee_autoroute/__pycache__/paperbot_draw.cpython-36.pyc differ diff --git a/paperbot_ee_autoroute/paperbot_draw.py b/paperbot_ee_autoroute/paperbot_draw.py index 18879b4ba00d31981bc95b51c21ae797deee3bbc..cdfc16813922022a589c4069b1c79772096e9088 100644 --- a/paperbot_ee_autoroute/paperbot_draw.py +++ b/paperbot_ee_autoroute/paperbot_draw.py @@ -130,7 +130,7 @@ class post_process(): x2,y2=pt2[1],pt2[1] if x1==x2: - theta=np.pi/2 + theta=-np.pi/2 #x= number a=1 b=-x1 @@ -199,9 +199,9 @@ class post_process(): e2=[end_x+sinw,end_y-cosw] - self.msp.add_line(s1,e1,dxfattribs={ + self.msp.add_line(s1i,e1i,dxfattribs={ 'layer':'Circuit', 'linetype':'DASHDOT'}) - self.msp.add_line(s2,e2,dxfattribs={ + self.msp.add_line(s1o,e1o,dxfattribs={ 'layer':'Circuit', 'linetype':'DASHDOT'}) diff --git a/paperbot_ee_autoroute/paperbot_ee.rules b/paperbot_ee_autoroute/paperbot_ee.rules index bbf0b0ff789fe663fd9d6b9fbcb5fc4db56d2683..aa2210917e69ba418b1b8b0fbd904d2e0ee0efc3 100644 --- a/paperbot_ee_autoroute/paperbot_ee.rules +++ b/paperbot_ee_autoroute/paperbot_ee.rules @@ -11,7 +11,7 @@ (via_costs 50) (plane_via_costs 5) (start_ripup_costs 100) - (start_pass_no 81) + (start_pass_no 91) (layer_rule F.Cu (active on) (preferred_direction vertical) diff --git a/paperbot_ee_autoroute/route_text.dxf b/paperbot_ee_autoroute/route_text.dxf index 4d62862c3fdf14429397e368914e7931ca0eaea7..eb313c4ba6f984005770f38c292572ab50392d50 100644 --- a/paperbot_ee_autoroute/route_text.dxf +++ b/paperbot_ee_autoroute/route_text.dxf @@ -17,7 +17,7 @@ $MEASUREMENT 9 $TDUPDATE 40 -2458705.5640972224 +2458705.571111111 9 $DWGCODEPAGE 3 @@ -25,7 +25,7 @@ ANSI_1252 9 $VERSIONGUID 2 -C86560B4-BAE4-11E9-978A-7470FDECECE4 +315F5506-BAE6-11E9-978A-7470FDECECE4 0 ENDSEC 0 @@ -35,13 +35,13 @@ CLASSES 0 CLASS 1 -ACDBDICTIONARYWDFLT +MLEADERSTYLE 2 -AcDbDictionaryWithDefault +AcDbMLeaderStyle 3 -ObjectDBX Classes +ACDB_MLEADERSTYLE_CLASS 90 -0 +4095 280 0 281 @@ -49,13 +49,13 @@ ObjectDBX Classes 0 CLASS 1 -MLEADERSTYLE +ACDBDICTIONARYWDFLT 2 -AcDbMLeaderStyle +AcDbDictionaryWithDefault 3 -ACDB_MLEADERSTYLE_CLASS +ObjectDBX Classes 90 -4095 +0 280 0 281 @@ -5863,9 +5863,9 @@ AcDbLine 20 82.13154615631889 11 -32.72974332780268 +113.02541434201778 21 -59.369300935907944 +69.90884615631889 0 LINE 5 @@ -5887,9 +5887,9 @@ AcDbLine 20 81.16845384368112 11 -30.210913101674816 +113.29458565798221 21 -58.270290284240765 +68.94575384368112 0 LINE 5 @@ -5907,13 +5907,13 @@ DASHDOT 100 AcDbLine 10 -32.72974332780268 +113.095611354279 20 -59.369300935907944 +69.92313676981667 11 -63.42823913971739 +106.569011354279 21 -63.4007 +63.396536769816656 0 LINE 5 @@ -5931,13 +5931,13 @@ DASHDOT 100 AcDbLine 10 -30.210913101674816 +113.22438864572099 20 -58.270290284240765 +68.93146323018334 11 -62.37244613979739 +106.69778864572099 21 -62.40070000000001 +62.404863230183345 0 LINE 5 @@ -5955,11 +5955,11 @@ DASHDOT 100 AcDbLine 10 -63.42823913971739 +106.6334 20 63.4007 11 -91.84307339070182 +91.8657 21 63.4007 0 @@ -5979,13 +5979,13 @@ DASHDOT 100 AcDbLine 10 -62.37244613979739 +106.6334 20 -62.40070000000001 +62.4007 11 -91.88757060786038 +91.8657 21 -62.40070000000001 +62.4007 0 LINE 5 @@ -6003,9 +6003,9 @@ DASHDOT 100 AcDbLine 10 -91.84307339070182 +91.82129071333289 20 -63.4007 +63.39872391032733 11 88.98559071333288 21 @@ -6027,9 +6027,9 @@ DASHDOT 100 AcDbLine 10 -91.88757060786038 +91.91010928666712 20 -62.40070000000001 +62.402676089672674 11 89.07440928666712 21 @@ -6055,9 +6055,9 @@ AcDbLine 20 60.552318748293175 11 -65.43255477145112 +91.53639476110153 21 -65.4995 +65.48681874829317 0 LINE 5 @@ -6079,9 +6079,9 @@ AcDbLine 20 59.57768125170682 11 -64.56837484495514 +91.31260523889846 21 -64.4995 +64.51218125170682 0 LINE 5 @@ -6099,11 +6099,11 @@ DASHDOT 100 AcDbLine 10 -65.43255477145112 +91.4245 20 65.4995 11 -107.04486155847233 +107.035 21 65.4995 0 @@ -6123,11 +6123,11 @@ DASHDOT 100 AcDbLine 10 -64.56837484495514 +91.4245 20 64.4995 11 -107.02536958864232 +107.035 21 64.4995 0 @@ -6147,13 +6147,13 @@ DASHDOT 100 AcDbLine 10 -107.04486155847233 +107.05448456692423 20 -65.4995 +65.49912020740936 11 -115.15123078010187 +108.63228456692423 21 -65.17956481728437 +67.07692020740936 0 LINE 5 @@ -6171,13 +6171,13 @@ DASHDOT 100 AcDbLine 10 -107.02536958864232 +107.01551543307576 20 -64.4995 +64.49987979259063 11 -115.1176757304527 +108.59331543307576 21 -64.18761148828978 +66.07767979259063 0 LINE 5 @@ -6195,13 +6195,13 @@ DASHDOT 100 AcDbLine 10 -115.15123078010187 +108.75223864396249 20 -65.17956481728437 +67.05746337279086 11 --6.260231476294872 +108.75223864396249 21 -100.80992734040089 +76.51736337279087 0 LINE 5 @@ -6219,13 +6219,13 @@ DASHDOT 100 AcDbLine 10 -115.1176757304527 +108.4733613560375 20 -64.18761148828978 +66.09713662720912 11 --6.626767944552417 +108.4733613560375 21 -99.17603356180646 +75.55703662720913 0 LINE 5 @@ -6243,9 +6243,9 @@ DASHDOT 100 AcDbLine 10 --6.260231476294872 +108.71469969719057 20 -100.80992734040089 +76.52670633470106 11 103.10189969719058 21 @@ -6267,9 +6267,9 @@ DASHDOT 100 AcDbLine 10 --6.626767944552417 +108.51090030280942 20 -99.17603356180646 +75.54769366529894 11 102.89810030280942 21