From 2df818b844b875af3f5512990eb8888b700b03f4 Mon Sep 17 00:00:00 2001 From: jean-pierre charras Date: Thu, 22 Dec 2011 09:07:50 +0100 Subject: [PATCH] Fix issue in GPcb footprints import. Better code in test connections in zones. Very minor other fixes --- demos/interf_u/interf_u.brd | 2078 ++++++++++---------- eeschema/files-io.cpp | 3 +- eeschema/sch_collectors.cpp | 14 +- pcbnew/connect.cpp | 4 - pcbnew/files.cpp | 6 +- pcbnew/gpcb_exchange.cpp | 29 +- pcbnew/ioascii.cpp | 2 +- pcbnew/muonde.cpp | 2 - pcbnew/pcbplot.cpp | 7 +- pcbnew/xchgmod.cpp | 6 +- pcbnew/zones_polygons_test_connections.cpp | 104 +- polygon/PolyLine.cpp | 2 +- 12 files changed, 1138 insertions(+), 1119 deletions(-) diff --git a/demos/interf_u/interf_u.brd b/demos/interf_u/interf_u.brd index 31813c8c9a..a778de17e7 100644 --- a/demos/interf_u/interf_u.brd +++ b/demos/interf_u/interf_u.brd @@ -1,6 +1,6 @@ -PCBNEW-BOARD Version 1 date 02/04/2011 15:04:20 +PCBNEW-BOARD Version 1 date 20/12/2011 20:20:18 -# Created by Pcbnew(2011-03-30 BZR 2935)-testing +# Created by Pcbnew(2011-12-16 BZR 3311)-testing $GENERAL encoding utf-8 @@ -9,7 +9,7 @@ Ly 1FFF8001 EnabledLayers 1FFF8001 Links 200 NoConn 0 -Di 27950 13474 85202 56221 +Di 27262 9801 79721 77260 Ndraw 19 Ntrack 779 Nzone 0 @@ -21,7 +21,7 @@ $EndGENERAL $SHEETDESCR Sheet A4 11700 8267 Title "Demo" -Date "2 apr 2011" +Date "20 dec 2011" Rev "2.C" Comp "Kicad" Comment1 "" @@ -641,7 +641,7 @@ AddNet "GND" AddNet "VCC" $EndNCLASS $MODULE -Po 81250 50500 0 15 4C43F7B1 4C34C452 ~~ +Po 63950 72000 0 15 4C43F7B1 4C34C452 ~~ Li Sc 4C34C452 AR @@ -4327,51 +4327,71 @@ Of 0.000000 0.000000 0.000000 Ro 0.000000 0.000000 0.000000 $EndSHAPE3D $EndMODULE DB25FC -$MIREPCB -Po 1 28 29200 53950 2500 150 00000000 -$EndMIREPCB -$MIREPCB -Po 0 28 79750 18250 5000 50 00000000 -$EndMIREPCB +$COTATION +Ge 0 25 0 +Va 39000 +Te "99,060 mm" +Po 29900 33050 600 800 79 2700 1 +Sb 0 29150 13500 29150 52500 79 +Sd 0 31250 52500 27750 52500 79 +Sg 0 31250 13500 27750 13500 79 +S1 0 29150 52500 28920 52057 79 +S2 0 29150 52500 29380 52057 79 +S3 0 29150 13500 28920 13943 79 +S4 0 29150 13500 29380 13943 79 +$endCOTATION +$COTATION +Ge 0 25 0 +Va 45500 +Te "115,570 mm" +Po 54000 10501 600 800 83 0 1 +Sb 0 31250 11201 76750 11201 83 +Sd 0 76750 13500 76750 9801 83 +Sg 0 31250 13500 31250 9801 83 +S1 0 76750 11201 76307 11431 83 +S2 0 76750 11201 76307 10971 83 +S3 0 31250 11201 31693 11431 83 +S4 0 31250 11201 31693 10971 83 +$endCOTATION $TEXTPCB Te "1" Po 33250 14500 600 800 120 0 -De 0 0 B98C Normal +De 0 0 B98C Normal C $EndTEXTPCB $TEXTPCB Te "2" Po 32250 15500 600 800 120 0 -De 15 1 B98C Normal +De 15 1 B98C Normal C $EndTEXTPCB $TEXTPCB Te "INTERF_U" Po 74250 18000 600 800 120 900 -De 0 0 47 Normal +De 0 0 47 Normal C $EndTEXTPCB $TEXTPCB Te "INTERF_U" Po 72250 18000 600 800 120 900 -De 15 1 47 Normal +De 15 1 47 Normal C $EndTEXTPCB $TEXTPCB Te "V02" Po 69250 15000 600 800 150 0 -De 0 0 0 Normal +De 0 0 0 Normal C $EndTEXTPCB $TEXTPCB Te "V02" Po 69250 15000 600 800 150 0 -De 15 1 0 Normal +De 15 1 0 Normal C $EndTEXTPCB $TEXTPCB Te "INTERF_U" Po 72750 50000 600 800 150 0 -De 21 1 0 Normal +De 21 1 0 Normal C $EndTEXTPCB $TEXTPCB Te "V02" Po 72250 51500 600 800 150 0 -De 21 1 0 Normal +De 21 1 0 Normal C $EndTEXTPCB $DRAWSEGMENT Po 0 35750 52500 35750 55500 50 @@ -4411,203 +4431,203 @@ De 28 0 0 0 0 $EndDRAWSEGMENT $TRACK Po 0 50250 36000 50750 35500 170 -1 -De 0 0 1 0 400800 +De 0 0 1 0 800 Po 0 50750 35500 56250 35500 170 -1 -De 0 0 1 0 800400 +De 0 0 1 0 400 Po 0 71000 37500 71000 37550 170 -1 De 0 0 2 0 0 Po 0 71000 37500 69000 35500 170 -1 De 0 0 2 0 0 Po 0 71750 38300 71000 37550 170 -1 -De 0 0 2 0 400800 +De 0 0 2 0 800 Po 0 68250 35500 69000 35500 170 -1 -De 0 0 2 0 400800 +De 0 0 2 0 800 Po 0 67750 28000 70250 28000 170 -1 De 0 0 3 0 0 Po 0 67250 28500 67750 28000 170 -1 -De 0 0 3 0 400800 +De 0 0 3 0 800 Po 0 71300 29050 72750 29050 170 -1 De 0 0 3 0 0 Po 0 72750 29050 72750 29120 170 -1 -De 0 0 3 0 800400 +De 0 0 3 0 400 Po 0 70250 28000 71300 29050 170 -1 De 0 0 3 0 0 -Po 0 71250 29500 71750 29500 170 -1 -De 0 0 4 0 0 -Po 0 67250 29500 67750 29000 170 -1 -De 0 0 4 0 400800 -Po 0 71750 29500 71750 29600 170 -1 -De 0 0 4 0 800400 -Po 0 67750 29000 70750 29000 170 -1 -De 0 0 4 0 0 Po 0 70750 29000 71250 29500 170 -1 De 0 0 4 0 0 +Po 0 67750 29000 70750 29000 170 -1 +De 0 0 4 0 0 +Po 0 71750 29500 71750 29600 170 -1 +De 0 0 4 0 400 +Po 0 67250 29500 67750 29000 170 -1 +De 0 0 4 0 800 +Po 0 71250 29500 71750 29500 170 -1 +De 0 0 4 0 0 Po 0 71750 30500 71750 30650 170 -1 -De 0 0 5 0 800400 +De 0 0 5 0 400 Po 0 68250 30500 71750 30500 170 -1 -De 0 0 5 0 400800 +De 0 0 5 0 800 Po 0 69350 32000 69550 31800 170 -1 De 0 0 6 0 0 Po 0 67250 31500 67750 32000 170 -1 -De 0 0 6 0 400800 +De 0 0 6 0 800 Po 0 67750 32000 69350 32000 170 -1 De 0 0 6 0 0 Po 0 71750 31800 71750 31750 170 -1 -De 0 0 6 0 800400 +De 0 0 6 0 400 Po 0 69550 31800 71750 31800 170 -1 De 0 0 6 0 0 -Po 0 71000 32800 71750 32850 170 -1 -De 0 0 7 0 800400 +Po 0 68250 32500 70700 32500 170 -1 +De 0 0 7 0 800 Po 0 70700 32500 71000 32800 170 -1 De 0 0 7 0 0 -Po 0 68250 32500 70700 32500 170 -1 -De 0 0 7 0 400800 +Po 0 71000 32800 71750 32850 170 -1 +De 0 0 7 0 400 Po 0 71100 33900 71750 33900 170 -1 De 0 0 8 0 0 Po 0 71750 33900 71750 33950 170 -1 -De 0 0 8 0 800400 +De 0 0 8 0 400 Po 0 68250 33500 70700 33500 170 -1 -De 0 0 8 0 400800 +De 0 0 8 0 800 Po 0 70700 33500 71100 33900 170 -1 De 0 0 8 0 0 Po 0 67250 33500 67750 34000 170 -1 -De 0 0 9 0 400800 +De 0 0 9 0 800 Po 0 71250 35000 71750 35000 170 -1 -De 0 0 9 0 800400 +De 0 0 9 0 400 Po 0 70250 34000 71250 35000 170 -1 De 0 0 9 0 0 Po 0 67750 34000 70250 34000 170 -1 De 0 0 9 0 0 +Po 0 71750 36000 71750 36100 170 -1 +De 0 0 10 0 400 +Po 0 68250 34500 70250 34500 170 -1 +De 0 0 10 0 800 Po 0 70250 34500 71750 36000 170 -1 De 0 0 10 0 0 -Po 0 68250 34500 70250 34500 170 -1 -De 0 0 10 0 400800 -Po 0 71750 36000 71750 36100 170 -1 -De 0 0 10 0 800400 Po 0 70750 33000 71250 33500 170 -1 De 15 0 11 0 0 Po 0 66750 33000 70250 33000 170 -1 De 0 0 11 0 0 Po 0 66250 33500 66750 33000 170 -1 -De 0 0 11 0 400800 +De 0 0 11 0 800 Po 0 71250 36500 71750 37000 170 -1 De 15 0 11 0 0 Po 0 71750 37000 71750 37200 170 -1 -De 15 0 11 0 800400 +De 15 0 11 0 400 Po 3 70250 33000 70250 33000 550 -1 De 15 1 11 0 0 Po 0 71250 33500 71250 36500 170 -1 De 15 0 11 0 0 Po 0 70250 33000 70750 33000 170 -1 De 15 0 11 0 0 -Po 0 67750 35750 68000 36000 170 -1 -De 0 0 12 0 0 -Po 0 71750 39250 71750 39350 170 -1 -De 0 0 12 0 800400 -Po 0 68000 36000 68500 36000 170 -1 +Po 0 67250 34500 67750 35000 170 -1 +De 0 0 12 0 800 +Po 0 67750 35000 67750 35750 170 -1 De 0 0 12 0 0 Po 0 68500 36000 71750 39250 170 -1 De 0 0 12 0 0 -Po 0 67750 35000 67750 35750 170 -1 +Po 0 68000 36000 68500 36000 170 -1 +De 0 0 12 0 0 +Po 0 71750 39250 71750 39350 170 -1 +De 0 0 12 0 400 +Po 0 67750 35750 68000 36000 170 -1 De 0 0 12 0 0 -Po 0 67250 34500 67750 35000 170 -1 -De 0 0 12 0 400800 Po 0 58250 41000 56875 41000 170 -1 De 15 0 13 0 0 Po 0 59250 37500 58750 38000 170 -1 -De 15 0 13 0 400800 +De 15 0 13 0 800 Po 0 58750 40500 58250 41000 170 -1 De 15 0 13 0 0 Po 0 59250 36500 59250 37500 170 -1 -De 15 0 13 0 C00C00 +De 15 0 13 0 C00 Po 0 56750 41125 56750 41500 170 -1 -De 15 0 13 0 800400 +De 15 0 13 0 400 Po 0 56875 41000 56750 41125 170 -1 De 15 0 13 0 0 Po 0 58750 38000 58750 40500 170 -1 De 15 0 13 0 0 -Po 0 65250 23000 44750 23000 170 -1 -De 0 0 14 0 0 -Po 0 65250 26500 65250 23000 170 -1 -De 15 0 14 0 400800 -Po 3 65250 23000 65250 23000 550 -1 -De 15 1 14 0 0 -Po 0 44250 23500 44250 24000 170 -1 -De 0 0 14 0 800400 Po 0 44750 23000 44250 23500 170 -1 De 0 0 14 0 0 -Po 0 51750 41500 51750 40250 170 -1 -De 0 0 15 0 400800 -Po 0 57250 39750 57250 38500 170 -1 -De 15 0 15 0 800400 -Po 0 61750 39750 61750 46000 170 -1 -De 15 0 15 0 800400 -Po 0 58500 39500 61500 39500 170 -1 +Po 0 44250 23500 44250 24000 170 -1 +De 0 0 14 0 400 +Po 3 65250 23000 65250 23000 550 -1 +De 15 1 14 0 0 +Po 0 65250 26500 65250 23000 170 -1 +De 15 0 14 0 800 +Po 0 65250 23000 44750 23000 170 -1 +De 0 0 14 0 0 +Po 0 58250 39750 58500 39500 170 -1 De 0 0 15 0 0 -Po 0 51750 40250 52250 39750 170 -1 -De 0 0 15 0 0 -Po 0 57250 39750 58250 39750 170 -1 +Po 3 57250 39750 57250 39750 550 -1 +De 15 1 15 0 0 +Po 3 61750 39750 61750 39750 550 -1 +De 15 1 15 0 0 +Po 0 61500 39500 61750 39750 170 -1 De 0 0 15 0 0 Po 0 52250 39750 57250 39750 170 -1 De 0 0 15 0 0 -Po 0 61500 39500 61750 39750 170 -1 +Po 0 57250 39750 58250 39750 170 -1 De 0 0 15 0 0 -Po 3 61750 39750 61750 39750 550 -1 -De 15 1 15 0 0 -Po 3 57250 39750 57250 39750 550 -1 -De 15 1 15 0 0 -Po 0 58250 39750 58500 39500 170 -1 +Po 0 51750 40250 52250 39750 170 -1 De 0 0 15 0 0 +Po 0 58500 39500 61500 39500 170 -1 +De 0 0 15 0 0 +Po 0 61750 39750 61750 46000 170 -1 +De 15 0 15 0 400 +Po 0 57250 39750 57250 38500 170 -1 +De 15 0 15 0 400 +Po 0 51750 41500 51750 40250 170 -1 +De 0 0 15 0 800 Po 0 62750 45500 63500 44750 170 -1 De 15 0 16 0 0 Po 0 62750 46000 62750 45500 170 -1 -De 15 0 16 0 400800 +De 15 0 16 0 800 Po 0 63500 44750 63500 42250 170 -1 De 15 0 16 0 0 Po 0 63500 42250 63250 42000 170 -1 De 15 0 16 0 0 Po 0 63250 42000 63250 38500 170 -1 -De 15 0 16 0 800400 +De 15 0 16 0 400 +Po 0 64250 38500 64250 45000 170 -1 +De 15 0 17 0 800 +Po 0 63750 45500 63750 46000 170 -1 +De 15 0 17 0 400 Po 0 64250 45000 63750 45500 170 -1 De 15 0 17 0 0 -Po 0 63750 45500 63750 46000 170 -1 -De 15 0 17 0 800400 -Po 0 64250 38500 64250 45000 170 -1 -De 15 0 17 0 400800 Po 0 64250 37500 64750 38000 170 -1 -De 15 0 18 0 400800 +De 15 0 18 0 800 Po 0 64750 38000 64750 46000 170 -1 -De 15 0 18 0 800400 +De 15 0 18 0 400 Po 0 65750 38000 65750 46000 170 -1 -De 15 0 19 0 800400 +De 15 0 19 0 400 Po 0 65250 37500 65750 38000 170 -1 -De 15 0 19 0 400800 +De 15 0 19 0 800 Po 0 66250 38500 66250 44250 170 -1 -De 15 0 20 0 400800 +De 15 0 20 0 800 Po 0 66750 44750 66750 46000 170 -1 -De 15 0 20 0 800400 +De 15 0 20 0 400 Po 0 66250 44250 66750 44750 170 -1 De 15 0 20 0 0 Po 0 66750 44000 67750 45000 170 -1 De 15 0 21 0 0 Po 0 67750 45000 67750 46000 170 -1 -De 15 0 21 0 800400 +De 15 0 21 0 400 Po 0 66750 38000 66750 44000 170 -1 De 15 0 21 0 0 Po 0 66250 37500 66750 38000 170 -1 -De 15 0 21 0 400800 -Po 0 67250 36500 67750 37000 170 -1 -De 15 0 22 0 400800 -Po 0 67750 44250 68750 45250 170 -1 -De 15 0 22 0 0 -Po 0 68750 45250 68750 46000 170 -1 -De 15 0 22 0 800400 +De 15 0 21 0 800 Po 0 67750 37000 67750 44250 170 -1 De 15 0 22 0 0 +Po 0 68750 45250 68750 46000 170 -1 +De 15 0 22 0 400 +Po 0 67750 44250 68750 45250 170 -1 +De 15 0 22 0 0 +Po 0 67250 36500 67750 37000 170 -1 +De 15 0 22 0 800 Po 0 55250 43500 55250 47500 170 -1 De 15 0 23 0 0 Po 0 55750 41500 55750 43000 170 -1 -De 15 0 23 0 400800 +De 15 0 23 0 800 Po 0 55750 43000 55250 43500 170 -1 De 15 0 23 0 0 Po 0 58750 47500 59250 48000 170 -1 @@ -4617,349 +4637,349 @@ De 15 1 23 0 0 Po 3 58750 47500 58750 47500 550 -1 De 15 1 23 0 0 Po 0 59250 48500 59750 49000 170 -1 -De 15 0 23 0 800400 +De 15 0 23 0 400 Po 0 55250 47500 58750 47500 170 -1 De 0 0 23 0 0 Po 0 59250 48000 59250 48500 170 -1 De 15 0 23 0 0 -Po 0 65750 40000 65750 37000 170 -1 -De 0 0 24 0 0 -Po 0 60750 40000 61000 40250 170 -1 -De 0 0 24 0 0 -Po 0 65500 40250 65750 40000 170 -1 -De 0 0 24 0 0 -Po 0 52875 40250 58750 40250 170 -1 -De 0 0 24 0 0 -Po 0 52750 40375 52875 40250 170 -1 -De 0 0 24 0 0 -Po 0 52750 41500 52750 40375 170 -1 -De 0 0 24 0 400800 -Po 0 65750 37000 66250 36500 170 -1 -De 0 0 24 0 800400 -Po 0 59000 40000 60750 40000 170 -1 +Po 0 61000 40250 65500 40250 170 -1 De 0 0 24 0 0 Po 0 58750 40250 59000 40000 170 -1 De 0 0 24 0 0 -Po 0 61000 40250 65500 40250 170 -1 +Po 0 59000 40000 60750 40000 170 -1 +De 0 0 24 0 0 +Po 0 65750 37000 66250 36500 170 -1 +De 0 0 24 0 400 +Po 0 52750 41500 52750 40375 170 -1 +De 0 0 24 0 800 +Po 0 52750 40375 52875 40250 170 -1 +De 0 0 24 0 0 +Po 0 52875 40250 58750 40250 170 -1 +De 0 0 24 0 0 +Po 0 65500 40250 65750 40000 170 -1 +De 0 0 24 0 0 +Po 0 60750 40000 61000 40250 170 -1 +De 0 0 24 0 0 +Po 0 65750 40000 65750 37000 170 -1 De 0 0 24 0 0 -Po 0 50750 42500 60750 42500 170 -1 -De 0 0 25 0 0 -Po 0 60750 42500 60750 46000 170 -1 -De 15 0 25 0 800400 -Po 3 60750 42500 60750 42500 550 -1 -De 15 1 25 0 0 -Po 0 50750 41500 50750 42500 170 -1 -De 15 0 25 0 400800 Po 3 50750 42500 50750 42500 550 -1 De 15 1 25 0 0 +Po 0 50750 41500 50750 42500 170 -1 +De 15 0 25 0 800 +Po 3 60750 42500 60750 42500 550 -1 +De 15 1 25 0 0 +Po 0 60750 42500 60750 46000 170 -1 +De 15 0 25 0 400 +Po 0 50750 42500 60750 42500 170 -1 +De 0 0 25 0 0 Po 0 68250 29500 70650 29500 170 -1 -De 0 0 26 0 400800 +De 0 0 26 0 800 Po 0 70650 29500 71300 30150 170 -1 De 0 0 26 0 0 Po 0 72750 30120 72750 30150 170 -1 -De 0 0 26 0 400800 +De 0 0 26 0 800 Po 0 71300 30150 72750 30150 170 -1 De 0 0 26 0 0 Po 0 71350 31200 72750 31200 170 -1 De 0 0 27 0 0 Po 0 67250 30500 67750 31000 170 -1 -De 0 0 27 0 400800 +De 0 0 27 0 800 Po 0 67750 31000 71150 31000 170 -1 De 0 0 27 0 0 Po 0 72750 31200 72750 31220 170 -1 -De 0 0 27 0 800400 +De 0 0 27 0 400 Po 0 71150 31000 71350 31200 170 -1 De 0 0 27 0 0 -Po 0 58250 37500 57750 37000 170 -1 -De 15 0 28 0 400800 -Po 0 58750 32000 58750 26000 170 -1 -De 15 0 28 0 0 -Po 0 58750 26000 58250 25500 170 -1 -De 15 0 28 0 0 -Po 0 57750 37000 57750 36000 170 -1 -De 15 0 28 0 0 -Po 0 58250 25500 58250 16500 170 -1 -De 15 0 28 0 800400 -Po 0 57750 36000 56750 36000 170 -1 +Po 0 56750 32000 58750 32000 170 -1 De 15 0 28 0 0 Po 0 56750 36000 56750 32000 170 -1 De 15 0 28 0 0 -Po 0 56750 32000 58750 32000 170 -1 +Po 0 57750 36000 56750 36000 170 -1 De 15 0 28 0 0 +Po 0 58250 25500 58250 16500 170 -1 +De 15 0 28 0 400 +Po 0 57750 37000 57750 36000 170 -1 +De 15 0 28 0 0 +Po 0 58750 26000 58250 25500 170 -1 +De 15 0 28 0 0 +Po 0 58750 32000 58750 26000 170 -1 +De 15 0 28 0 0 +Po 0 58250 37500 57750 37000 170 -1 +De 15 0 28 0 800 Po 0 69250 30500 69250 16500 170 -1 -De 15 0 29 0 800400 +De 15 0 29 0 400 Po 0 68250 31500 69250 30500 170 -1 -De 15 0 29 0 400800 -Po 3 44750 22500 44750 22500 550 -1 -De 15 1 30 0 0 -Po 0 45250 29500 44750 29000 170 -1 -De 15 0 30 0 0 -Po 0 66250 26500 66250 22500 170 -1 -De 15 0 30 0 400800 -Po 0 44750 22500 44750 29000 170 -1 -De 15 0 30 0 0 -Po 3 66250 22500 66250 22500 550 -1 -De 15 1 30 0 0 -Po 0 45250 30000 45250 29500 170 -1 -De 15 0 30 0 400800 +De 15 0 29 0 800 Po 0 66250 22500 44750 22500 170 -1 De 0 0 30 0 0 +Po 0 45250 30000 45250 29500 170 -1 +De 15 0 30 0 800 +Po 3 66250 22500 66250 22500 550 -1 +De 15 1 30 0 0 +Po 0 44750 22500 44750 29000 170 -1 +De 15 0 30 0 0 +Po 0 66250 26500 66250 22500 170 -1 +De 15 0 30 0 800 +Po 0 45250 29500 44750 29000 170 -1 +De 15 0 30 0 0 +Po 3 44750 22500 44750 22500 550 -1 +De 15 1 30 0 0 Po 3 43750 27000 43750 27000 550 -1 De 15 1 31 0 0 Po 0 44250 29500 43750 29000 170 -1 De 15 0 31 0 0 Po 0 44250 30000 44250 29500 170 -1 -De 15 0 31 0 400800 +De 15 0 31 0 800 Po 0 56750 27000 43750 27000 170 -1 De 0 0 31 0 0 Po 0 43750 29000 43750 27000 170 -1 De 15 0 31 0 0 Po 0 57250 27500 56750 27000 170 -1 -De 0 0 31 0 400800 -Po 0 43250 25500 43250 24000 170 -1 -De 15 0 32 0 800400 -Po 3 65750 25500 65750 25500 550 -1 -De 15 1 32 0 0 -Po 0 65750 25500 43250 25500 170 -1 -De 0 0 32 0 0 -Po 0 64750 28000 65750 28000 170 -1 -De 15 0 32 0 0 -Po 0 64250 28500 64750 28000 170 -1 -De 15 0 32 0 400800 -Po 3 43250 25500 43250 25500 550 -1 -De 15 1 32 0 0 +De 0 0 31 0 800 Po 0 65750 28000 65750 25500 170 -1 De 15 0 32 0 0 -Po 0 57250 29500 56750 29000 170 -1 -De 15 0 33 0 400800 -Po 0 56750 29000 55750 29000 170 -1 -De 15 0 33 0 0 -Po 0 41250 27000 41250 24000 170 -1 -De 15 0 33 0 800400 -Po 0 54750 27500 41750 27500 170 -1 -De 0 0 33 0 0 -Po 0 41750 27500 41250 27000 170 -1 -De 0 0 33 0 0 -Po 0 54750 28000 54750 27500 170 -1 -De 15 0 33 0 0 -Po 3 41250 27000 41250 27000 550 -1 -De 15 1 33 0 0 -Po 3 54750 27500 54750 27500 550 -1 -De 15 1 33 0 0 +Po 3 43250 25500 43250 25500 550 -1 +De 15 1 32 0 0 +Po 0 64250 28500 64750 28000 170 -1 +De 15 0 32 0 800 +Po 0 64750 28000 65750 28000 170 -1 +De 15 0 32 0 0 +Po 0 65750 25500 43250 25500 170 -1 +De 0 0 32 0 0 +Po 3 65750 25500 65750 25500 550 -1 +De 15 1 32 0 0 +Po 0 43250 25500 43250 24000 170 -1 +De 15 0 32 0 400 Po 0 55750 29000 54750 28000 170 -1 De 15 0 33 0 0 +Po 3 54750 27500 54750 27500 550 -1 +De 15 1 33 0 0 +Po 3 41250 27000 41250 27000 550 -1 +De 15 1 33 0 0 +Po 0 54750 28000 54750 27500 170 -1 +De 15 0 33 0 0 +Po 0 41750 27500 41250 27000 170 -1 +De 0 0 33 0 0 +Po 0 54750 27500 41750 27500 170 -1 +De 0 0 33 0 0 +Po 0 41250 27000 41250 24000 170 -1 +De 15 0 33 0 400 +Po 0 56750 29000 55750 29000 170 -1 +De 15 0 33 0 0 +Po 0 57250 29500 56750 29000 170 -1 +De 15 0 33 0 800 Po 0 58250 31500 57750 32000 170 -1 -De 0 0 34 0 400800 +De 0 0 34 0 800 Po 0 39250 32000 37250 30000 170 -1 -De 0 0 34 0 800400 +De 0 0 34 0 400 Po 0 57750 32000 39250 32000 170 -1 De 0 0 34 0 0 Po 0 37250 30000 37250 30000 170 -1 -De 0 0 34 0 C00C00 -Po 0 56250 28500 39250 28500 170 -1 -De 0 0 35 0 400800 -Po 0 38250 27500 38250 27000 170 -1 -De 0 0 35 0 0 -Po 0 38250 27000 38250 24000 170 -1 -De 15 0 35 0 800400 -Po 3 38250 27000 38250 27000 550 -1 -De 15 1 35 0 0 +De 0 0 34 0 C00 Po 0 39250 28500 38250 27500 170 -1 De 0 0 35 0 0 +Po 3 38250 27000 38250 27000 550 -1 +De 15 1 35 0 0 +Po 0 38250 27000 38250 24000 170 -1 +De 15 0 35 0 400 +Po 0 38250 27500 38250 27000 170 -1 +De 0 0 35 0 0 +Po 0 56250 28500 39250 28500 170 -1 +De 0 0 35 0 800 Po 0 56250 29500 36750 29500 170 -1 -De 0 0 36 0 400800 +De 0 0 36 0 800 Po 0 36750 29500 36250 30000 170 -1 -De 0 0 36 0 800400 +De 0 0 36 0 400 Po 0 54250 26000 35500 26000 170 -1 De 0 0 37 0 0 Po 3 54250 26000 54250 26000 550 -1 De 15 1 37 0 0 Po 0 35250 24000 35250 25750 170 -1 -De 0 0 37 0 400800 +De 0 0 37 0 800 Po 0 55250 31500 56250 31500 170 -1 -De 15 0 37 0 800400 +De 15 0 37 0 400 Po 0 54250 30500 55250 31500 170 -1 De 15 0 37 0 0 Po 0 35500 26000 35250 25750 170 -1 De 0 0 37 0 0 Po 0 54250 26000 54250 30500 170 -1 De 15 0 37 0 0 -Po 0 63750 19000 34750 19000 170 -1 -De 0 0 38 0 0 -Po 0 63750 19000 63750 28000 170 -1 +Po 0 63750 28000 63250 28500 170 -1 +De 15 0 38 0 400 +Po 0 35250 29500 35250 30000 170 -1 +De 15 0 38 0 400 +Po 3 63750 19000 63750 19000 550 -1 +De 15 1 38 0 0 +Po 0 34750 19000 34750 29000 170 -1 +De 15 0 38 0 0 +Po 0 34750 29000 35250 29500 170 -1 De 15 0 38 0 0 Po 3 34750 19000 34750 19000 550 -1 De 15 1 38 0 0 -Po 0 34750 29000 35250 29500 170 -1 +Po 0 63750 19000 63750 28000 170 -1 De 15 0 38 0 0 -Po 0 34750 19000 34750 29000 170 -1 -De 15 0 38 0 0 -Po 3 63750 19000 63750 19000 550 -1 -De 15 1 38 0 0 -Po 0 35250 29500 35250 30000 170 -1 -De 15 0 38 0 800400 -Po 0 63750 28000 63250 28500 170 -1 -De 15 0 38 0 800400 +Po 0 63750 19000 34750 19000 170 -1 +De 0 0 38 0 0 Po 0 43750 30500 43250 30000 170 -1 -De 0 0 39 0 800400 +De 0 0 39 0 400 Po 0 52250 30500 43750 30500 170 -1 De 0 0 39 0 0 Po 0 52750 30000 52250 30500 170 -1 De 0 0 39 0 0 Po 0 58250 29500 57750 30000 170 -1 -De 0 0 39 0 400800 +De 0 0 39 0 800 Po 0 57750 30000 52750 30000 170 -1 De 0 0 39 0 0 -Po 0 57250 28500 56750 29000 170 -1 -De 0 0 40 0 400800 -Po 0 42250 29500 41750 29000 170 -1 -De 15 0 40 0 0 -Po 3 41750 29000 41750 29000 550 -1 -De 15 1 40 0 0 -Po 0 42250 30000 42250 29500 170 -1 -De 15 0 40 0 400800 Po 0 56750 29000 41750 29000 170 -1 De 0 0 40 0 0 +Po 0 42250 30000 42250 29500 170 -1 +De 15 0 40 0 800 +Po 3 41750 29000 41750 29000 550 -1 +De 15 1 40 0 0 +Po 0 42250 29500 41750 29000 170 -1 +De 15 0 40 0 0 +Po 0 57250 28500 56750 29000 170 -1 +De 0 0 40 0 800 Po 0 52750 31000 42250 31000 170 -1 De 0 0 41 0 0 Po 0 42250 31000 41250 30000 170 -1 -De 0 0 41 0 800400 +De 0 0 41 0 400 Po 0 56250 30500 53250 30500 170 -1 -De 0 0 41 0 400800 +De 0 0 41 0 800 Po 0 53250 30500 52750 31000 170 -1 De 0 0 41 0 0 -Po 0 68750 28000 68250 28500 170 -1 -De 15 0 42 0 800400 -Po 0 40250 30000 40250 29500 170 -1 -De 15 0 42 0 400800 -Po 3 39750 25000 39750 25000 550 -1 -De 15 1 42 0 0 -Po 0 39750 25000 68750 25000 170 -1 -De 0 0 42 0 0 -Po 0 68750 25000 68750 28000 170 -1 -De 15 0 42 0 0 -Po 0 40250 29500 39750 29000 170 -1 +Po 0 39750 29000 39750 25000 170 -1 De 15 0 42 0 0 Po 3 68750 25000 68750 25000 550 -1 De 15 1 42 0 0 -Po 0 39750 29000 39750 25000 170 -1 +Po 0 40250 29500 39750 29000 170 -1 De 15 0 42 0 0 +Po 0 68750 25000 68750 28000 170 -1 +De 15 0 42 0 0 +Po 0 39750 25000 68750 25000 170 -1 +De 0 0 42 0 0 +Po 3 39750 25000 39750 25000 550 -1 +De 15 1 42 0 0 +Po 0 40250 30000 40250 29500 170 -1 +De 15 0 42 0 800 +Po 0 68750 28000 68250 28500 170 -1 +De 15 0 42 0 400 Po 0 56750 31000 53750 31000 170 -1 De 0 0 43 0 0 Po 0 53750 31000 53250 31500 170 -1 De 0 0 43 0 0 Po 0 57250 31500 56750 31000 170 -1 -De 0 0 43 0 400800 +De 0 0 43 0 800 Po 0 40250 31500 39250 30500 170 -1 De 0 0 43 0 0 Po 0 53250 31500 40250 31500 170 -1 De 0 0 43 0 0 Po 0 39250 30500 39250 30000 170 -1 -De 0 0 43 0 800400 -Po 0 37750 21000 37750 29000 170 -1 +De 0 0 43 0 400 +Po 0 57750 27000 57750 21000 170 -1 De 15 0 44 0 0 -Po 0 57750 21000 37750 21000 170 -1 -De 0 0 44 0 0 -Po 3 57750 21000 57750 21000 550 -1 +Po 0 38250 30000 38250 29500 170 -1 +De 15 0 44 0 800 +Po 0 58250 27500 57750 27000 170 -1 +De 15 0 44 0 800 +Po 3 37750 21000 37750 21000 550 -1 De 15 1 44 0 0 Po 0 38250 29500 37750 29000 170 -1 De 15 0 44 0 0 -Po 3 37750 21000 37750 21000 550 -1 +Po 3 57750 21000 57750 21000 550 -1 De 15 1 44 0 0 -Po 0 58250 27500 57750 27000 170 -1 -De 15 0 44 0 400800 -Po 0 38250 30000 38250 29500 170 -1 -De 15 0 44 0 400800 -Po 0 57750 27000 57750 21000 170 -1 +Po 0 57750 21000 37750 21000 170 -1 +De 0 0 44 0 0 +Po 0 37750 21000 37750 29000 170 -1 De 15 0 44 0 0 Po 0 39250 29000 39250 24000 170 -1 -De 15 0 45 0 800400 +De 15 0 45 0 400 Po 0 56250 32500 39750 32500 170 -1 -De 0 0 45 0 400800 +De 0 0 45 0 800 Po 0 39750 29500 39250 29000 170 -1 De 15 0 45 0 0 Po 0 39750 32500 39750 29500 170 -1 De 15 0 45 0 0 Po 3 39750 32500 39750 32500 550 -1 De 15 1 45 0 0 -Po 3 59250 24500 59250 24500 550 -1 -De 15 1 46 0 0 -Po 0 59250 26500 59250 24500 170 -1 -De 15 0 46 0 400800 -Po 0 40750 24500 40250 24000 170 -1 -De 0 0 46 0 800400 Po 0 59250 24500 40750 24500 170 -1 De 0 0 46 0 0 +Po 0 40750 24500 40250 24000 170 -1 +De 0 0 46 0 400 +Po 0 59250 26500 59250 24500 170 -1 +De 15 0 46 0 800 +Po 3 59250 24500 59250 24500 550 -1 +De 15 1 46 0 0 Po 0 38750 46000 39250 45500 170 -1 -De 0 0 47 0 400800 +De 0 0 47 0 800 Po 0 49500 45500 49750 45250 170 -1 De 0 0 47 0 0 Po 0 39250 45500 49500 45500 170 -1 De 0 0 47 0 0 Po 0 49750 45250 49750 44500 170 -1 -De 0 0 47 0 800400 +De 0 0 47 0 400 Po 0 45750 29000 45750 28000 170 -1 De 15 0 48 0 0 Po 0 61250 28500 60750 28000 170 -1 -De 0 0 48 0 400800 +De 0 0 48 0 800 Po 0 46250 30000 46250 29500 170 -1 -De 15 0 48 0 400800 +De 15 0 48 0 800 Po 3 45750 28000 45750 28000 550 -1 De 15 1 48 0 0 Po 0 46250 29500 45750 29000 170 -1 De 15 0 48 0 0 Po 0 60750 28000 45750 28000 170 -1 De 0 0 48 0 0 -Po 0 47250 30000 47250 29500 170 -1 -De 15 0 49 0 400800 -Po 0 59750 26000 55250 26000 170 -1 -De 0 0 49 0 0 -Po 3 46750 26500 46750 26500 550 -1 -De 15 1 49 0 0 -Po 0 60250 26500 59750 26000 170 -1 -De 0 0 49 0 400800 -Po 0 46750 26500 46750 29000 170 -1 -De 15 0 49 0 0 -Po 0 47250 29500 46750 29000 170 -1 -De 15 0 49 0 0 -Po 0 54750 26500 46750 26500 170 -1 -De 0 0 49 0 0 Po 0 55250 26000 54750 26500 170 -1 De 0 0 49 0 0 -Po 0 47750 21500 59750 21500 170 -1 -De 0 0 50 0 0 -Po 0 61250 27500 60750 27000 170 -1 -De 15 0 50 0 400800 -Po 3 47750 21500 47750 21500 550 -1 -De 15 1 50 0 0 -Po 0 48250 29500 47750 29000 170 -1 -De 15 0 50 0 0 -Po 0 60750 22500 59750 21500 170 -1 -De 15 0 50 0 0 -Po 0 48250 30000 48250 29500 170 -1 -De 15 0 50 0 400800 -Po 3 59750 21500 59750 21500 550 -1 -De 15 1 50 0 0 -Po 0 60750 27000 60750 22500 170 -1 -De 15 0 50 0 0 +Po 0 54750 26500 46750 26500 170 -1 +De 0 0 49 0 0 +Po 0 47250 29500 46750 29000 170 -1 +De 15 0 49 0 0 +Po 0 46750 26500 46750 29000 170 -1 +De 15 0 49 0 0 +Po 0 60250 26500 59750 26000 170 -1 +De 0 0 49 0 800 +Po 3 46750 26500 46750 26500 550 -1 +De 15 1 49 0 0 +Po 0 59750 26000 55250 26000 170 -1 +De 0 0 49 0 0 +Po 0 47250 30000 47250 29500 170 -1 +De 15 0 49 0 800 Po 0 47750 29000 47750 21500 170 -1 De 15 0 50 0 0 +Po 0 60750 27000 60750 22500 170 -1 +De 15 0 50 0 0 +Po 3 59750 21500 59750 21500 550 -1 +De 15 1 50 0 0 +Po 0 48250 30000 48250 29500 170 -1 +De 15 0 50 0 800 +Po 0 60750 22500 59750 21500 170 -1 +De 15 0 50 0 0 +Po 0 48250 29500 47750 29000 170 -1 +De 15 0 50 0 0 +Po 3 47750 21500 47750 21500 550 -1 +De 15 1 50 0 0 +Po 0 61250 27500 60750 27000 170 -1 +De 15 0 50 0 800 +Po 0 47750 21500 59750 21500 170 -1 +De 0 0 50 0 0 Po 0 61250 26500 61250 24000 170 -1 -De 15 0 51 0 400800 +De 15 0 51 0 800 Po 0 61250 24000 49250 24000 170 -1 -De 0 0 51 0 800400 +De 0 0 51 0 400 Po 3 61250 24000 61250 24000 550 -1 De 15 1 51 0 0 -Po 3 48250 18000 48250 18000 550 -1 -De 15 1 52 0 0 -Po 0 48250 24000 48250 18000 170 -1 -De 15 0 52 0 400800 -Po 0 62250 18000 48250 18000 170 -1 -De 0 0 52 0 0 +Po 0 62250 26500 62250 18000 170 -1 +De 15 0 52 0 800 Po 3 62250 18000 62250 18000 550 -1 De 15 1 52 0 0 -Po 0 62250 26500 62250 18000 170 -1 -De 15 0 52 0 400800 +Po 0 62250 18000 48250 18000 170 -1 +De 0 0 52 0 0 +Po 0 48250 24000 48250 18000 170 -1 +De 15 0 52 0 800 +Po 3 48250 18000 48250 18000 550 -1 +De 15 1 52 0 0 Po 0 47250 19500 63250 19500 170 -1 De 0 0 53 0 0 Po 3 47250 19500 47250 19500 550 -1 @@ -4967,953 +4987,889 @@ De 15 1 53 0 0 Po 3 63250 19500 63250 19500 550 -1 De 15 1 53 0 0 Po 0 63250 26500 63250 19500 170 -1 -De 15 0 53 0 400800 +De 15 0 53 0 800 Po 0 47250 24000 47250 19500 170 -1 -De 15 0 53 0 400800 +De 15 0 53 0 800 Po 3 64250 22000 64250 22000 550 -1 De 15 1 54 0 0 Po 0 46250 24000 46250 22000 170 -1 -De 15 0 54 0 400800 +De 15 0 54 0 800 Po 3 46250 22000 46250 22000 550 -1 De 15 1 54 0 0 Po 0 64250 26500 64250 22000 170 -1 -De 15 0 54 0 400800 +De 15 0 54 0 800 Po 0 46250 22000 64250 22000 170 -1 De 0 0 54 0 0 -Po 0 62750 23500 45750 23500 170 -1 -De 0 0 55 0 0 -Po 3 62750 23500 62750 23500 550 -1 -De 15 1 55 0 0 -Po 0 63250 27500 62750 27000 170 -1 -De 15 0 55 0 400800 -Po 0 45750 23500 45250 24000 170 -1 -De 0 0 55 0 800400 Po 0 62750 27000 62750 23500 170 -1 De 15 0 55 0 0 +Po 0 45750 23500 45250 24000 170 -1 +De 0 0 55 0 400 +Po 0 63250 27500 62750 27000 170 -1 +De 15 0 55 0 800 +Po 3 62750 23500 62750 23500 550 -1 +De 15 1 55 0 0 +Po 0 62750 23500 45750 23500 170 -1 +De 0 0 55 0 0 Po 0 42250 18500 42250 24000 170 -1 -De 15 0 56 0 800400 +De 15 0 56 0 400 Po 0 64750 27000 64750 18500 170 -1 De 15 0 56 0 0 Po 0 64250 27500 64750 27000 170 -1 -De 15 0 56 0 400800 +De 15 0 56 0 800 Po 3 64750 18500 64750 18500 550 -1 De 15 1 56 0 0 Po 0 64750 18500 42250 18500 170 -1 De 0 0 56 0 0 Po 3 42250 18500 42250 18500 550 -1 De 15 1 56 0 0 -Po 0 60750 41500 60250 42000 170 -1 -De 15 0 57 0 0 -Po 3 36750 47500 36750 47500 550 -1 -De 15 1 57 0 0 -Po 0 50750 47500 36750 47500 170 -1 -De 0 0 57 0 0 -Po 0 60250 49500 58750 49500 170 -1 -De 15 0 57 0 0 -Po 0 60250 42000 60250 49500 170 -1 -De 15 0 57 0 0 -Po 0 57250 49500 57250 48500 170 -1 -De 0 0 57 0 0 -Po 0 57250 48500 51250 48500 170 -1 -De 0 0 57 0 0 -Po 0 51250 48500 50750 49000 170 -1 -De 0 0 57 0 800400 -Po 0 60750 38000 60750 41500 170 -1 -De 15 0 57 0 0 -Po 3 50750 47500 50750 47500 550 -1 -De 15 1 57 0 0 -Po 0 36750 47500 36750 54500 170 -1 -De 15 0 57 0 800400 -Po 3 58750 49500 58750 49500 550 -1 -De 15 1 57 0 0 -Po 0 50750 49000 50750 47500 170 -1 -De 15 0 57 0 400800 -Po 0 61250 37500 60750 38000 170 -1 -De 15 0 57 0 400800 Po 0 58750 49500 57250 49500 170 -1 De 0 0 57 0 0 -Po 0 49750 49000 49750 51000 170 -1 -De 15 0 58 0 400800 -Po 0 37750 51000 37750 54500 170 -1 -De 15 0 58 0 800400 -Po 3 52250 39000 52250 39000 550 -1 -De 15 1 58 0 0 -Po 0 49750 51000 37750 51000 170 -1 -De 0 0 58 0 0 -Po 3 37750 51000 37750 51000 550 -1 -De 15 1 58 0 0 -Po 0 59250 38500 58750 39000 170 -1 -De 0 0 58 0 400800 -Po 0 50250 49500 49750 49000 170 -1 -De 15 0 58 0 800400 -Po 0 58750 39000 52250 39000 170 -1 -De 0 0 58 0 0 -Po 0 52250 49500 50250 49500 170 -1 +Po 0 61250 37500 60750 38000 170 -1 +De 15 0 57 0 800 +Po 0 50750 49000 50750 47500 170 -1 +De 15 0 57 0 800 +Po 3 58750 49500 58750 49500 550 -1 +De 15 1 57 0 0 +Po 0 36750 47500 36750 54500 170 -1 +De 15 0 57 0 400 +Po 3 50750 47500 50750 47500 550 -1 +De 15 1 57 0 0 +Po 0 60750 38000 60750 41500 170 -1 +De 15 0 57 0 0 +Po 0 51250 48500 50750 49000 170 -1 +De 0 0 57 0 400 +Po 0 57250 48500 51250 48500 170 -1 +De 0 0 57 0 0 +Po 0 57250 49500 57250 48500 170 -1 +De 0 0 57 0 0 +Po 0 60250 42000 60250 49500 170 -1 +De 15 0 57 0 0 +Po 0 60250 49500 58750 49500 170 -1 +De 15 0 57 0 0 +Po 0 50750 47500 36750 47500 170 -1 +De 0 0 57 0 0 +Po 3 36750 47500 36750 47500 550 -1 +De 15 1 57 0 0 +Po 0 60750 41500 60250 42000 170 -1 +De 15 0 57 0 0 +Po 0 52250 39000 52250 49500 170 -1 De 15 0 58 0 0 Po 3 49750 51000 49750 51000 550 -1 De 15 1 58 0 0 -Po 0 52250 39000 52250 49500 170 -1 +Po 0 52250 49500 50250 49500 170 -1 De 15 0 58 0 0 -Po 0 46750 48000 46750 46000 170 -1 -De 15 0 59 0 800400 -Po 3 46750 37500 46750 37500 550 -1 -De 15 1 59 0 0 -Po 0 57500 37000 53250 37000 170 -1 -De 0 0 59 0 0 -Po 0 53250 37000 52750 37500 170 -1 -De 0 0 59 0 0 -Po 0 46250 52500 46250 48500 170 -1 +Po 0 58750 39000 52250 39000 170 -1 +De 0 0 58 0 0 +Po 0 50250 49500 49750 49000 170 -1 +De 15 0 58 0 400 +Po 0 59250 38500 58750 39000 170 -1 +De 0 0 58 0 800 +Po 3 37750 51000 37750 51000 550 -1 +De 15 1 58 0 0 +Po 0 49750 51000 37750 51000 170 -1 +De 0 0 58 0 0 +Po 3 52250 39000 52250 39000 550 -1 +De 15 1 58 0 0 +Po 0 37750 51000 37750 54500 170 -1 +De 15 0 58 0 400 +Po 0 49750 49000 49750 51000 170 -1 +De 15 0 58 0 800 +Po 0 46750 53000 46250 52500 170 -1 De 15 0 59 0 0 -Po 0 52750 37500 46750 37500 170 -1 +Po 0 46250 48500 46750 48000 170 -1 +De 15 0 59 0 0 +Po 0 62750 36000 58000 36000 170 -1 De 0 0 59 0 0 -Po 0 57750 36750 57500 37000 170 -1 +Po 0 63250 36500 62750 36000 170 -1 +De 0 0 59 0 800 +Po 0 46750 54500 46750 53000 170 -1 +De 15 0 59 0 800 +Po 0 57750 36250 57750 36750 170 -1 De 0 0 59 0 0 -Po 0 46750 43000 46250 43500 170 -1 +Po 0 46250 45500 46750 46000 170 -1 +De 15 0 59 0 400 +Po 0 58000 36000 57750 36250 170 -1 +De 0 0 59 0 0 +Po 0 46250 43500 46250 45500 170 -1 De 15 0 59 0 0 Po 0 46750 37500 46750 43000 170 -1 De 15 0 59 0 0 -Po 0 46250 43500 46250 45500 170 -1 +Po 0 46750 43000 46250 43500 170 -1 De 15 0 59 0 0 -Po 0 58000 36000 57750 36250 170 -1 +Po 0 57750 36750 57500 37000 170 -1 De 0 0 59 0 0 -Po 0 46250 45500 46750 46000 170 -1 -De 15 0 59 0 800400 -Po 0 57750 36250 57750 36750 170 -1 +Po 0 52750 37500 46750 37500 170 -1 De 0 0 59 0 0 -Po 0 46750 54500 46750 53000 170 -1 -De 15 0 59 0 400800 -Po 0 63250 36500 62750 36000 170 -1 -De 0 0 59 0 400800 -Po 0 62750 36000 58000 36000 170 -1 -De 0 0 59 0 0 -Po 0 46250 48500 46750 48000 170 -1 +Po 0 46250 52500 46250 48500 170 -1 De 15 0 59 0 0 -Po 0 46750 53000 46250 52500 170 -1 -De 15 0 59 0 0 -Po 0 47750 54500 47750 49500 170 -1 -De 15 0 60 0 400800 -Po 0 45250 49500 44750 49000 170 -1 -De 0 0 60 0 800400 -Po 0 47750 49500 45250 49500 170 -1 -De 0 0 60 0 0 +Po 0 53250 37000 52750 37500 170 -1 +De 0 0 59 0 0 +Po 0 57500 37000 53250 37000 170 -1 +De 0 0 59 0 0 +Po 3 46750 37500 46750 37500 550 -1 +De 15 1 59 0 0 +Po 0 46750 48000 46750 46000 170 -1 +De 15 0 59 0 400 Po 3 47750 49500 47750 49500 550 -1 De 15 1 60 0 0 -Po 0 59750 38000 51250 38000 170 -1 +Po 0 47750 49500 45250 49500 170 -1 +De 0 0 60 0 0 +Po 0 45250 49500 44750 49000 170 -1 +De 0 0 60 0 400 +Po 0 47750 54500 47750 49500 170 -1 +De 15 0 60 0 800 +Po 0 51750 49500 51250 50000 170 -1 De 0 0 61 0 0 -Po 0 38750 53000 38750 54500 170 -1 -De 15 0 61 0 800400 -Po 0 51750 49000 51750 49500 170 -1 -De 0 0 61 0 400800 -Po 0 39250 52500 38750 53000 170 -1 +Po 0 51750 48250 51750 49000 170 -1 +De 15 0 61 0 400 +Po 3 39250 48000 39250 48000 550 -1 +De 15 1 61 0 0 +Po 0 51250 50000 44750 50000 170 -1 +De 0 0 61 0 0 +Po 0 44250 49500 44250 48500 170 -1 +De 0 0 61 0 0 +Po 0 51250 47750 51750 48250 170 -1 De 15 0 61 0 0 -Po 0 39250 48000 39250 52500 170 -1 -De 15 0 61 0 0 -Po 0 60250 37500 59750 38000 170 -1 -De 0 0 61 0 400800 -Po 0 51250 38000 51250 47750 170 -1 -De 15 0 61 0 0 -Po 0 43750 48000 39250 48000 170 -1 +Po 3 51250 38000 51250 38000 550 -1 +De 15 1 61 0 0 +Po 0 44250 48500 43750 48000 170 -1 De 0 0 61 0 0 Po 0 44750 50000 44250 49500 170 -1 De 0 0 61 0 0 -Po 0 44250 48500 43750 48000 170 -1 +Po 0 43750 48000 39250 48000 170 -1 De 0 0 61 0 0 -Po 3 51250 38000 51250 38000 550 -1 -De 15 1 61 0 0 -Po 0 51250 47750 51750 48250 170 -1 +Po 0 51250 38000 51250 47750 170 -1 De 15 0 61 0 0 -Po 0 44250 49500 44250 48500 170 -1 +Po 0 60250 37500 59750 38000 170 -1 +De 0 0 61 0 800 +Po 0 39250 48000 39250 52500 170 -1 +De 15 0 61 0 0 +Po 0 39250 52500 38750 53000 170 -1 +De 15 0 61 0 0 +Po 0 51750 49000 51750 49500 170 -1 +De 0 0 61 0 800 +Po 0 38750 53000 38750 54500 170 -1 +De 15 0 61 0 400 +Po 0 59750 38000 51250 38000 170 -1 De 0 0 61 0 0 -Po 0 51250 50000 44750 50000 170 -1 -De 0 0 61 0 0 -Po 3 39250 48000 39250 48000 550 -1 -De 15 1 61 0 0 -Po 0 51750 48250 51750 49000 170 -1 -De 15 0 61 0 800400 -Po 0 51750 49500 51250 50000 170 -1 -De 0 0 61 0 0 -Po 0 42250 52500 41750 52000 170 -1 -De 0 0 62 0 0 -Po 0 41750 52000 39750 52000 170 -1 -De 0 0 62 0 0 -Po 0 56750 36000 57250 35500 170 -1 -De 0 0 62 0 800400 -Po 0 53250 47250 53250 36000 170 -1 +Po 3 53250 36000 53250 36000 550 -1 +De 15 1 62 0 0 +Po 3 39750 52000 39750 52000 550 -1 +De 15 1 62 0 0 +Po 0 39750 52000 39750 54500 170 -1 +De 15 0 62 0 400 +Po 0 52750 49000 52750 50000 170 -1 +De 15 0 62 0 800 +Po 0 52750 47750 53250 47250 170 -1 De 15 0 62 0 0 -Po 0 52750 50000 52250 50500 170 -1 +Po 0 52250 50500 52250 52500 170 -1 De 15 0 62 0 0 -Po 0 52750 49000 52750 47750 170 -1 -De 15 0 62 0 400800 -Po 0 52250 52500 42250 52500 170 -1 +Po 0 53250 36000 56750 36000 170 -1 De 0 0 62 0 0 Po 3 52250 52500 52250 52500 550 -1 De 15 1 62 0 0 -Po 0 53250 36000 56750 36000 170 -1 +Po 0 52250 52500 42250 52500 170 -1 De 0 0 62 0 0 -Po 0 52250 50500 52250 52500 170 -1 +Po 0 52750 49000 52750 47750 170 -1 +De 15 0 62 0 800 +Po 0 52750 50000 52250 50500 170 -1 De 15 0 62 0 0 -Po 0 52750 47750 53250 47250 170 -1 +Po 0 53250 47250 53250 36000 170 -1 De 15 0 62 0 0 -Po 0 52750 49000 52750 50000 170 -1 -De 15 0 62 0 400800 -Po 0 39750 52000 39750 54500 170 -1 -De 15 0 62 0 800400 -Po 3 39750 52000 39750 52000 550 -1 -De 15 1 62 0 0 -Po 3 53250 36000 53250 36000 550 -1 -De 15 1 62 0 0 -Po 0 40750 47000 40750 46000 170 -1 -De 15 0 63 0 800400 -Po 0 40750 52500 41250 52000 170 -1 -De 15 0 63 0 0 -Po 0 41250 52000 41250 48250 170 -1 -De 15 0 63 0 0 -Po 0 59750 33625 59625 33500 170 -1 -De 15 0 63 0 0 -Po 0 59750 40000 59750 33625 170 -1 -De 15 0 63 0 0 -Po 3 59750 47000 59750 47000 550 -1 +Po 0 56750 36000 57250 35500 170 -1 +De 0 0 62 0 400 +Po 0 41750 52000 39750 52000 170 -1 +De 0 0 62 0 0 +Po 0 42250 52500 41750 52000 170 -1 +De 0 0 62 0 0 +Po 3 40750 47000 40750 47000 550 -1 De 15 1 63 0 0 -Po 0 40750 47000 59750 47000 170 -1 -De 0 0 63 0 0 -Po 0 59250 46500 59250 40500 170 -1 -De 15 0 63 0 0 -Po 0 59625 33500 58250 33500 170 -1 -De 15 0 63 0 800400 -Po 0 59750 47000 59250 46500 170 -1 -De 15 0 63 0 0 -Po 0 40750 47750 40750 47000 170 -1 +Po 0 40750 54500 40750 52500 170 -1 +De 15 0 63 0 800 +Po 0 41250 48250 40750 47750 170 -1 De 15 0 63 0 0 Po 0 59250 40500 59750 40000 170 -1 De 15 0 63 0 0 -Po 0 41250 48250 40750 47750 170 -1 +Po 0 40750 47750 40750 47000 170 -1 De 15 0 63 0 0 -Po 0 40750 54500 40750 52500 170 -1 -De 15 0 63 0 400800 -Po 3 40750 47000 40750 47000 550 -1 +Po 0 59750 47000 59250 46500 170 -1 +De 15 0 63 0 0 +Po 0 59625 33500 58250 33500 170 -1 +De 15 0 63 0 400 +Po 0 59250 46500 59250 40500 170 -1 +De 15 0 63 0 0 +Po 0 40750 47000 59750 47000 170 -1 +De 0 0 63 0 0 +Po 3 59750 47000 59750 47000 550 -1 De 15 1 63 0 0 -Po 0 40250 35250 38000 35250 170 -1 +Po 0 59750 40000 59750 33625 170 -1 +De 15 0 63 0 0 +Po 0 59750 33625 59625 33500 170 -1 +De 15 0 63 0 0 +Po 0 41250 52000 41250 48250 170 -1 +De 15 0 63 0 0 +Po 0 40750 52500 41250 52000 170 -1 +De 15 0 63 0 0 +Po 0 40750 47000 40750 46000 170 -1 +De 15 0 63 0 400 +Po 0 41750 49750 39500 49750 170 -1 De 0 0 64 0 0 -Po 0 41750 54500 41750 49750 170 -1 -De 15 0 64 0 400800 -Po 0 41750 34000 41500 34000 170 -1 +Po 0 41500 34000 40250 35250 170 -1 De 0 0 64 0 0 -Po 0 38000 35250 38250 35500 170 -1 +Po 0 38750 47000 38250 46500 170 -1 +De 15 0 64 0 0 +Po 0 38750 49000 38750 47000 170 -1 +De 15 0 64 0 800 +Po 3 41750 49750 41750 49750 550 -1 +De 15 1 64 0 0 +Po 0 41750 34000 52350 34000 170 -1 +De 0 0 64 0 0 +Po 0 52350 34000 56750 34000 170 -1 +De 0 0 64 0 0 +Po 0 56750 34000 57250 34500 170 -1 +De 0 0 64 0 400 +Po 0 39500 49750 38750 49000 170 -1 +De 0 0 64 0 400 +Po 0 38250 46500 38250 35500 170 -1 De 15 0 64 0 0 Po 3 38000 35250 38000 35250 550 -1 De 15 1 64 0 0 -Po 0 38250 46500 38250 35500 170 -1 +Po 0 38000 35250 38250 35500 170 -1 De 15 0 64 0 0 -Po 0 39500 49750 38750 49000 170 -1 -De 0 0 64 0 800400 -Po 0 56750 34000 57250 34500 170 -1 -De 0 0 64 0 800400 -Po 0 52350 34000 56750 34000 170 -1 +Po 0 41750 34000 41500 34000 170 -1 De 0 0 64 0 0 -Po 0 41750 34000 52350 34000 170 -1 +Po 0 41750 54500 41750 49750 170 -1 +De 15 0 64 0 800 +Po 0 40250 35250 38000 35250 170 -1 De 0 0 64 0 0 -Po 3 41750 49750 41750 49750 550 -1 -De 15 1 64 0 0 -Po 0 38750 49000 38750 47000 170 -1 -De 15 0 64 0 400800 -Po 0 38750 47000 38250 46500 170 -1 -De 15 0 64 0 0 -Po 0 41500 34000 40250 35250 170 -1 -De 0 0 64 0 0 -Po 0 41750 49750 39500 49750 170 -1 -De 0 0 64 0 0 -Po 0 42250 34500 42250 45000 170 -1 -De 15 0 65 0 0 -Po 0 42750 45500 42750 46000 170 -1 -De 15 0 65 0 800400 -Po 3 42250 34500 42250 34500 550 -1 -De 15 1 65 0 0 -Po 0 42250 48500 42750 48000 170 -1 -De 15 0 65 0 0 -Po 0 42750 48000 42750 46000 170 -1 -De 15 0 65 0 800400 -Po 0 42250 52500 42250 48500 170 -1 -De 15 0 65 0 0 -Po 0 42250 45000 42750 45500 170 -1 -De 15 0 65 0 0 -Po 0 56250 34500 42250 34500 170 -1 -De 0 0 65 0 400800 -Po 0 42750 54500 42750 53000 170 -1 -De 15 0 65 0 400800 Po 0 42750 53000 42250 52500 170 -1 De 15 0 65 0 0 -Po 0 44250 40000 44250 45500 170 -1 -De 15 0 66 0 0 -Po 0 43750 54500 43750 53000 170 -1 -De 15 0 66 0 400800 -Po 0 56750 33000 44250 33000 170 -1 -De 0 0 66 0 0 -Po 0 43750 33500 43750 39500 170 -1 -De 15 0 66 0 0 -Po 0 43750 39500 44250 40000 170 -1 -De 15 0 66 0 0 -Po 0 44250 33000 43750 33500 170 -1 -De 15 0 66 0 0 -Po 0 44750 48000 44750 46000 170 -1 -De 15 0 66 0 800400 -Po 0 57250 33500 56750 33000 170 -1 -De 0 0 66 0 400800 -Po 0 44250 52500 44250 48500 170 -1 -De 15 0 66 0 0 -Po 0 44250 45500 44750 46000 170 -1 -De 15 0 66 0 800400 -Po 0 43750 53000 44250 52500 170 -1 +Po 0 42750 54500 42750 53000 170 -1 +De 15 0 65 0 800 +Po 0 56250 34500 42250 34500 170 -1 +De 0 0 65 0 800 +Po 0 42250 45000 42750 45500 170 -1 +De 15 0 65 0 0 +Po 0 42250 52500 42250 48500 170 -1 +De 15 0 65 0 0 +Po 0 42750 48000 42750 46000 170 -1 +De 15 0 65 0 400 +Po 0 42250 48500 42750 48000 170 -1 +De 15 0 65 0 0 +Po 3 42250 34500 42250 34500 550 -1 +De 15 1 65 0 0 +Po 0 42750 45500 42750 46000 170 -1 +De 15 0 65 0 400 +Po 0 42250 34500 42250 45000 170 -1 +De 15 0 65 0 0 +Po 0 44250 48500 44750 48000 170 -1 De 15 0 66 0 0 Po 3 44250 33000 44250 33000 550 -1 De 15 1 66 0 0 -Po 0 44250 48500 44750 48000 170 -1 +Po 0 43750 53000 44250 52500 170 -1 +De 15 0 66 0 0 +Po 0 44250 45500 44750 46000 170 -1 +De 15 0 66 0 400 +Po 0 44250 52500 44250 48500 170 -1 +De 15 0 66 0 0 +Po 0 57250 33500 56750 33000 170 -1 +De 0 0 66 0 800 +Po 0 44750 48000 44750 46000 170 -1 +De 15 0 66 0 400 +Po 0 44250 33000 43750 33500 170 -1 +De 15 0 66 0 0 +Po 0 43750 39500 44250 40000 170 -1 +De 15 0 66 0 0 +Po 0 43750 33500 43750 39500 170 -1 +De 15 0 66 0 0 +Po 0 56750 33000 44250 33000 170 -1 +De 0 0 66 0 0 +Po 0 43750 54500 43750 53000 170 -1 +De 15 0 66 0 800 +Po 0 44250 40000 44250 45500 170 -1 De 15 0 66 0 0 -Po 0 40750 51500 40750 49000 170 -1 -De 15 0 67 0 800400 -Po 0 56250 33500 52350 33500 170 -1 -De 0 0 67 0 400800 -Po 0 44750 51500 40750 51500 170 -1 -De 0 0 67 0 0 -Po 0 40250 33500 40250 48500 170 -1 -De 15 0 67 0 0 -Po 3 44750 51500 44750 51500 550 -1 -De 15 1 67 0 0 -Po 0 40250 48500 40750 49000 170 -1 -De 15 0 67 0 800400 -Po 0 52350 33500 40250 33500 170 -1 -De 0 0 67 0 0 -Po 0 44750 54500 44750 51500 170 -1 -De 15 0 67 0 400800 -Po 3 40250 33500 40250 33500 550 -1 -De 15 1 67 0 0 Po 3 40750 51500 40750 51500 550 -1 De 15 1 67 0 0 -Po 3 60750 52000 60750 52000 550 -1 -De 15 1 68 0 0 -Po 0 62250 50500 62250 38500 170 -1 -De 15 0 68 0 800400 -Po 0 42750 52000 42750 49000 170 -1 -De 15 0 68 0 800400 -Po 0 60750 52000 62250 50500 170 -1 -De 15 0 68 0 0 -Po 0 45750 52000 42750 52000 170 -1 -De 0 0 68 0 0 -Po 3 42750 52000 42750 52000 550 -1 -De 15 1 68 0 0 -Po 0 45750 54500 45750 52000 170 -1 -De 15 0 68 0 400800 -Po 3 45750 52000 45750 52000 550 -1 -De 15 1 68 0 0 +Po 3 40250 33500 40250 33500 550 -1 +De 15 1 67 0 0 +Po 0 44750 54500 44750 51500 170 -1 +De 15 0 67 0 800 +Po 0 52350 33500 40250 33500 170 -1 +De 0 0 67 0 0 +Po 0 40250 48500 40750 49000 170 -1 +De 15 0 67 0 400 +Po 3 44750 51500 44750 51500 550 -1 +De 15 1 67 0 0 +Po 0 40250 33500 40250 48500 170 -1 +De 15 0 67 0 0 +Po 0 44750 51500 40750 51500 170 -1 +De 0 0 67 0 0 +Po 0 56250 33500 52350 33500 170 -1 +De 0 0 67 0 800 +Po 0 40750 51500 40750 49000 170 -1 +De 15 0 67 0 400 Po 0 45750 52000 60750 52000 170 -1 De 0 0 68 0 0 -Po 0 44750 50500 56750 50500 170 -1 -De 0 0 69 0 0 -Po 0 37750 49000 39000 50250 170 -1 -De 0 0 69 0 400800 -Po 0 64250 50500 64250 48000 170 -1 -De 15 0 69 0 0 -Po 0 64250 48000 65250 47000 170 -1 -De 15 0 69 0 0 -Po 0 56750 50500 64250 50500 170 -1 -De 0 0 69 0 0 -Po 0 39000 50250 44500 50250 170 -1 -De 0 0 69 0 0 -Po 3 56750 50500 56750 50500 550 -1 -De 15 1 69 0 0 -Po 0 65250 47000 65250 38500 170 -1 -De 15 0 69 0 800400 -Po 0 56750 50500 56750 54500 170 -1 -De 15 0 69 0 800400 -Po 3 64250 50500 64250 50500 550 -1 -De 15 1 69 0 0 +Po 3 45750 52000 45750 52000 550 -1 +De 15 1 68 0 0 +Po 0 45750 54500 45750 52000 170 -1 +De 15 0 68 0 800 +Po 3 42750 52000 42750 52000 550 -1 +De 15 1 68 0 0 +Po 0 45750 52000 42750 52000 170 -1 +De 0 0 68 0 0 +Po 0 60750 52000 62250 50500 170 -1 +De 15 0 68 0 0 +Po 0 42750 52000 42750 49000 170 -1 +De 15 0 68 0 400 +Po 0 62250 50500 62250 38500 170 -1 +De 15 0 68 0 400 +Po 3 60750 52000 60750 52000 550 -1 +De 15 1 68 0 0 Po 0 44500 50250 44750 50500 170 -1 De 0 0 69 0 0 +Po 3 64250 50500 64250 50500 550 -1 +De 15 1 69 0 0 +Po 0 56750 50500 56750 54500 170 -1 +De 15 0 69 0 400 +Po 0 65250 47000 65250 38500 170 -1 +De 15 0 69 0 400 +Po 3 56750 50500 56750 50500 550 -1 +De 15 1 69 0 0 +Po 0 39000 50250 44500 50250 170 -1 +De 0 0 69 0 0 +Po 0 56750 50500 64250 50500 170 -1 +De 0 0 69 0 0 +Po 0 64250 48000 65250 47000 170 -1 +De 15 0 69 0 0 +Po 0 64250 50500 64250 48000 170 -1 +De 15 0 69 0 0 +Po 0 37750 49000 39000 50250 170 -1 +De 0 0 69 0 800 +Po 0 44750 50500 56750 50500 170 -1 +De 0 0 69 0 0 Po 0 60750 50000 60750 49000 170 -1 -De 15 0 70 0 800400 +De 15 0 70 0 400 Po 0 58750 54500 58750 52000 170 -1 -De 15 0 70 0 400800 +De 15 0 70 0 800 Po 0 58750 52000 60750 50000 170 -1 De 15 0 70 0 0 Po 0 61750 50000 61750 49000 170 -1 -De 15 0 71 0 800400 +De 15 0 71 0 400 Po 0 59750 52000 61750 50000 170 -1 De 15 0 71 0 0 Po 0 59750 54500 59750 52000 170 -1 -De 15 0 71 0 400800 +De 15 0 71 0 800 +Po 0 60750 54500 60750 53000 170 -1 +De 15 0 72 0 800 +Po 0 62750 51000 62750 49000 170 -1 +De 15 0 72 0 400 Po 0 60750 53000 62750 51000 170 -1 De 15 0 72 0 0 -Po 0 62750 51000 62750 49000 170 -1 -De 15 0 72 0 800400 -Po 0 60750 54500 60750 53000 170 -1 -De 15 0 72 0 400800 Po 0 61750 53000 63750 51000 170 -1 De 15 0 73 0 0 Po 0 63750 51000 63750 49000 170 -1 -De 15 0 73 0 800400 +De 15 0 73 0 400 Po 0 61750 54500 61750 53000 170 -1 -De 15 0 73 0 400800 +De 15 0 73 0 800 Po 0 62750 54500 62750 52750 170 -1 -De 15 0 74 0 400800 +De 15 0 74 0 800 Po 0 62750 52750 64750 50750 170 -1 De 15 0 74 0 0 Po 0 64750 50750 64750 49000 170 -1 -De 15 0 74 0 800400 +De 15 0 74 0 400 Po 0 63750 54500 63750 52500 170 -1 -De 15 0 75 0 400800 +De 15 0 75 0 800 Po 0 63750 52500 65750 50500 170 -1 De 15 0 75 0 0 Po 0 65750 50500 65750 49000 170 -1 -De 15 0 75 0 800400 +De 15 0 75 0 400 Po 0 64750 52000 64750 54500 170 -1 -De 15 0 76 0 800400 +De 15 0 76 0 400 Po 0 66750 50000 64750 52000 170 -1 De 15 0 76 0 0 Po 0 66750 49000 66750 50000 170 -1 -De 15 0 76 0 400800 -Po 0 66250 52500 67250 52500 170 -1 -De 15 0 77 0 0 -Po 0 65750 54500 65750 53000 170 -1 -De 15 0 77 0 400800 -Po 0 65750 53000 66250 52500 170 -1 -De 15 0 77 0 0 +De 15 0 76 0 800 +Po 0 67750 52000 67750 49000 170 -1 +De 15 0 77 0 400 Po 0 67250 52500 67750 52000 170 -1 De 15 0 77 0 0 -Po 0 67750 52000 67750 49000 170 -1 -De 15 0 77 0 800400 +Po 0 65750 53000 66250 52500 170 -1 +De 15 0 77 0 0 +Po 0 65750 54500 65750 53000 170 -1 +De 15 0 77 0 800 +Po 0 66250 52500 67250 52500 170 -1 +De 15 0 77 0 0 Po 0 53750 54500 53750 52500 170 -1 -De 0 0 78 0 400800 +De 0 0 78 0 800 Po 0 53750 52500 54750 51500 170 -1 De 15 0 78 0 0 Po 0 54750 51500 54750 49000 170 -1 -De 15 0 78 0 800400 +De 15 0 78 0 400 Po 3 53750 52500 53750 52500 550 -1 De 15 1 78 0 0 -Po 0 54750 54500 54750 52500 170 -1 -De 0 0 79 0 400800 -Po 0 55250 52000 55250 48500 170 -1 -De 15 0 79 0 0 -Po 0 54250 48500 53750 49000 170 -1 -De 15 0 79 0 800400 -Po 3 54750 52500 54750 52500 550 -1 -De 15 1 79 0 0 -Po 0 54750 52500 55250 52000 170 -1 -De 15 0 79 0 0 Po 0 55250 48500 54250 48500 170 -1 De 15 0 79 0 0 -Po 0 58750 41500 59250 41000 170 -1 -De 0 0 80 0 400800 -Po 0 60250 41000 60750 41500 170 -1 +Po 0 54750 52500 55250 52000 170 -1 +De 15 0 79 0 0 +Po 3 54750 52500 54750 52500 550 -1 +De 15 1 79 0 0 +Po 0 54250 48500 53750 49000 170 -1 +De 15 0 79 0 400 +Po 0 55250 52000 55250 48500 170 -1 +De 15 0 79 0 0 +Po 0 54750 54500 54750 52500 170 -1 +De 0 0 79 0 800 +Po 0 59250 41000 60250 41000 170 -1 De 0 0 80 0 0 -Po 0 60750 41500 63750 41500 170 -1 +Po 0 63750 38000 63250 37500 170 -1 +De 15 0 80 0 400 +Po 3 63750 41500 63750 41500 550 -1 +De 15 1 80 0 0 +Po 0 58750 43500 56250 43500 170 -1 De 0 0 80 0 0 -Po 0 56250 43500 56250 45500 170 -1 -De 15 0 80 0 0 -Po 3 56250 43500 56250 43500 550 -1 +Po 0 58750 41500 58750 43500 170 -1 +De 15 0 80 0 800 +Po 0 56250 45500 55750 46000 170 -1 +De 15 0 80 0 400 +Po 3 58750 43500 58750 43500 550 -1 De 15 1 80 0 0 Po 0 63750 41500 63750 38000 170 -1 De 15 0 80 0 0 -Po 3 58750 43500 58750 43500 550 -1 +Po 3 56250 43500 56250 43500 550 -1 De 15 1 80 0 0 -Po 0 56250 45500 55750 46000 170 -1 -De 15 0 80 0 800400 -Po 0 58750 41500 58750 43500 170 -1 -De 15 0 80 0 400800 -Po 0 58750 43500 56250 43500 170 -1 +Po 0 56250 43500 56250 45500 170 -1 +De 15 0 80 0 0 +Po 0 60750 41500 63750 41500 170 -1 De 0 0 80 0 0 -Po 3 63750 41500 63750 41500 550 -1 -De 15 1 80 0 0 -Po 0 63750 38000 63250 37500 170 -1 -De 15 0 80 0 800400 -Po 0 59250 41000 60250 41000 170 -1 +Po 0 60250 41000 60750 41500 170 -1 De 0 0 80 0 0 +Po 0 58750 41500 59250 41000 170 -1 +De 0 0 80 0 800 Po 0 57250 50000 56750 49500 170 -1 De 0 0 81 0 0 Po 0 65750 54500 65750 50500 170 -1 -De 0 0 81 0 400800 +De 0 0 81 0 800 Po 0 56750 49500 56750 49000 170 -1 -De 0 0 81 0 800400 +De 0 0 81 0 400 Po 0 56750 49000 55750 49000 170 -1 -De 0 0 81 0 C00C00 +De 0 0 81 0 C00 Po 0 65750 50500 65250 50000 170 -1 De 0 0 81 0 0 Po 0 65250 50000 57250 50000 170 -1 De 0 0 81 0 0 -Po 0 54875 45000 61250 45000 170 -1 -De 0 0 82 0 0 -Po 0 54750 46000 54750 44500 170 -1 -De 15 0 82 0 C00C00 -Po 0 54875 45000 54750 44875 170 -1 -De 0 0 82 0 0 -Po 0 61250 45000 61250 38500 170 -1 -De 15 0 82 0 800400 +Po 0 54750 44875 54750 44500 170 -1 +De 0 0 82 0 400 Po 3 61250 45000 61250 45000 550 -1 De 15 1 82 0 0 -Po 0 54750 44875 54750 44500 170 -1 -De 0 0 82 0 800400 +Po 0 61250 45000 61250 38500 170 -1 +De 15 0 82 0 400 +Po 0 54875 45000 54750 44875 170 -1 +De 0 0 82 0 0 +Po 0 54750 46000 54750 44500 170 -1 +De 15 0 82 0 C00 +Po 0 54875 45000 61250 45000 170 -1 +De 0 0 82 0 0 Po 0 70750 39000 70750 39500 170 -1 De 0 0 83 0 0 Po 0 68250 36500 70750 39000 170 -1 -De 0 0 83 0 400800 +De 0 0 83 0 800 Po 0 70750 39500 71750 40450 170 -1 -De 0 0 83 0 800400 -Po 0 59000 40750 59250 40500 170 -1 -De 0 0 84 0 0 -Po 0 59250 40500 60500 40500 170 -1 -De 0 0 84 0 0 -Po 0 53750 41500 53750 41000 170 -1 -De 0 0 84 0 400800 -Po 0 67750 40625 67750 37625 170 -1 -De 0 0 84 0 0 -Po 0 60750 40750 67625 40750 170 -1 -De 0 0 84 0 0 -Po 0 53750 41000 54000 40750 170 -1 -De 0 0 84 0 0 -Po 0 54000 40750 59000 40750 170 -1 -De 0 0 84 0 0 -Po 0 67625 37500 67250 37500 170 -1 -De 0 0 84 0 800400 -Po 0 67750 37625 67625 37500 170 -1 +De 0 0 83 0 400 +Po 0 60500 40500 60750 40750 170 -1 De 0 0 84 0 0 Po 0 67625 40750 67750 40625 170 -1 De 0 0 84 0 0 -Po 0 60500 40500 60750 40750 170 -1 +Po 0 67750 37625 67625 37500 170 -1 +De 0 0 84 0 0 +Po 0 67625 37500 67250 37500 170 -1 +De 0 0 84 0 400 +Po 0 54000 40750 59000 40750 170 -1 +De 0 0 84 0 0 +Po 0 53750 41000 54000 40750 170 -1 +De 0 0 84 0 0 +Po 0 60750 40750 67625 40750 170 -1 +De 0 0 84 0 0 +Po 0 67750 40625 67750 37625 170 -1 +De 0 0 84 0 0 +Po 0 53750 41500 53750 41000 170 -1 +De 0 0 84 0 800 +Po 0 59250 40500 60500 40500 170 -1 +De 0 0 84 0 0 +Po 0 59000 40750 59250 40500 170 -1 De 0 0 84 0 0 Po 0 45750 46000 45750 44500 170 -1 -De 15 0 85 0 C00C00 +De 15 0 85 0 C00 Po 0 45750 44500 45750 42500 170 -1 -De 15 0 85 0 C00C00 +De 15 0 85 0 C00 Po 0 45250 47000 45750 47500 170 -1 De 15 0 86 0 0 Po 0 45750 47500 45750 49000 170 -1 -De 15 0 86 0 800400 +De 15 0 86 0 400 Po 0 44750 44500 44750 42500 170 -1 -De 15 0 86 0 C00C00 +De 15 0 86 0 C00 Po 0 44750 44500 45250 45000 170 -1 -De 15 0 86 0 400800 +De 15 0 86 0 800 Po 0 45250 45000 45250 47000 170 -1 De 15 0 86 0 0 -Po 0 39750 44500 39750 46000 170 -1 -De 15 0 87 0 C00C00 Po 0 39750 42500 39750 44500 170 -1 -De 15 0 87 0 C00C00 +De 15 0 87 0 C00 +Po 0 39750 44500 39750 46000 170 -1 +De 15 0 87 0 C00 Po 0 39250 45000 39250 47000 170 -1 De 15 0 88 0 0 Po 0 38750 44500 39250 45000 170 -1 -De 15 0 88 0 400800 +De 15 0 88 0 800 Po 0 39750 47500 39750 49000 170 -1 -De 15 0 88 0 800400 +De 15 0 88 0 400 Po 0 38750 44500 38750 42500 170 -1 -De 15 0 88 0 C00C00 +De 15 0 88 0 C00 Po 0 39250 47000 39750 47500 170 -1 De 15 0 88 0 0 Po 0 41750 46000 41750 44500 170 -1 -De 15 0 89 0 C00C00 +De 15 0 89 0 C00 Po 0 41750 44500 41750 42500 170 -1 -De 15 0 89 0 C00C00 +De 15 0 89 0 C00 Po 0 43750 46000 43750 44500 170 -1 -De 15 0 90 0 C00C00 +De 15 0 90 0 C00 Po 0 43750 44500 43750 42500 170 -1 -De 15 0 90 0 C00C00 -Po 0 41750 47500 41750 49000 170 -1 -De 15 0 91 0 800400 -Po 0 40750 44500 41250 45000 170 -1 -De 15 0 91 0 400800 -Po 0 41250 47000 41750 47500 170 -1 -De 15 0 91 0 0 -Po 0 40750 44500 40750 42500 170 -1 -De 15 0 91 0 C00C00 +De 15 0 90 0 C00 Po 0 41250 45000 41250 47000 170 -1 De 15 0 91 0 0 +Po 0 40750 44500 40750 42500 170 -1 +De 15 0 91 0 C00 +Po 0 41250 47000 41750 47500 170 -1 +De 15 0 91 0 0 +Po 0 40750 44500 41250 45000 170 -1 +De 15 0 91 0 800 +Po 0 41750 47500 41750 49000 170 -1 +De 15 0 91 0 400 Po 0 42750 44500 43250 45000 170 -1 -De 15 0 92 0 400800 +De 15 0 92 0 800 Po 0 43750 47500 43750 49000 170 -1 -De 15 0 92 0 800400 +De 15 0 92 0 400 Po 0 43250 45000 43250 47000 170 -1 De 15 0 92 0 0 Po 0 42750 44500 42750 42500 170 -1 -De 15 0 92 0 C00C00 +De 15 0 92 0 C00 Po 0 43250 47000 43750 47500 170 -1 De 15 0 92 0 0 Po 0 57250 45500 56750 46000 170 -1 -De 15 0 93 0 800400 +De 15 0 93 0 400 Po 0 58750 44500 58750 45000 170 -1 -De 15 0 93 0 400800 +De 15 0 93 0 800 Po 0 58750 45000 58250 45500 170 -1 De 15 0 93 0 0 Po 0 58250 45500 57250 45500 170 -1 De 15 0 93 0 0 -Po 0 54875 37000 57125 37000 170 -1 +Po 0 57250 36875 57250 36500 170 -1 +De 15 0 94 0 400 +Po 0 54750 41500 54750 37125 170 -1 +De 15 0 94 0 800 +Po 0 57125 37000 57250 36875 170 -1 De 15 0 94 0 0 Po 0 54750 37125 54875 37000 170 -1 De 15 0 94 0 0 -Po 0 57125 37000 57250 36875 170 -1 +Po 0 54875 37000 57125 37000 170 -1 De 15 0 94 0 0 -Po 0 54750 41500 54750 37125 170 -1 -De 15 0 94 0 400800 -Po 0 57250 36875 57250 36500 170 -1 -De 15 0 94 0 800400 Po 0 68750 38500 71750 41500 170 -1 De 0 0 95 0 0 Po 0 68250 38500 68750 38500 170 -1 -De 0 0 95 0 400800 +De 0 0 95 0 800 Po 0 71750 41500 71750 41550 170 -1 -De 0 0 95 0 800400 -Po 0 66750 30250 67000 30000 170 -1 -De 0 0 96 0 0 -Po 0 72750 32250 72750 32300 170 -1 -De 15 0 96 0 800400 -Po 0 66750 31000 66750 30250 170 -1 -De 0 0 96 0 0 -Po 0 70500 32250 72750 32250 170 -1 -De 15 0 96 0 0 -Po 0 70250 30000 70250 32000 170 -1 +De 0 0 95 0 400 +Po 0 66250 31500 66750 31000 170 -1 +De 0 0 96 0 800 +Po 3 70250 30000 70250 30000 550 -1 +De 15 1 96 0 0 +Po 0 70250 32000 70500 32250 170 -1 De 15 0 96 0 0 Po 0 67000 30000 70250 30000 170 -1 De 0 0 96 0 0 -Po 0 70250 32000 70500 32250 170 -1 +Po 0 70250 30000 70250 32000 170 -1 De 15 0 96 0 0 -Po 3 70250 30000 70250 30000 550 -1 -De 15 1 96 0 0 -Po 0 66250 31500 66750 31000 170 -1 -De 0 0 96 0 400800 +Po 0 70500 32250 72750 32250 170 -1 +De 15 0 96 0 0 +Po 0 66750 31000 66750 30250 170 -1 +De 0 0 96 0 0 +Po 0 72750 32250 72750 32300 170 -1 +De 15 0 96 0 400 +Po 0 66750 30250 67000 30000 170 -1 +De 0 0 96 0 0 Po 0 67750 27000 70250 27000 170 -1 De 0 0 97 0 0 Po 0 70250 27000 71750 28500 170 -1 -De 0 0 97 0 800400 +De 0 0 97 0 400 Po 0 67250 26500 67750 27000 170 -1 -De 0 0 97 0 400800 -Po 0 63250 17500 37250 17500 170 -1 -De 0 0 98 0 0 -Po 0 63750 18000 63250 17500 170 -1 -De 0 0 98 0 0 -Po 0 37250 24000 37250 17500 170 -1 -De 15 0 98 0 400800 -Po 0 68250 26500 68250 18000 170 -1 -De 15 0 98 0 400800 -Po 3 68250 18000 68250 18000 550 -1 +De 0 0 97 0 800 +Po 3 37250 17500 37250 17500 550 -1 De 15 1 98 0 0 Po 0 68250 18000 63750 18000 170 -1 De 0 0 98 0 0 -Po 3 37250 17500 37250 17500 550 -1 +Po 3 68250 18000 68250 18000 550 -1 De 15 1 98 0 0 -Po 0 59750 41875 59750 41500 170 -1 -De 0 0 99 0 800400 -Po 0 57750 41500 57750 41875 170 -1 -De 0 0 99 0 400800 -Po 0 57750 41875 57875 42000 170 -1 +Po 0 68250 26500 68250 18000 170 -1 +De 15 0 98 0 800 +Po 0 37250 24000 37250 17500 170 -1 +De 15 0 98 0 800 +Po 0 63750 18000 63250 17500 170 -1 +De 0 0 98 0 0 +Po 0 63250 17500 37250 17500 170 -1 +De 0 0 98 0 0 +Po 0 57875 42000 59625 42000 170 -1 De 0 0 99 0 0 Po 0 59625 42000 59750 41875 170 -1 De 0 0 99 0 0 -Po 0 57875 42000 59625 42000 170 -1 +Po 0 57750 41875 57875 42000 170 -1 De 0 0 99 0 0 -Po 0 72750 34480 72750 33380 220 -1 -De 0 0 100 0 C00C00 -Po 0 72750 41000 72750 39900 220 -1 -De 0 0 100 0 C00C00 -Po 0 72750 37760 72750 36640 220 -1 -De 0 0 100 0 C00C00 -Po 0 72750 36640 72750 35560 220 -1 -De 0 0 100 0 C00C00 -Po 0 72750 39900 72750 38820 220 -1 -De 0 0 100 0 C00C00 -Po 0 72750 35560 72750 34480 220 -1 -De 0 0 100 0 C00C00 -Po 0 72750 38820 72750 37760 220 -1 -De 0 0 100 0 C00C00 -Po 0 57250 32500 57750 33000 220 -1 -De 15 0 100 0 400800 -Po 0 48750 44500 48750 45000 220 -1 -De 15 0 100 0 400800 -Po 0 49250 30000 49250 31000 220 -1 -De 15 0 100 0 400800 -Po 0 33500 42750 33500 49750 220 -1 -De 0 0 100 0 0 -Po 0 38750 36500 38750 35000 220 -1 +Po 0 57750 41500 57750 41875 170 -1 +De 0 0 99 0 800 +Po 0 59750 41875 59750 41500 170 -1 +De 0 0 99 0 400 +Po 0 65750 35000 65750 33000 220 -1 De 15 0 100 0 0 -Po 0 61750 14500 62750 14500 220 -1 -De 15 0 100 0 0 -Po 0 49250 30000 49250 29500 220 -1 -De 15 0 100 0 400800 -Po 0 47750 43500 48750 44500 220 -1 -De 15 0 100 0 800400 -Po 0 48750 48500 49750 47500 220 -1 -De 15 0 100 0 0 -Po 0 49750 47500 49750 46000 220 -1 -De 15 0 100 0 800400 -Po 0 65250 28500 65750 29000 220 -1 -De 15 0 100 0 400800 -Po 0 48750 45000 49750 46000 220 -1 -De 15 0 100 0 800400 -Po 0 68750 51500 68250 52000 220 -1 +Po 0 39750 41500 40750 41500 220 -1 +De 0 0 100 0 C00 +Po 0 46750 49000 48750 49000 220 -1 +De 0 0 100 0 C00 +Po 0 43750 41500 44750 41500 220 -1 +De 0 0 100 0 C00 +Po 0 61750 21000 61250 20500 220 -1 +De 15 0 100 0 400 +Po 0 57750 35000 58250 35500 220 -1 +De 15 0 100 0 400 +Po 0 42250 36500 38750 36500 220 -1 De 0 0 100 0 0 -Po 0 67250 52000 66750 52500 220 -1 +Po 0 62250 35500 62250 36500 220 -1 +De 15 0 100 0 400 +Po 0 48750 31500 48750 36000 220 -1 +De 15 0 100 0 400 +Po 0 43750 35000 42250 36500 220 -1 De 0 0 100 0 0 -Po 0 66750 52500 66750 54500 220 -1 -De 0 0 100 0 800400 -Po 0 68250 52000 67250 52000 220 -1 -De 0 0 100 0 0 -Po 0 68750 49000 68750 51500 220 -1 -De 0 0 100 0 400800 -Po 0 61750 28000 62250 27500 220 -1 -De 15 0 100 0 800400 -Po 0 47750 41500 47750 43500 220 -1 -De 15 0 100 0 0 -Po 0 57250 48000 49750 48000 220 -1 -De 0 0 100 0 0 -Po 0 48750 39000 48750 36000 220 -1 -De 15 0 100 0 C00C00 -Po 0 44250 35000 43750 35000 220 -1 -De 0 0 100 0 0 -Po 0 49250 29500 48750 29000 220 -1 -De 15 0 100 0 0 -Po 0 62750 28000 64750 28000 220 -1 -De 0 0 100 0 0 -Po 3 47750 41500 47750 41500 600 -1 -De 15 1 100 0 0 -Po 0 57750 49000 57750 48500 220 -1 -De 0 0 100 0 400800 -Po 0 34750 52000 34250 51500 220 -1 -De 0 0 100 0 0 -Po 0 36750 54500 36250 54000 220 -1 -De 0 0 100 0 400800 -Po 0 36250 54000 36250 52500 220 -1 -De 0 0 100 0 0 -Po 0 36250 52500 35750 52000 220 -1 -De 0 0 100 0 0 -Po 0 34250 51500 34250 50500 220 -1 -De 0 0 100 0 800400 -Po 0 35750 52000 34750 52000 220 -1 -De 0 0 100 0 0 -Po 3 62250 35500 62250 35500 600 -1 -De 15 1 100 0 0 -Po 0 64750 28000 65250 28500 220 -1 -De 0 0 100 0 800400 -Po 0 57750 48500 57250 48000 220 -1 -De 0 0 100 0 0 -Po 0 59250 28500 59750 28000 220 -1 -De 15 0 100 0 400800 -Po 0 38750 33000 38750 35000 220 -1 -De 15 0 100 0 400800 -Po 0 47750 35000 48750 36000 220 -1 -De 0 0 100 0 800400 -Po 0 44250 35000 47750 35000 220 -1 -De 0 0 100 0 0 -Po 0 65750 32000 66250 32500 220 -1 -De 15 0 100 0 800400 -Po 0 41750 41500 42750 41500 220 -1 -De 0 0 100 0 C00C00 -Po 0 38750 41500 34750 41500 220 -1 -De 0 0 100 0 400800 -Po 0 34750 41500 33500 42750 220 -1 -De 0 0 100 0 0 -Po 0 65750 33000 66250 32500 220 -1 -De 15 0 100 0 800400 -Po 0 48750 39000 48750 40500 220 -1 -De 15 0 100 0 400800 -Po 0 62250 35500 66250 35500 220 -1 -De 0 0 100 0 800400 -Po 0 62750 14500 63250 15000 220 -1 -De 15 0 100 0 0 -Po 0 49250 31000 48750 31500 220 -1 -De 15 0 100 0 0 -Po 0 43750 41500 42750 41500 220 -1 -De 0 0 100 0 C00C00 -Po 0 57750 33000 57750 35000 220 -1 -De 15 0 100 0 0 -Po 0 33500 49750 34250 50500 220 -1 -De 0 0 100 0 800400 -Po 0 65750 29000 65750 32000 220 -1 +Po 0 45750 41500 47750 41500 220 -1 +De 0 0 100 0 800 +Po 0 61750 27000 61750 21000 220 -1 De 15 0 100 0 0 Po 0 59750 28000 61750 28000 220 -1 De 15 0 100 0 0 -Po 0 61750 27000 61750 21000 220 -1 +Po 0 65750 29000 65750 32000 220 -1 De 15 0 100 0 0 -Po 0 45750 41500 47750 41500 220 -1 -De 0 0 100 0 400800 -Po 0 43750 35000 42250 36500 220 -1 +Po 0 33500 49750 34250 50500 220 -1 +De 0 0 100 0 400 +Po 0 57750 33000 57750 35000 220 -1 +De 15 0 100 0 0 +Po 0 43750 41500 42750 41500 220 -1 +De 0 0 100 0 C00 +Po 0 49250 31000 48750 31500 220 -1 +De 15 0 100 0 0 +Po 0 62750 14500 63250 15000 220 -1 +De 15 0 100 0 0 +Po 0 62250 35500 66250 35500 220 -1 +De 0 0 100 0 400 +Po 0 48750 39000 48750 40500 220 -1 +De 15 0 100 0 800 +Po 0 65750 33000 66250 32500 220 -1 +De 15 0 100 0 400 +Po 0 34750 41500 33500 42750 220 -1 De 0 0 100 0 0 -Po 0 48750 31500 48750 36000 220 -1 -De 15 0 100 0 800400 -Po 0 62250 35500 62250 36500 220 -1 -De 15 0 100 0 800400 -Po 0 42250 36500 38750 36500 220 -1 -De 0 0 100 0 0 -Po 0 57750 35000 58250 35500 220 -1 -De 15 0 100 0 800400 -Po 0 61750 21000 61250 20500 220 -1 -De 15 0 100 0 800400 -Po 0 43750 41500 44750 41500 220 -1 -De 0 0 100 0 C00C00 -Po 0 46750 49000 48750 49000 220 -1 -De 0 0 100 0 C00C00 -Po 0 39750 41500 40750 41500 220 -1 -De 0 0 100 0 C00C00 -Po 0 65750 35000 65750 33000 220 -1 -De 15 0 100 0 0 -Po 0 66250 35500 65750 35000 220 -1 -De 15 0 100 0 400800 -Po 0 48750 29000 48750 20500 220 -1 -De 15 0 100 0 0 -Po 0 41750 41500 40750 41500 220 -1 -De 0 0 100 0 C00C00 -Po 0 39750 41500 38750 41500 220 -1 -De 0 0 100 0 C00C00 -Po 0 44750 41500 45750 41500 220 -1 -De 0 0 100 0 C00C00 -Po 0 58250 35500 62250 35500 220 -1 -De 0 0 100 0 400800 -Po 0 62250 27500 62750 28000 220 -1 -De 0 0 100 0 400800 -Po 0 62250 27500 61750 27000 220 -1 -De 15 0 100 0 400800 -Po 0 48750 40500 47750 41500 220 -1 -De 15 0 100 0 0 -Po 3 48750 20500 48750 20500 600 -1 -De 15 1 100 0 0 -Po 0 48750 20500 61250 20500 220 -1 -De 0 0 100 0 800400 -Po 0 68750 48750 68750 49000 220 -1 -De 0 0 100 0 800400 -Po 0 68000 48000 68750 48750 220 -1 -De 0 0 100 0 0 -Po 0 57750 49000 58750 48000 220 -1 -De 0 0 100 0 400800 -Po 0 48750 49000 48750 48500 220 -1 -De 15 0 100 0 400800 -Po 0 49750 48000 48750 49000 220 -1 -De 0 0 100 0 800400 -Po 3 38750 36500 38750 36500 600 -1 -De 15 1 100 0 0 -Po 0 58750 48000 68000 48000 220 -1 -De 0 0 100 0 0 -Po 0 61250 15000 61750 14500 220 -1 -De 15 0 100 0 400800 -Po 0 60750 17000 61250 17500 220 -1 -De 15 0 100 0 0 +Po 0 38750 41500 34750 41500 220 -1 +De 0 0 100 0 800 +Po 0 61250 17500 61250 20500 220 -1 +De 15 0 100 0 400 +Po 0 63250 15000 65250 15000 220 -1 +De 15 0 100 0 400 +Po 0 61250 15000 60750 15500 220 -1 +De 15 0 100 0 800 Po 0 60750 15500 60750 17000 220 -1 De 15 0 100 0 0 -Po 0 61250 15000 60750 15500 220 -1 -De 15 0 100 0 400800 -Po 0 63250 15000 65250 15000 220 -1 -De 15 0 100 0 800400 -Po 0 61250 17500 61250 20500 220 -1 -De 15 0 100 0 800400 +Po 0 60750 17000 61250 17500 220 -1 +De 15 0 100 0 0 +Po 0 61250 15000 61750 14500 220 -1 +De 15 0 100 0 800 +Po 0 58750 48000 68000 48000 220 -1 +De 0 0 100 0 0 +Po 3 38750 36500 38750 36500 600 -1 +De 15 1 100 0 0 +Po 0 49750 48000 48750 49000 220 -1 +De 0 0 100 0 400 +Po 0 48750 49000 48750 48500 220 -1 +De 15 0 100 0 800 +Po 0 57750 49000 58750 48000 220 -1 +De 0 0 100 0 800 +Po 0 68000 48000 68750 48750 220 -1 +De 0 0 100 0 0 +Po 0 68750 48750 68750 49000 220 -1 +De 0 0 100 0 400 +Po 0 48750 20500 61250 20500 220 -1 +De 0 0 100 0 400 +Po 3 48750 20500 48750 20500 600 -1 +De 15 1 100 0 0 +Po 0 48750 40500 47750 41500 220 -1 +De 15 0 100 0 0 +Po 0 62250 27500 61750 27000 220 -1 +De 15 0 100 0 800 +Po 0 62250 27500 62750 28000 220 -1 +De 0 0 100 0 800 +Po 0 58250 35500 62250 35500 220 -1 +De 0 0 100 0 800 +Po 0 44750 41500 45750 41500 220 -1 +De 0 0 100 0 C00 +Po 0 39750 41500 38750 41500 220 -1 +De 0 0 100 0 C00 +Po 0 41750 41500 40750 41500 220 -1 +De 0 0 100 0 C00 +Po 0 48750 29000 48750 20500 220 -1 +De 15 0 100 0 0 +Po 0 66250 35500 65750 35000 220 -1 +De 15 0 100 0 800 +Po 0 68750 49000 68750 51500 220 -1 +De 0 0 100 0 800 +Po 0 68250 52000 67250 52000 220 -1 +De 0 0 100 0 0 +Po 0 66750 52500 66750 54500 220 -1 +De 0 0 100 0 400 +Po 0 67250 52000 66750 52500 220 -1 +De 0 0 100 0 0 +Po 0 68750 51500 68250 52000 220 -1 +De 0 0 100 0 0 +Po 0 48750 45000 49750 46000 220 -1 +De 15 0 100 0 400 +Po 0 65250 28500 65750 29000 220 -1 +De 15 0 100 0 800 +Po 0 49750 47500 49750 46000 220 -1 +De 15 0 100 0 400 +Po 0 48750 48500 49750 47500 220 -1 +De 15 0 100 0 0 +Po 0 47750 43500 48750 44500 220 -1 +De 15 0 100 0 400 +Po 0 49250 30000 49250 29500 220 -1 +De 15 0 100 0 800 +Po 0 61750 14500 62750 14500 220 -1 +De 15 0 100 0 0 +Po 0 38750 36500 38750 35000 220 -1 +De 15 0 100 0 0 +Po 0 33500 42750 33500 49750 220 -1 +De 0 0 100 0 0 +Po 0 49250 30000 49250 31000 220 -1 +De 15 0 100 0 800 +Po 0 48750 44500 48750 45000 220 -1 +De 15 0 100 0 800 +Po 0 57250 32500 57750 33000 220 -1 +De 15 0 100 0 800 +Po 0 72750 38820 72750 37760 220 -1 +De 0 0 100 0 C00 +Po 0 72750 35560 72750 34480 220 -1 +De 0 0 100 0 C00 +Po 0 72750 39900 72750 38820 220 -1 +De 0 0 100 0 C00 +Po 0 72750 36640 72750 35560 220 -1 +De 0 0 100 0 C00 +Po 0 72750 37760 72750 36640 220 -1 +De 0 0 100 0 C00 +Po 0 72750 41000 72750 39900 220 -1 +De 0 0 100 0 C00 +Po 0 72750 34480 72750 33380 220 -1 +De 0 0 100 0 C00 +Po 0 41750 41500 42750 41500 220 -1 +De 0 0 100 0 C00 +Po 0 65750 32000 66250 32500 220 -1 +De 15 0 100 0 400 +Po 0 44250 35000 47750 35000 220 -1 +De 0 0 100 0 0 +Po 0 47750 35000 48750 36000 220 -1 +De 0 0 100 0 400 +Po 0 38750 33000 38750 35000 220 -1 +De 15 0 100 0 800 +Po 0 59250 28500 59750 28000 220 -1 +De 15 0 100 0 800 +Po 0 57750 48500 57250 48000 220 -1 +De 0 0 100 0 0 +Po 0 64750 28000 65250 28500 220 -1 +De 0 0 100 0 400 +Po 3 62250 35500 62250 35500 600 -1 +De 15 1 100 0 0 +Po 0 35750 52000 34750 52000 220 -1 +De 0 0 100 0 0 +Po 0 34250 51500 34250 50500 220 -1 +De 0 0 100 0 400 +Po 0 36250 52500 35750 52000 220 -1 +De 0 0 100 0 0 +Po 0 36250 54000 36250 52500 220 -1 +De 0 0 100 0 0 +Po 0 36750 54500 36250 54000 220 -1 +De 0 0 100 0 800 +Po 0 34750 52000 34250 51500 220 -1 +De 0 0 100 0 0 +Po 0 57750 49000 57750 48500 220 -1 +De 0 0 100 0 800 +Po 3 47750 41500 47750 41500 600 -1 +De 15 1 100 0 0 +Po 0 62750 28000 64750 28000 220 -1 +De 0 0 100 0 0 +Po 0 49250 29500 48750 29000 220 -1 +De 15 0 100 0 0 +Po 0 44250 35000 43750 35000 220 -1 +De 0 0 100 0 0 +Po 0 48750 39000 48750 36000 220 -1 +De 15 0 100 0 C00 +Po 0 57250 48000 49750 48000 220 -1 +De 0 0 100 0 0 +Po 0 47750 41500 47750 43500 220 -1 +De 15 0 100 0 0 +Po 0 61750 28000 62250 27500 220 -1 +De 15 0 100 0 400 Po 0 36250 22500 36250 24000 170 -1 -De 0 0 101 0 C00C00 +De 0 0 101 0 C00 Po 0 66250 16500 66250 15000 170 -1 -De 15 0 102 0 C00C00 -Po 0 61250 16500 62250 15500 170 -1 -De 15 0 103 0 400800 +De 15 0 102 0 C00 Po 0 62250 15500 62250 15000 170 -1 -De 15 0 103 0 800400 +De 15 0 103 0 400 +Po 0 61250 16500 62250 15500 170 -1 +De 15 0 103 0 800 Po 0 50750 46000 50750 44500 170 -1 -De 15 0 104 0 C00C00 +De 15 0 104 0 C00 Po 0 51750 46000 51750 44500 170 -1 -De 15 0 105 0 C00C00 +De 15 0 105 0 C00 Po 0 52750 46000 52750 44500 170 -1 -De 15 0 106 0 C00C00 +De 15 0 106 0 C00 Po 0 53750 46000 53750 44500 170 -1 -De 15 0 107 0 C00C00 +De 15 0 107 0 C00 Po 0 46250 36000 45250 36000 170 -1 -De 0 0 108 0 400800 +De 0 0 108 0 800 Po 0 52750 36500 56250 36500 170 -1 -De 0 0 108 0 800400 +De 0 0 108 0 400 Po 0 52500 36750 52750 36500 170 -1 De 0 0 108 0 0 Po 0 45250 36000 44750 36500 170 -1 -De 0 0 108 0 800400 +De 0 0 108 0 400 Po 0 47750 36000 48500 36750 170 -1 -De 0 0 108 0 400800 +De 0 0 108 0 800 Po 0 47750 36000 46250 36000 170 -1 -De 0 0 108 0 C00C00 +De 0 0 108 0 C00 Po 0 48500 36750 52500 36750 170 -1 De 0 0 108 0 0 -Po 0 47750 39000 48250 38500 170 -1 -De 0 0 109 0 400800 -Po 0 46250 39000 45250 39000 170 -1 -De 0 0 109 0 400800 -Po 0 47750 39000 46250 39000 170 -1 -De 0 0 109 0 C00C00 -Po 0 49750 38500 50250 39000 170 -1 -De 0 0 109 0 800400 -Po 0 45250 39000 44750 38500 170 -1 -De 0 0 109 0 800400 Po 0 48250 38500 49750 38500 170 -1 De 0 0 109 0 0 -Po 0 66250 29500 66750 30000 220 -1 -De 15 0 110 0 400800 -Po 0 50250 43000 49750 42500 220 -1 -De 0 0 110 0 0 -Po 0 37750 44500 34250 44500 220 -1 -De 0 0 110 0 C00C00 -Po 0 62750 44000 62750 38000 220 -1 -De 15 0 110 0 400800 -Po 0 66750 32000 67250 32500 220 -1 -De 15 0 110 0 800400 -Po 0 50250 46500 49250 46500 220 -1 -De 0 0 110 0 0 -Po 0 49750 42500 49750 41500 220 -1 -De 0 0 110 0 800400 -Po 0 59250 46500 50250 46500 220 -1 -De 0 0 110 0 0 -Po 0 37750 46000 37750 44500 220 -1 -De 15 0 110 0 C00C00 -Po 0 32750 34500 34250 36000 220 -1 -De 15 0 110 0 0 -Po 0 67250 27500 67750 27000 220 -1 -De 15 0 110 0 400800 -Po 0 62750 38000 62250 37500 220 -1 -De 15 0 110 0 800400 -Po 0 38750 50000 38750 52000 220 -1 -De 15 0 110 0 0 -Po 0 32750 33000 32750 34500 220 -1 -De 15 0 110 0 400800 -Po 0 49250 46500 48750 46000 220 -1 -De 0 0 110 0 800400 -Po 0 59750 45625 59875 45500 220 -1 -De 0 0 110 0 0 -Po 3 65250 29500 65250 29500 450 -1 -De 15 1 110 0 0 -Po 0 62750 37000 62250 37500 220 -1 -De 0 0 110 0 800400 -Po 0 59750 46000 59250 46500 220 -1 -De 0 0 110 0 400800 -Po 0 59750 46000 60750 47000 220 -1 -De 0 0 110 0 400800 -Po 0 64750 53000 64750 54500 220 -1 -De 0 0 110 0 800400 -Po 0 49750 41500 48750 41500 220 -1 -De 0 0 110 0 C00C00 -Po 0 59750 46000 59750 45625 220 -1 -De 0 0 110 0 400800 -Po 0 67750 21250 67250 20750 220 -1 -De 15 0 110 0 0 -Po 0 66750 30000 66750 32000 220 -1 -De 15 0 110 0 0 -Po 0 37750 47000 38250 47500 220 -1 -De 15 0 110 0 0 -Po 0 60750 47000 67250 47000 220 -1 -De 0 0 110 0 0 -Po 0 65250 29500 66250 29500 220 -1 -De 0 0 110 0 800400 -Po 0 62750 45375 62750 44000 220 -1 -De 0 0 110 0 800400 -Po 0 34250 44500 34250 36000 220 -1 -De 15 0 110 0 400800 -Po 0 67250 47000 67250 50500 220 -1 -De 15 0 110 0 0 -Po 0 33250 22500 34250 23500 220 -1 -De 15 0 110 0 400800 +Po 0 45250 39000 44750 38500 170 -1 +De 0 0 109 0 400 +Po 0 49750 38500 50250 39000 170 -1 +De 0 0 109 0 400 +Po 0 47750 39000 46250 39000 170 -1 +De 0 0 109 0 C00 +Po 0 46250 39000 45250 39000 170 -1 +De 0 0 109 0 800 +Po 0 47750 39000 48250 38500 170 -1 +De 0 0 109 0 800 Po 0 34250 24000 32750 25500 220 -1 -De 15 0 110 0 400800 +De 15 0 110 0 800 Po 0 34250 23500 34250 24000 220 -1 -De 15 0 110 0 800400 +De 15 0 110 0 400 Po 0 38250 46500 37750 46000 220 -1 -De 0 0 110 0 800400 +De 0 0 110 0 400 Po 0 50250 46500 50250 43000 220 -1 De 0 0 110 0 0 Po 0 58250 36500 58750 37000 220 -1 -De 0 0 110 0 400800 +De 0 0 110 0 800 Po 0 58750 37000 61750 37000 220 -1 De 0 0 110 0 0 Po 0 59875 45500 62625 45500 220 -1 @@ -5927,13 +5883,13 @@ De 15 1 110 0 0 Po 0 38250 47500 38250 49500 220 -1 De 15 0 110 0 0 Po 0 58250 28500 58750 29000 220 -1 -De 0 0 110 0 400800 +De 0 0 110 0 800 Po 0 38750 52000 38750 54500 220 -1 -De 0 0 110 0 800400 +De 0 0 110 0 400 Po 0 48750 46000 48250 46500 220 -1 -De 0 0 110 0 400800 +De 0 0 110 0 800 Po 0 66250 29500 66250 28500 220 -1 -De 15 0 110 0 C00C00 +De 15 0 110 0 C00 Po 0 38250 49500 38750 50000 220 -1 De 15 0 110 0 0 Po 0 67250 50500 65250 52500 220 -1 @@ -5943,13 +5899,13 @@ De 15 1 110 0 0 Po 0 67750 27000 67750 21250 220 -1 De 15 0 110 0 0 Po 0 37750 46000 37750 47000 220 -1 -De 15 0 110 0 400800 +De 15 0 110 0 800 Po 0 32750 25500 32750 33000 220 -1 -De 15 0 110 0 800400 +De 15 0 110 0 400 Po 0 65250 36500 64750 37000 220 -1 -De 0 0 110 0 400800 +De 0 0 110 0 800 Po 0 66250 28500 66250 27500 220 -1 -De 15 0 110 0 C00C00 +De 15 0 110 0 C00 Po 0 65250 52500 64750 53000 220 -1 De 0 0 110 0 0 Po 0 64750 37000 62750 37000 220 -1 @@ -5957,17 +5913,81 @@ De 0 0 110 0 0 Po 3 65250 52500 65250 52500 600 -1 De 15 1 110 0 0 Po 0 67250 20750 67250 20500 220 -1 -De 15 0 110 0 800400 +De 15 0 110 0 400 Po 0 62625 45500 62750 45375 220 -1 De 0 0 110 0 0 Po 0 61750 37000 62250 37500 220 -1 -De 0 0 110 0 800400 +De 0 0 110 0 400 Po 0 65750 29000 66250 28500 220 -1 -De 0 0 110 0 800400 +De 0 0 110 0 400 Po 0 65250 36500 65250 29500 220 -1 -De 15 0 110 0 400800 +De 15 0 110 0 800 Po 0 66250 27500 67250 27500 220 -1 -De 0 0 110 0 C00C00 +De 0 0 110 0 C00 +Po 0 59750 45625 59875 45500 220 -1 +De 0 0 110 0 0 +Po 0 49250 46500 48750 46000 220 -1 +De 0 0 110 0 400 +Po 0 32750 33000 32750 34500 220 -1 +De 15 0 110 0 800 +Po 0 38750 50000 38750 52000 220 -1 +De 15 0 110 0 0 +Po 0 62750 38000 62250 37500 220 -1 +De 15 0 110 0 400 +Po 0 67250 27500 67750 27000 220 -1 +De 15 0 110 0 800 +Po 0 32750 34500 34250 36000 220 -1 +De 15 0 110 0 0 +Po 0 37750 46000 37750 44500 220 -1 +De 15 0 110 0 C00 +Po 0 59250 46500 50250 46500 220 -1 +De 0 0 110 0 0 +Po 0 49750 42500 49750 41500 220 -1 +De 0 0 110 0 400 +Po 0 50250 46500 49250 46500 220 -1 +De 0 0 110 0 0 +Po 0 66750 32000 67250 32500 220 -1 +De 15 0 110 0 400 +Po 0 62750 44000 62750 38000 220 -1 +De 15 0 110 0 800 +Po 0 37750 44500 34250 44500 220 -1 +De 0 0 110 0 C00 +Po 0 50250 43000 49750 42500 220 -1 +De 0 0 110 0 0 +Po 0 66250 29500 66750 30000 220 -1 +De 15 0 110 0 800 +Po 3 65250 29500 65250 29500 450 -1 +De 15 1 110 0 0 +Po 0 62750 37000 62250 37500 220 -1 +De 0 0 110 0 400 +Po 0 59750 46000 59250 46500 220 -1 +De 0 0 110 0 800 +Po 0 59750 46000 60750 47000 220 -1 +De 0 0 110 0 800 +Po 0 64750 53000 64750 54500 220 -1 +De 0 0 110 0 400 +Po 0 49750 41500 48750 41500 220 -1 +De 0 0 110 0 C00 +Po 0 59750 46000 59750 45625 220 -1 +De 0 0 110 0 800 +Po 0 67750 21250 67250 20750 220 -1 +De 15 0 110 0 0 +Po 0 66750 30000 66750 32000 220 -1 +De 15 0 110 0 0 +Po 0 37750 47000 38250 47500 220 -1 +De 15 0 110 0 0 +Po 0 60750 47000 67250 47000 220 -1 +De 0 0 110 0 0 +Po 0 65250 29500 66250 29500 220 -1 +De 0 0 110 0 400 +Po 0 62750 45375 62750 44000 220 -1 +De 0 0 110 0 400 +Po 0 34250 44500 34250 36000 220 -1 +De 15 0 110 0 800 +Po 0 67250 47000 67250 50500 220 -1 +De 15 0 110 0 0 +Po 0 33250 22500 34250 23500 220 -1 +De 15 0 110 0 800 $EndTRACK $ZONE $EndZONE diff --git a/eeschema/files-io.cpp b/eeschema/files-io.cpp index 3238f254bc..05e6dae96e 100644 --- a/eeschema/files-io.cpp +++ b/eeschema/files-io.cpp @@ -75,7 +75,8 @@ bool SCH_EDIT_FRAME::SaveEEFile( SCH_SCREEN* aScreen, int aSaveType, bool aCreat if( schematicFileName.FileExists() ) { backupFileName.SetExt( g_SchematicBackupFileExtension ); - wxRemoveFile( backupFileName.GetFullPath() ); + if( backupFileName.FileExists() ) + wxRemoveFile( backupFileName.GetFullPath() ); if( !wxRenameFile( schematicFileName.GetFullPath(), backupFileName.GetFullPath() ) ) { diff --git a/eeschema/sch_collectors.cpp b/eeschema/sch_collectors.cpp index 15c6e57e31..6d38003f20 100644 --- a/eeschema/sch_collectors.cpp +++ b/eeschema/sch_collectors.cpp @@ -408,20 +408,22 @@ wxString SCH_FIND_COLLECTOR::GetText() SCH_FIND_COLLECTOR_DATA data = m_data[ m_foundIndex ]; EDA_ITEM* foundItem = m_List[ m_foundIndex ]; - wxCHECK_MSG( foundItem != NULL, wxEmptyString, wxT( "Inavalid found item pointer." ) ); + wxCHECK_MSG( foundItem != NULL, wxEmptyString, wxT( "Invalid found item pointer." ) ); wxString msg; if( data.GetParent() ) { - msg = _( "Child item " ) + foundItem->GetSelectMenuText() + - _( " of parent item " ) + data.GetParent()->GetSelectMenuText() + - _( " found in sheet " ) + data.GetSheetPath(); + msg.Printf( _( "Child item %s of parent item %s found in sheet %s" ), + GetChars( foundItem->GetSelectMenuText() ), + GetChars( data.GetParent()->GetSelectMenuText() ), + GetChars( data.GetSheetPath() ) ); } else { - msg = _( "Item " ) + foundItem->GetSelectMenuText() + _( " found in sheet " ) + - data.GetSheetPath(); + msg.Printf( _( "Item %s found in sheet %s" ), + GetChars( foundItem->GetSelectMenuText() ), + GetChars( data.GetSheetPath() ) ); } return msg; diff --git a/pcbnew/connect.cpp b/pcbnew/connect.cpp index 26f9519970..5d44c7b19e 100644 --- a/pcbnew/connect.cpp +++ b/pcbnew/connect.cpp @@ -856,8 +856,6 @@ void PCB_BASE_FRAME::TestConnections() m_Pcb->Test_Connections_To_Copper_Areas(); -// int st = clock(); // For test only, will be removed - // Test existing connections net by net // note some nets can have no tracks, and pads intersecting // so Build_CurrNet_SubNets_Connections must be called for each net @@ -889,8 +887,6 @@ void PCB_BASE_FRAME::TestConnections() for( int net = last_net_tested+1; net < netsCount; net++ ) connections.Build_CurrNet_SubNets_Connections( NULL, NULL, net ); -// wxLogMessage("time %g ms", (double)(clock() - st)*1000.0/CLOCKS_PER_SEC); - Merge_SubNets_Connected_By_CopperAreas( m_Pcb ); return; diff --git a/pcbnew/files.cpp b/pcbnew/files.cpp index 523437f25c..2452dd780a 100644 --- a/pcbnew/files.cpp +++ b/pcbnew/files.cpp @@ -299,10 +299,10 @@ this file again." ) ); } } catch( IO_ERROR ioe ) - { + {wxMessageBox("catch"); wxString msg = wxString::Format( _( "Error loading board.\n%s" ), ioe.errorText.GetData() ); - wxMessageBox( msg, _( "Open Board File" ), wxICON_ERROR | wxOK ); + wxMessageBox( msg, _( "Open Board File" ), wxOK | wxICON_ERROR ); } if( !aAppend ) @@ -490,7 +490,7 @@ bool PCB_EDIT_FRAME::SavePcbFile( const wxString& aFileName, bool aCreateBackupF { wxString msg = wxString::Format( _( "Error saving board.\n%s" ), ioe.errorText.GetData() ); - wxMessageBox( msg, _( "Save Board File" ), wxICON_ERROR ); + wxMessageBox( msg, _( "Save Board File" ), wxICON_ERROR | wxOK ); saveok = false; } diff --git a/pcbnew/gpcb_exchange.cpp b/pcbnew/gpcb_exchange.cpp index ad56e20662..b9b602b257 100644 --- a/pcbnew/gpcb_exchange.cpp +++ b/pcbnew/gpcb_exchange.cpp @@ -251,16 +251,17 @@ bool MODULE::Read_GPCB_Descr( const wxString& CmpFullFileName ) pos.y = wxRound( ibuf[idx+1] * conv_unit ); m_Reference->SetPos( pos ); m_Reference->SetPos0( pos ); - m_Reference->m_Orient = ibuf[idx+2] ? 900 : 0; + m_Reference->SetOrientation( ibuf[idx+2] ? 900 : 0 ); // Calculate size: default is 40 mils (400 pcb units) // real size is: default * ibuf[idx+3] / 100 (size in gpcb is given in percent of default size int tsize = ( ibuf[idx+3] * TEXT_DEFAULT_SIZE ) / 100; int thickness = m_Reference->m_Size.x / 6; - m_Reference->m_Size.x = m_Reference->m_Size.y = MAX( 40, tsize ); + tsize = MAX( 40, tsize ); + m_Reference->SetSize( wxSize( tsize, tsize ) ); m_Reference->m_Thickness = thickness; - m_Value->m_Orient = m_Reference->m_Orient; - m_Value->m_Size = m_Reference->m_Size; + m_Value->SetOrientation( m_Reference->GetOrientation() ); + m_Value->SetSize( m_Reference->GetSize() ); m_Value->m_Thickness = m_Reference->m_Thickness; pos.y += tsize + thickness; m_Value->SetPos( pos ); @@ -421,11 +422,14 @@ bool MODULE::Read_GPCB_Descr( const wxString& CmpFullFileName ) // Negate angle (due to Y reversed axis) and convert it to internal units angle = - angle * 1800.0 / M_PI; Pad->SetOrientation( wxRound( angle ) ); - Pad->m_Pos.x = (ibuf[0] + ibuf[2]) / 2; - Pad->m_Pos.y = (ibuf[1] + ibuf[3]) / 2; + wxPoint padPos; + padPos.x = (ibuf[0] + ibuf[2]) / 2; + padPos.y = (ibuf[1] + ibuf[3]) / 2; Pad->m_Size.x = wxRound( hypot( (double)delta.x, (double)delta.y ) ) + ibuf[4]; Pad->m_Size.y = ibuf[4]; - Pad->m_Pos += m_Pos; + padPos += m_Pos; + Pad->SetPos0( padPos ); + Pad->SetPosition( padPos ); if( !TestFlags( params[iflgidx], 0x0100, wxT( "square" ) ) ) { @@ -478,13 +482,14 @@ bool MODULE::Read_GPCB_Descr( const wxString& CmpFullFileName ) { Pad->SetPadName( params[9] ); } - - Pad->m_Pos.x = ibuf[0]; - Pad->m_Pos.y = ibuf[1]; + wxPoint padPos; + padPos.x = ibuf[0]; + padPos.y = ibuf[1]; Pad->m_Drill.x = Pad->m_Drill.y = ibuf[5]; Pad->m_Size.x = Pad->m_Size.y = ibuf[3] + Pad->m_Drill.x; - Pad->m_Pos.x += m_Pos.x; - Pad->m_Pos.y += m_Pos.y; + padPos += m_Pos; + Pad->SetPos0( padPos ); + Pad->SetPosition( padPos ); if( (Pad->m_PadShape == PAD_ROUND) && (Pad->m_Size.x != Pad->m_Size.y) ) Pad->m_PadShape = PAD_OVAL; diff --git a/pcbnew/ioascii.cpp b/pcbnew/ioascii.cpp index 4ab5cab006..7432d434d1 100644 --- a/pcbnew/ioascii.cpp +++ b/pcbnew/ioascii.cpp @@ -349,7 +349,7 @@ int PCB_BASE_FRAME::ReadSetup( LINE_READER* aReader ) msg.Printf( _( "Error reading PcbPlotParams from %s:\n%s" ), aReader->GetSource().GetData(), e.errorText.GetData() ); - wxMessageBox( msg, _( "Open Board File" ), wxICON_ERROR ); + wxMessageBox( msg, _( "Open Board File" ), wxOK | wxICON_ERROR ); } continue; diff --git a/pcbnew/muonde.cpp b/pcbnew/muonde.cpp index aeba4d985c..7ddddea943 100644 --- a/pcbnew/muonde.cpp +++ b/pcbnew/muonde.cpp @@ -937,7 +937,6 @@ MODULE* PCB_EDIT_FRAME::Create_MuWavePolygonShape() wxString cmp_name; int pad_count = 2; EDGE_MODULE* edge; - int npoints; WinEDA_SetParamShapeFrame* frame = new WinEDA_SetParamShapeFrame( this, wxPoint( -1, -1 ) ); @@ -988,7 +987,6 @@ MODULE* PCB_EDIT_FRAME::Create_MuWavePolygonShape() edge->SetShape( S_POLYGON ); edge->SetLayer( LAYER_N_FRONT ); - npoints = PolyEdges.size(); std::vector polyPoints = edge->GetPolyPoints(); polyPoints.reserve( 2 * PolyEdges.size() + 2 ); diff --git a/pcbnew/pcbplot.cpp b/pcbnew/pcbplot.cpp index c317c247a5..db9b20f6f4 100644 --- a/pcbnew/pcbplot.cpp +++ b/pcbnew/pcbplot.cpp @@ -291,7 +291,7 @@ void DIALOG_PLOT::OnOutputDirectoryBrowseClicked( wxCommandEvent& event ) if( !dirName.MakeRelativeTo( boardFilePath ) ) wxMessageBox( wxT( "Cannot make path relative (target volume different from board file volume)!" ), - wxT( "Plot Output Directory" ), wxICON_ERROR ); + wxT( "Plot Output Directory" ), wxOK | wxICON_ERROR ); } m_outputDirectoryName->SetValue( dirName.GetFullPath() ); @@ -568,7 +568,7 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event ) msg.Printf( wxT( " Cannot make %s absolute with respect to %s!" ), GetChars( outputDir.GetPath() ), GetChars( boardFilePath ) ); - wxMessageBox( msg, wxT( "Plot" ), wxICON_ERROR ); + wxMessageBox( msg, wxT( "Plot" ), wxOK | wxICON_ERROR ); return; } @@ -582,7 +582,8 @@ void DIALOG_PLOT::Plot( wxCommandEvent& event ) } else { - wxMessageBox( wxT( "Cannot create output directory!" ), wxT( "Plot" ), wxICON_ERROR ); + wxMessageBox( wxT( "Cannot create output directory!" ), + wxT( "Plot" ), wxOK | wxICON_ERROR ); return; } } diff --git a/pcbnew/xchgmod.cpp b/pcbnew/xchgmod.cpp index d175331a43..c000b75ea6 100644 --- a/pcbnew/xchgmod.cpp +++ b/pcbnew/xchgmod.cpp @@ -151,7 +151,6 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference, FILE* FichCmp, * NewFile; char line[1024]; wxString msg; - char* rs; if( old_name == new_name ) return 0; @@ -189,7 +188,7 @@ int DIALOG_EXCHANGE_MODULE::Maj_ListeCmp( const wxString& reference, return 1; } - rs = fgets( line, sizeof(line), FichCmp ); + fgets( line, sizeof(line), FichCmp ); fprintf( NewFile, "Cmp-Mod V01 Genere par PcbNew le %s\n", TO_UTF8( DateAndTime() ) ); @@ -587,7 +586,6 @@ void PCB_EDIT_FRAME::RecreateCmpFileFromBoard( wxCommandEvent& aEvent ) MODULE* Module = GetBoard()->m_Modules; wxString msg; wxString wildcard; - char* rs; if( Module == NULL ) { @@ -618,7 +616,7 @@ void PCB_EDIT_FRAME::RecreateCmpFileFromBoard( wxCommandEvent& aEvent ) return; } - rs = fgets( line, sizeof(line), FichCmp ); + fgets( line, sizeof(line), FichCmp ); fprintf( FichCmp, "Cmp-Mod V01 Genere par PcbNew le %s\n", TO_UTF8( DateAndTime() ) ); for( ; Module != NULL; Module = Module->Next() ) diff --git a/pcbnew/zones_polygons_test_connections.cpp b/pcbnew/zones_polygons_test_connections.cpp index 145e57b2e3..9b970ef7f6 100644 --- a/pcbnew/zones_polygons_test_connections.cpp +++ b/pcbnew/zones_polygons_test_connections.cpp @@ -31,11 +31,9 @@ void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb, int aNetcode ); void BOARD::Test_Connections_To_Copper_Areas( int aNetcode ) { // list of pads and tracks candidates on this layer and on this net. - std::vector Candidates; - int subnet = 0; - int netcode; - ZONE_CONTAINER* curr_zone; - BOARD_CONNECTED_ITEM* item; + // It is static to avoid multiple memory realloc. + static std::vector Candidates; + // clear .m_ZoneSubnet parameter for pads for( MODULE* module = m_Modules; module; module = module->Next() ) @@ -53,13 +51,14 @@ void BOARD::Test_Connections_To_Copper_Areas( int aNetcode ) } // examine all zones, net by net: + int subnet = 0; for( int index = 0; index < GetAreaCount(); index++ ) { - curr_zone = GetArea( index ); + ZONE_CONTAINER* curr_zone = GetArea( index ); if( !curr_zone->IsOnCopperLayer() ) continue; - netcode = curr_zone->GetNet(); + int netcode = curr_zone->GetNet(); if( (aNetcode >= 0) && !( aNetcode == netcode ) ) continue; @@ -71,21 +70,22 @@ void BOARD::Test_Connections_To_Copper_Areas( int aNetcode ) // At this point, layers are not considered, because areas on different layers can // be connected by a via or a pad. - for( MODULE* module = m_Modules; module; module = module->Next() ) - { - for( D_PAD* pad = module->m_Pads; pad != NULL; pad = pad->Next() ) - { - if( pad->GetNet() != curr_zone->GetNet() ) - continue; - Candidates.push_back( pad ); - } - } + // Build the list of pads candidates connected to the net: + NETINFO_ITEM* net = FindNet( netcode ); + wxASSERT( net ); + if( net == NULL ) + continue; + Candidates.reserve( net->m_PadInNetList.size() ); + for( unsigned ii = 0; ii < net->m_PadInNetList.size(); ii++ ) + Candidates.push_back( net->m_PadInNetList[ii] ); - for( TRACK* track = m_Track; track; track = track->Next() ) + // Build the list of track candidates connected to the net: + TRACK* track = m_Track.GetFirst()->GetStartNetCode( netcode ); + for( ; track; track = track->Next() ) { if( track->GetNet() != netcode ) - continue; + break; Candidates.push_back( track ); } @@ -102,7 +102,7 @@ void BOARD::Test_Connections_To_Copper_Areas( int aNetcode ) for( unsigned ic = 0; ic < Candidates.size(); ic++ ) { // test if this area is connected to a board item: - item = Candidates[ic]; + BOARD_CONNECTED_ITEM* item = Candidates[ic]; if( !item->IsOnLayer( curr_zone->GetLayer() ) ) continue; @@ -212,10 +212,6 @@ void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb ) */ void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb, int aNetcode ) { - BOARD_CONNECTED_ITEM* item; - int old_subnet, subnet, next_subnet_free_number; - int old_zone_subnet, zone_subnet; - // Ensure a zone with the given netcode exists: examine all zones: bool found = false; @@ -233,35 +229,38 @@ void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb, int aNetcode ) if( !found ) // No zone with this netcode, therefore no connection by zone return; - std::vector Candidates; // list of pads and tracks candidates to test. + // list of pads and tracks candidates to test: + // It is static to avoid multiple memory realloc. + static std::vector Candidates; + Candidates.clear(); - // Build a list of candidates connected to the net: - next_subnet_free_number = 0; + // Build the list of pads candidates connected to the net: + NETINFO_ITEM* net = aPcb->FindNet( aNetcode ); + wxASSERT( net ); + Candidates.reserve( net->m_PadInNetList.size() ); + for( unsigned ii = 0; ii < net->m_PadInNetList.size(); ii++ ) + Candidates.push_back( net->m_PadInNetList[ii] ); - for( MODULE* module = aPcb->m_Modules; module; module = module->Next() ) + // Build the list of track candidates connected to the net: + TRACK* track; + track = aPcb->m_Track.GetFirst()->GetStartNetCode( aNetcode ); + for( ; track; track = track->Next() ) { - for( D_PAD* pad = module->m_Pads; pad != NULL; pad = pad->Next() ) - { - if( pad->GetNet() == aNetcode ) - { - Candidates.push_back( pad ); - next_subnet_free_number = MAX( next_subnet_free_number, pad->GetSubNet() ); - } - } - } - - for( TRACK* track = aPcb->m_Track; track; track = track->Next() ) - { - if( track->GetNet() == aNetcode ) - { - Candidates.push_back( track ); - next_subnet_free_number = MAX( next_subnet_free_number, track->GetSubNet() ); - } + if( track->GetNet() != aNetcode ) + break; + Candidates.push_back( track ); } if( Candidates.size() == 0 ) return; + int next_subnet_free_number = 0; + for( unsigned ii = 0; ii < Candidates.size(); ii++ ) + { + int subnet = Candidates[ii]->GetSubNet(); + next_subnet_free_number = MAX( next_subnet_free_number, subnet ); + } + next_subnet_free_number++; // This is a subnet we can use with not connected items // by tracks, but connected by zone. @@ -269,12 +268,12 @@ void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb, int aNetcode ) sort( Candidates.begin(), Candidates.end(), CmpZoneSubnetValue ); // Some items can be not connected, but they can be connected to a filled area: - // give them a subnet common to these items connected only by the area, and not already used. + // give them a subnet common to these items connected only by the area, + // and not already used. // a value like next_subnet_free_number+zone_subnet is right for( unsigned jj = 0; jj < Candidates.size(); jj++ ) { - item = Candidates[jj]; - + BOARD_CONNECTED_ITEM* item = Candidates[jj]; if ( item->GetSubNet() == 0 && (item->GetZoneSubNet() > 0) ) { item->SetSubNet( next_subnet_free_number + item->GetZoneSubNet() ); @@ -283,18 +282,17 @@ void Merge_SubNets_Connected_By_CopperAreas( BOARD* aPcb, int aNetcode ) // Now, for each zone subnet, we search for 2 items with different subnets. // if found, the 2 subnet are merged in the whole candidate list. - old_subnet = 0; - old_zone_subnet = 0; - + int old_subnet = 0; + int old_zone_subnet = 0; for( unsigned ii = 0; ii < Candidates.size(); ii++ ) { - item = Candidates[ii]; - zone_subnet = item->GetZoneSubNet(); + BOARD_CONNECTED_ITEM* item = Candidates[ii]; + int zone_subnet = item->GetZoneSubNet(); if( zone_subnet == 0 ) // Not connected by a filled area, skip it continue; - subnet = item->GetSubNet(); + int subnet = item->GetSubNet(); if( zone_subnet != old_zone_subnet ) // a new zone subnet is found { diff --git a/polygon/PolyLine.cpp b/polygon/PolyLine.cpp index 0a6b3e72d8..0cc4662be2 100644 --- a/polygon/PolyLine.cpp +++ b/polygon/PolyLine.cpp @@ -478,7 +478,7 @@ int CPolyLine::MakeKboolPoly( int aStart_contour, int aEnd_contour, std::vector< x = x1; y = y1; } - booleng->AddPoint( x1, y1 ); + booleng->AddPoint( x, y ); ivtx++; } }