Skip to content

K
kicad-source-mirror
Commit 6bae852c authored by jean-pierre charras's avatar jean-pierre charras
Browse files
Options

Minor fixes: specctra export: skip malformed circles (having a radius = 0) in... 

Minor fixes: specctra export: skip malformed circles (having a radius = 0)  in board outline creation, which can crash 3d-viewer or vrml export.
dialog_fp_lib_table: remember during a session the last open table (global or local).
drawing_tool: fix compil warning
Update demos.
parent 12f3fd35
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 4233 additions and 5231 deletions
demos/interf_u/interf_u-cache.lib
View file @ 6bae852c
......@@ -177,10 +177,10 @@ ENDDEF
# 74LS245
#
DEF 74LS245 U 0 10 Y Y 1 F N
F0 "U" 100 575 60 H V L BNN
F1 "74LS245" 50 -575 60 H V L TNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
F0 "U" 100 575 50 H V L BNN
F1 "74LS245" 50 -575 50 H V L TNN
F2 "" 50 -650 30 H V L CNN
F3 "" 100 575 30 H V C CNN
ALIAS 74HC245
DRAW
X GND 10 0 -550 0 U 60 60 0 0 W N
......@@ -358,7 +358,7 @@ DEF C C 0 10 N Y 1 F N
F0 "C" 0 100 40 H V L CNN
F1 "C" 6 -85 40 H V L CNN
F2 "" 38 -150 30 H V C CNN
F3 "" 0 0 60 H V C CNN
F3 "" 0 100 30 H V C CNN
$FPLIST
SM*
C?
......@@ -406,7 +406,7 @@ DEF CP C 0 10 N N 1 F N
F0 "C" 50 100 40 H V L CNN
F1 "CP" 50 -100 40 H V L CNN
F2 "" 100 -150 30 H V C CNN
F3 "" 0 0 300 H V C CNN
F3 "" 50 100 30 H V C CNN
ALIAS CAPAPOL
$FPLIST
CP*
......
demos/interf_u/interf_u.cmp
View file @ 6bae852c
Cmp-Mod V01 Created by CvPcb (2013-08-20 BZR 4294)-product date = 21/08/2013 18:12:43
Cmp-Mod V01 Created by Cvpcb (2014-09-16 BZR 5138)-product date = 20/09/2014 09:12:59
BeginCmp
TimeStamp = /322D3011;
......@@ -11,56 +11,56 @@ BeginCmp
TimeStamp = /32307DE2;
Reference = C1;
ValeurCmp = 47uF;
IdModule = CP6;
IdModule = discret:CP6;
EndCmp
BeginCmp
TimeStamp = /32307ECF;
Reference = C2;
ValeurCmp = 47pF;
IdModule = C1;
IdModule = discret:C1;
EndCmp
BeginCmp
TimeStamp = /32307ED4;
Reference = C3;
ValeurCmp = 47pF;
IdModule = C1;
IdModule = discret:C1;
EndCmp
BeginCmp
TimeStamp = /32307DCF;
Reference = C4;
ValeurCmp = 47uF;
IdModule = CP6;
IdModule = discret:CP6;
EndCmp
BeginCmp
TimeStamp = /32307DCA;
Reference = C5;
ValeurCmp = 47uF;
IdModule = CP6;
IdModule = discret:CP6;
EndCmp
BeginCmp
TimeStamp = /32307DC0;
Reference = C6;
ValeurCmp = 47uF;
IdModule = CP6;
IdModule = discret:CP6;
EndCmp
BeginCmp
TimeStamp = /322D32AC;
Reference = D1;
ValeurCmp = LED;
IdModule = LEDV;
IdModule = discret:LEDV;
EndCmp
BeginCmp
TimeStamp = /322D32BE;
Reference = D2;
ValeurCmp = LED;
IdModule = LEDV;
IdModule = discret:LEDV;
EndCmp
BeginCmp
......@@ -74,84 +74,84 @@ BeginCmp
TimeStamp = /3256759C;
Reference = P1;
ValeurCmp = DB25FEMELLE;
IdModule = DB25FC;
IdModule = connect:DB25FC;
EndCmp
BeginCmp
TimeStamp = /32307EA1;
Reference = R1;
ValeurCmp = 100K;
IdModule = R3;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /32307EAA;
Reference = R2;
ValeurCmp = 1K;
IdModule = R3;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /324002E6;
Reference = R3;
ValeurCmp = 10K;
IdModule = R3;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /322D3295;
Reference = R4;
ValeurCmp = 330;
IdModule = R3;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /322D32A0;
Reference = R5;
ValeurCmp = 330;
IdModule = R3;
IdModule = discret:R3;
EndCmp
BeginCmp
TimeStamp = /325679C1;
Reference = RR1;
ValeurCmp = 9x1K;
IdModule = r_pack9;
IdModule = discret:r_pack9;
EndCmp
BeginCmp
TimeStamp = /322D31F4;
Reference = U1;
ValeurCmp = 74LS245;
IdModule = DIP-20__300;
IdModule = dip_sockets:DIP-20__300;
EndCmp
BeginCmp
TimeStamp = /322D35B4;
Reference = U2;
ValeurCmp = 74LS688;
IdModule = DIP-20__300;
IdModule = dip_sockets:DIP-20__300;
EndCmp
BeginCmp
TimeStamp = /4A087146;
Reference = U3;
ValeurCmp = 74LS541;
IdModule = DIP-20__300;
IdModule = dip_sockets:DIP-20__300;
EndCmp
BeginCmp
TimeStamp = /3240023F;
Reference = U5;
ValeurCmp = 628128;
IdModule = DIP-32__600;
IdModule = dip_sockets:DIP-32__600;
EndCmp
BeginCmp
TimeStamp = /322D321C;
Reference = U8;
ValeurCmp = EP600;
IdModule = DIP-24__300;
IdModule = dip_sockets:DIP-24__300;
EndCmp
BeginCmp
......@@ -165,7 +165,7 @@ BeginCmp
TimeStamp = /32307EC0;
Reference = X1;
ValeurCmp = 8MHz;
IdModule = HC-18UH;
IdModule = discret:HC-18UH;
EndCmp
EndListe
demos/interf_u/interf_u.kicad_pcb
View file @ 6bae852c
This diff is collapsed.
demos/interf_u/interf_u.net
View file @ 6bae852c
This diff is collapsed.
demos/interf_u/interf_u.pro
View file @ 6bae852c
update=07/08/2013 15:44:03
update=20/09/2014 09:14:18
version=1
last_client=pcbnew
last_client=kicad
[common]
NetDir=
[general]
......@@ -40,7 +40,7 @@ LibName12=image
version=1
PageLayoutDescrFile=pagelayout_logo.kicad_wks
LastNetListRead=interf_u.net
UseCmpFile=1
UseCmpFile=0
PadDrill=0.89916
PadDrillOvalY=0.89916
PadSizeH=1.397
......@@ -56,14 +56,3 @@ SolderMaskMinWidth=0
DrawSegmentWidth=0.381
BoardOutlineThickness=0.127
ModuleOutlineThickness=0.381
[pcbnew/libraries]
LibDir=
LibName1=connect
LibName2=discret
LibName3=led
LibName4=sockets
LibName5=dip_sockets
LibName6=pin_array
LibName7=divers
LibName8=libcms
LibName9=display
demos/interf_u/interf_u.sch
View file @ 6bae852c
......@@ -1181,7 +1181,7 @@ BF FD 96 77 9E 38 7E F1 EC E1 55 E2 AF 2F E0 1B 5F F9 FC FE BD 4F B9 56 EB C9 C9
29 65 D5 9A 89 35 EB 37 F6 E3 02 4F 95 57 89 BF 1E 63 D9 CA D5 CB 7E 65 BC F3 FF E1 D5 7A 1F CE
A2 94 8E 79 E6 79 49 E6 FD 75 9E B9 C4 BC BF CE 33 97 98 F7 D7 79 E6 12 F3 FE 3A CF 5C E2 E7 E2
03 93 93 93 FD BA 8E 79 E6 39 19 8E FB EB DC 15 0B E6 F9 D5 61 7E 3F 30 CF 5C 62 DE 5F E7 99 4B
FC 1F 94 BD 62 D3 EE A5 8B 6B 00 00 00 00 49 45 4E 44 AE 42 60 82 10
FC 1F 94 BD 62 D3 EE A5 8B 6B 00 00 00 00 49 45 4E 44 AE 42 60 82 41
EndData
$EndBitmap
Wire Bus Line
......@@ -1683,7 +1683,7 @@ Connection ~ 1200 7600
Wire Wire Line
3900 6900 3350 6900
Wire Wire Line
3350 6800 3350 6900
3350 6900 3350 6800
Wire Wire Line
3350 6800 2450 6800
Wire Wire Line
......@@ -1703,9 +1703,9 @@ Wire Wire Line
Wire Wire Line
2500 7000 2500 6900
Wire Wire Line
3050 6900 2500 6900
2500 6900 3050 6900
Wire Wire Line
3050 7950 3050 6900
3050 6900 3050 7950
Wire Wire Line
3900 7600 3400 7600
Wire Wire Line
......@@ -1773,9 +1773,9 @@ Wire Bus Line
Wire Bus Line
3750 3450 3750 5350
Wire Bus Line
3300 5350 3750 5350
3750 5350 3300 5350
Wire Bus Line
3300 6650 3300 5350
3300 5350 3300 6650
Wire Bus Line
3900 3700 3900 2450
Wire Wire Line
......@@ -1794,7 +1794,7 @@ U 1 1 4A087146
P 5250 1950
F 0 "U3" H 5250 2525 60 0000 C BNN
F 1 "74LS541" H 5250 1375 60 0000 C TNN
F 2 "DIP-20__300" H 5250 1250 60 0000 C CNN
F 2 "dip_sockets:DIP-20__300" H 5250 1250 60 0000 C CNN
F 3 "" H 5250 1950 60 0001 C CNN
1 5250 1950
1 0 0 -1
......@@ -2074,7 +2074,7 @@ U 1 1 325679C1
P 2750 8300
F 0 "RR1" V 2800 8300 70 0000 C CNN
F 1 "9x1K" V 2770 8630 70 0000 C CNN
F 2 "r_pack9" V 2900 8350 60 0000 C CNN
F 2 "discret:r_pack9" V 2900 8350 60 0000 C CNN
F 3 "" H 2750 8300 60 0001 C CNN
1 2750 8300
0 1 1 0
......@@ -2130,7 +2130,7 @@ U 1 1 3256759C
P 15200 7200
F 0 "P1" H 15250 8550 70 0000 C CNN
F 1 "DB25FEMELLE" H 15150 5850 70 0000 C CNN
F 2 "DB25FC" H 15150 5750 60 0000 C CNN
F 2 "connect:DB25FC" H 15150 5750 60 0000 C CNN
F 3 "" H 15200 7200 60 0001 C CNN
1 15200 7200
1 0 0 -1
......@@ -2333,7 +2333,7 @@ U 1 1 324002E6
P 6350 9900
F 0 "R3" V 6430 9900 50 0000 C CNN
F 1 "10K" V 6350 9900 50 0000 C CNN
F 2 "R3" V 6250 9900 60 0000 C CNN
F 2 "discret:R3" V 6250 9900 60 0000 C CNN
F 3 "" H 6350 9900 60 0001 C CNN
1 6350 9900
0 1 1 0
......@@ -2384,7 +2384,7 @@ U 1 1 3240023F
P 7700 9050
F 0 "U5" H 7750 10200 70 0000 C CNN
F 1 "628128" H 7700 7900 70 0000 C CNN
F 2 "DIP-32__600" H 7700 7800 60 0000 C CNN
F 2 "dip_sockets:DIP-32__600" H 7700 7800 60 0000 C CNN
F 3 "" H 7700 9050 60 0001 C CNN
1 7700 9050
1 0 0 -1
......@@ -2627,7 +2627,7 @@ U 1 1 32307ED4
P 14350 4600
F 0 "C3" V 14450 4750 50 0000 C CNN
F 1 "47pF" V 14450 4450 50 0000 C CNN
F 2 "C1" H 14550 4600 60 0000 C CNN
F 2 "discret:C1" H 14550 4600 60 0000 C CNN
F 3 "" H 14350 4600 60 0001 C CNN
1 14350 4600
1 0 0 -1
......@@ -2638,7 +2638,7 @@ U 1 1 32307ECF
P 13550 4600
F 0 "C2" V 13650 4750 50 0000 C CNN
F 1 "47pF" V 13650 4450 50 0000 C CNN
F 2 "C1" H 13350 4600 60 0000 C CNN
F 2 "discret:C1" H 13350 4600 60 0000 C CNN
F 3 "" H 13550 4600 60 0001 C CNN
1 13550 4600
1 0 0 -1
......@@ -2649,7 +2649,7 @@ U 1 1 32307EC0
P 13950 4150
F 0 "X1" H 13950 4350 70 0000 C CNN
F 1 "8MHz" H 13950 3950 70 0000 C CNN
F 2 "HC-18UH" H 13950 3850 60 0000 C CNN
F 2 "discret:HC-18UH" H 13950 3850 60 0000 C CNN
F 3 "" H 13950 4150 60 0001 C CNN
1 13950 4150
1 0 0 -1
......@@ -2660,7 +2660,7 @@ U 1 1 32307EAA
P 14900 3700
F 0 "R2" V 14980 3700 50 0000 C CNN
F 1 "1K" V 14900 3700 50 0000 C CNN
F 2 "R3" V 14800 3700 60 0000 C CNN
F 2 "discret:R3" V 14800 3700 60 0000 C CNN
F 3 "" H 14900 3700 60 0001 C CNN
1 14900 3700
0 1 1 0
......@@ -2671,7 +2671,7 @@ U 1 1 32307EA1
P 13950 3700
F 0 "R1" V 14030 3700 50 0000 C CNN
F 1 "100K" V 13950 3700 50 0000 C CNN
F 2 "R3" V 13850 3700 60 0000 C CNN
F 2 "discret:R3" V 13850 3700 60 0000 C CNN
F 3 "" H 13950 3700 60 0001 C CNN
1 13950 3700
0 1 1 0
......@@ -2682,7 +2682,7 @@ U 1 1 32307DE2
P 4450 9100
F 0 "C1" H 4500 9200 50 0000 L CNN
F 1 "47uF" H 4500 9000 50 0000 L CNN
F 2 "CP6" H 4650 9100 60 0000 C CNN
F 2 "discret:CP6" H 4650 9100 60 0000 C CNN
F 3 "" H 4450 9100 60 0001 C CNN
1 4450 9100
1 0 0 -1
......@@ -2693,7 +2693,7 @@ U 1 1 32307DCF
P 3800 9100
F 0 "C4" H 3850 9200 50 0000 L CNN
F 1 "47uF" H 3850 9000 50 0000 L CNN
F 2 "CP6" H 4000 9100 60 0000 C CNN
F 2 "discret:CP6" H 4000 9100 60 0000 C CNN
F 3 "" H 3800 9100 60 0001 C CNN
1 3800 9100
1 0 0 -1
......@@ -2704,7 +2704,7 @@ U 1 1 32307DCA
P 3250 9100
F 0 "C5" H 3300 9200 50 0000 L CNN
F 1 "47uF" H 3300 9000 50 0000 L CNN
F 2 "CP6" H 3450 9100 60 0000 C CNN
F 2 "discret:CP6" H 3450 9100 60 0000 C CNN
F 3 "" H 3250 9100 60 0001 C CNN
1 3250 9100
1 0 0 -1
......@@ -2715,7 +2715,7 @@ U 1 1 32307DC0
P 2600 9100
F 0 "C6" H 2650 9200 50 0000 L CNN
F 1 "47uF" H 2650 9000 50 0000 L CNN
F 2 "CP6" H 2800 9100 60 0000 C CNN
F 2 "discret:CP6" H 2800 9100 60 0000 C CNN
F 3 "" H 2600 9100 60 0001 C CNN
1 2600 9100
1 0 0 -1
......@@ -2742,7 +2742,7 @@ U 1 1 322D35B4
P 4600 6900
F 0 "U2" H 4600 7850 60 0000 C CNN
F 1 "74LS688" H 4600 5950 60 0000 C CIB
F 2 "DIP-20__300" H 4600 5850 60 0000 C CNB
F 2 "dip_sockets:DIP-20__300" H 4600 5850 60 0000 C CNB
F 3 "" H 4600 6900 60 0001 C CNN
1 4600 6900
1 0 0 -1
......@@ -2766,7 +2766,7 @@ U 1 1 322D32BE
P 14250 2000
F 0 "D2" H 14250 2100 50 0000 C CNN
F 1 "LED" H 14250 1900 50 0000 C CNN
F 2 "LEDV" V 14250 2250 60 0000 C CNN
F 2 "discret:LEDV" V 14250 2250 60 0000 C CNN
F 3 "" H 14250 2000 60 0001 C CNN
1 14250 2000
0 1 1 0
......@@ -2777,7 +2777,7 @@ U 1 1 322D32AC
P 14650 1550
F 0 "D1" H 14650 1650 50 0000 C CNN
F 1 "LED" H 14650 1450 50 0000 C CNN
F 2 "LEDV" V 14650 1800 60 0000 C CNN
F 2 "discret:LEDV" V 14650 1800 60 0000 C CNN
F 3 "" H 14650 1550 60 0001 C CNN
1 14650 1550
0 1 1 0
......@@ -2788,7 +2788,7 @@ U 1 1 322D32A0
P 13700 1500
F 0 "R5" V 13780 1500 50 0000 C CNN
F 1 "330" V 13700 1500 50 0000 C CNN
F 2 "R3" V 13730 1680 30 0000 C CNN
F 2 "discret:R3" V 13730 1680 30 0000 C CNN
F 3 "" H 13700 1500 60 0001 C CNN
1 13700 1500
0 1 1 0
......@@ -2799,7 +2799,7 @@ U 1 1 322D3295
P 13700 1050
F 0 "R4" V 13780 1050 50 0000 C CNN
F 1 "330" V 13700 1050 50 0000 C CNN
F 2 "R3" V 13850 1050 60 0000 C CNN
F 2 "discret:R3" V 13850 1050 60 0000 C CNN
F 3 "" H 13700 1050 60 0001 C CNN
1 13700 1050
0 1 1 0
......@@ -2810,7 +2810,7 @@ U 1 1 322D321C
P 7650 1800
F 0 "U8" H 7650 1900 70 0000 C CNN
F 1 "EP600" H 7650 850 70 0000 C CNN
F 2 "DIP-24__300" H 7700 750 60 0000 C CNN
F 2 "dip_sockets:DIP-24__300" H 7700 750 60 0000 C CNN
F 3 "" H 7650 1800 60 0001 C CNN
1 7650 1800
1 0 0 -1
......@@ -2821,7 +2821,7 @@ U 1 1 322D31F4
P 5200 3600
F 0 "U1" H 5300 4175 60 0000 L BNN
F 1 "74LS245" H 5250 3025 60 0000 L TNN
F 2 "DIP-20__300" H 5400 2900 60 0000 C CNN
F 2 "dip_sockets:DIP-20__300" H 5400 2900 60 0000 C CNN
F 3 "" H 5200 3600 60 0001 C CNN
1 5200 3600
1 0 0 -1
......
demos/pic_programmer/fp-lib-table
View file @ 6bae852c
(fp_lib_table
(lib (name footprints)(type KiCad)(uri ${KIPRJMOD}/libs/footprints.pretty)(options "")(descr "project specific"))
(lib (name footprints)(type KiCad)(uri ${KIPRJMOD}/libs/pic_programmer_fp.pretty)(options "")(descr "project specific"))
(lib (name sockets)(type KiCad)(uri ${KISYSMOD}/Sockets.pretty)(options "")(descr ""))
)
demos/pic_programmer/libs/footprints.pretty/textool_40.kicad_mod deleted 100644 → 0
View file @ 12f3fd35
(module textool_40 (layer F.Cu) (tedit 5401B510)
(descr "Module Dil 40 pins, pads elliptiques, e=600 mils")
(tags DIL)
(fp_text reference P3 (at -19.05 -3.81) (layer F.SilkS)
(effects (font (size 1.778 1.143) (thickness 0.3048)))
)
(fp_text value textool_40 (at 0 2.54) (layer F.SilkS)
(effects (font (size 1.778 1.778) (thickness 0.3048)))
)
(fp_line (start -26.67 -1.27) (end -25.4 -1.27) (layer F.SilkS) (width 0.381))
(fp_line (start -25.4 -1.27) (end -25.4 1.27) (layer F.SilkS) (width 0.381))
(fp_line (start -25.4 1.27) (end -26.67 1.27) (layer F.SilkS) (width 0.381))
(fp_line (start -26.67 -6.35) (end 26.67 -6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 26.67 -6.35) (end 26.67 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start 26.67 6.35) (end -26.67 6.35) (layer F.SilkS) (width 0.381))
(fp_line (start -26.67 6.35) (end -26.67 -6.35) (layer F.SilkS) (width 0.381))
(pad 1 thru_hole rect (at -24.13 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 2 thru_hole oval (at -21.59 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 3 thru_hole oval (at -19.05 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 4 thru_hole oval (at -16.51 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 5 thru_hole oval (at -13.97 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 6 thru_hole oval (at -11.43 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 7 thru_hole oval (at -8.89 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 8 thru_hole oval (at -6.35 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 9 thru_hole oval (at -3.81 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 10 thru_hole oval (at -1.27 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 11 thru_hole oval (at 1.27 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 12 thru_hole oval (at 3.81 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 13 thru_hole oval (at 6.35 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 14 thru_hole oval (at 8.89 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 15 thru_hole oval (at 11.43 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 16 thru_hole oval (at 13.97 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 17 thru_hole oval (at 16.51 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 18 thru_hole oval (at 19.05 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 19 thru_hole oval (at 21.59 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 20 thru_hole oval (at 24.13 7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 21 thru_hole oval (at 24.13 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 22 thru_hole oval (at 21.59 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 23 thru_hole oval (at 19.05 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 24 thru_hole oval (at 16.51 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 25 thru_hole oval (at 13.97 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 26 thru_hole oval (at 11.43 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 27 thru_hole oval (at 8.89 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 28 thru_hole oval (at 6.35 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 29 thru_hole oval (at 3.81 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 30 thru_hole oval (at 1.27 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 31 thru_hole oval (at -1.27 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 32 thru_hole oval (at -3.81 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 33 thru_hole oval (at -6.35 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 34 thru_hole oval (at -8.89 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 35 thru_hole oval (at -11.43 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 36 thru_hole oval (at -13.97 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 37 thru_hole oval (at -16.51 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 38 thru_hole oval (at -19.05 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 39 thru_hole oval (at -21.59 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(pad 40 thru_hole oval (at -24.13 -7.62) (size 1.5748 2.286) (drill 0.8128) (layers *.Cu *.Mask F.SilkS))
(model dil/textool_40.wrl
(at (xyz 0 0 0))
(scale (xyz 1 1 1))
(rotate (xyz 0 0 0))
)
)
demos/pic_programmer/pic_programmer.cmp
View file @ 6bae852c
Cmp-Mod V01 Created by Cvpcb (2014-08-26 BZR 5101)-product date = 01/09/2014 11:21:38
Cmp-Mod V01 Created by Cvpcb (2014-09-16 BZR 5138)-product date = 20/09/2014 09:54:11
BeginCmp
TimeStamp = /442A5056;
......@@ -179,7 +179,7 @@ BeginCmp
TimeStamp = /4804A5E2/442A88ED;
Reference = P3;
ValeurCmp = SUPP40;
IdModule = footprints:textool_40;
IdModule = sockets:40tex-Ell600;
EndCmp
BeginCmp
......
demos/pic_programmer/pic_programmer.kicad_pcb
View file @ 6bae852c
This source diff could not be displayed because it is too large. You can view the blob instead.
demos/pic_programmer/pic_programmer.net
View file @ 6bae852c
This diff is collapsed.
demos/pic_programmer/pic_programmer.pro
View file @ 6bae852c
update=31/08/2014 15:16:56
update=20/09/2014 09:29:07
last_client=kicad
[common]
NetDir=
......@@ -7,34 +7,6 @@ version=1
NetIExt=net
[cvpcb/libraries]
EquName1=devcms
[pcbnew]
version=1
PageLayoutDescrFile=
LastNetListRead=
UseCmpFile=1
PadDrill=0.8128
PadDrillOvalY=0.8128
PadSizeH=1.5748
PadSizeV=2.794
PcbTextSizeV=1.5
PcbTextSizeH=1.5
PcbTextThickness=0.3048
ModuleTextSizeV=1
ModuleTextSizeH=1
ModuleTextSizeThickness=0.2
SolderMaskClearance=0.09999999999999999
SolderMaskMinWidth=0
DrawSegmentWidth=0.4
BoardOutlineThickness=0.2
ModuleOutlineThickness=0.2
[pcbnew/libraries]
LibDir=
LibName1=dip_sockets
LibName2=sockets
LibName3=connect
LibName4=discret
LibName5=pin_array
LibName6=divers
[general]
version=1
[eeschema]
......@@ -46,3 +18,23 @@ LibName2=device
LibName3=74xx
LibName4=conn
LibName5=xilinx
[pcbnew]
version=1
PageLayoutDescrFile=
LastNetListRead=pic_programmer.net
UseCmpFile=0
PadDrill=0.8128
PadDrillOvalY=0.8128
PadSizeH=1.5748
PadSizeV=2.794
PcbTextSizeV=2.032
PcbTextSizeH=1.524
PcbTextThickness=0.3048
ModuleTextSizeV=1.524
ModuleTextSizeH=1.524
ModuleTextSizeThickness=0.3048
SolderMaskClearance=0.09999999999999999
SolderMaskMinWidth=0
DrawSegmentWidth=0.381
BoardOutlineThickness=0.381
ModuleOutlineThickness=0.381
demos/pic_programmer/pic_programmer.sch
View file @ 6bae852c
......@@ -272,7 +272,7 @@ U 1 1 4639BA28
P 7150 2900
F 0 "D11" H 7150 3000 40 0000 C CNN
F 1 "BAT43" H 7150 2800 40 0000 C CNN
F 2 "discret:D3" H 7150 3050 60 0000 C CNN
F 2 "discret:D3" H 7150 3050 30 0000 C CNN
F 3 "" H 7150 2900 60 0001 C CNN
1 7150 2900
-1 0 0 1
......@@ -373,7 +373,7 @@ U 1 1 443D0101
P 9600 5900
F 0 "RV1" H 9600 5800 50 0000 C CNN
F 1 "1K" H 9600 5900 50 0000 C CNN
F 2 "discret:RV2X4" H 9600 5900 60 0000 C CNN
F 2 "discret:RV2X4" H 9600 5750 30 0000 C CNN
F 3 "" H 9600 5900 60 0001 C CNN
1 9600 5900
0 -1 -1 0
......@@ -455,7 +455,7 @@ U 1 1 442A5F83
P 8350 6100
F 0 "R10" V 8430 6100 50 0000 C CNN
F 1 "5,1K" V 8350 6100 50 0000 C CNN
F 2 "discret:R4" H 8350 6100 60 0000 C CNN
F 2 "discret:R4" V 8250 6100 30 0000 C CNN
F 3 "" H 8350 6100 60 0001 C CNN
1 8350 6100
0 -1 -1 0
......@@ -501,7 +501,7 @@ U 1 1 442A58DC
P 10000 5650
F 0 "R16" V 10080 5650 50 0000 C CNN
F 1 "62K" V 10000 5650 50 0000 C CNN
F 2 "discret:R4" H 10000 5650 60 0000 C CNN
F 2 "discret:R4" V 9929 5647 30 0000 C CNN
F 3 "" H 10000 5650 60 0001 C CNN
1 10000 5650
0 -1 -1 0
......@@ -512,7 +512,7 @@ U 1 1 442A58D7
P 10000 6150
F 0 "R15" V 10080 6150 50 0000 C CNN
F 1 "6.2K" V 10000 6150 50 0000 C CNN
F 2 "discret:R4" H 10000 6150 60 0000 C CNN
F 2 "discret:R4" V 9922 6141 30 0000 C CNN
F 3 "" H 10000 6150 60 0001 C CNN
1 10000 6150
0 -1 -1 0
......@@ -682,7 +682,7 @@ U 1 1 442A5084
P 4150 6950
F 0 "D9" H 4150 7050 50 0000 C CNN
F 1 "GREEN-LED" H 4150 6850 50 0000 C CNN
F 2 "discret:LEDV" H 4150 7200 60 0000 C CNN
F 2 "discret:LEDV" H 4150 7200 30 0000 C CNN
F 3 "" H 4150 6950 60 0001 C CNN
F 4 "GREEN LED" H 4200 7100 40 0000 C CNN "Champ4"
1 4150 6950
......@@ -694,7 +694,7 @@ U 1 1 442A5083
P 3850 6650
F 0 "R14" V 3930 6650 50 0000 C CNN
F 1 "470" V 3850 6650 50 0000 C CNN
F 2 "discret:R4" H 3850 6650 60 0000 C CNN
F 2 "discret:R4" V 3765 6645 30 0000 C CNN
F 3 "" H 3850 6650 60 0001 C CNN
1 3850 6650
0 -1 -1 0
......@@ -716,7 +716,7 @@ U 1 1 442A5056
P 3200 6900
F 0 "C1" H 3250 7000 50 0000 L CNN
F 1 "100µF" H 3250 6800 50 0000 L CNN
F 2 "discret:CP10" H 3500 6750 60 0000 C CNN
F 2 "discret:CP10" H 3500 6750 30 0000 C CNN
F 3 "" H 3200 6900 60 0001 C CNN
1 3200 6900
1 0 0 -1
......@@ -782,7 +782,7 @@ U 1 1 442A500B
P 1650 6650
F 0 "D1" H 1650 6750 40 0000 C CNN
F 1 "1N4004" H 1650 6550 40 0000 C CNN
F 2 "discret:D5" H 1700 6850 60 0000 C CNN
F 2 "discret:D5" H 1646 6800 30 0000 C CNN
F 3 "" H 1650 6650 60 0001 C CNN
1 1650 6650
1 0 0 -1
......@@ -962,7 +962,7 @@ U 1 1 442A4D92
P 4700 1700
F 0 "R8" V 4780 1700 50 0000 C CNN
F 1 "1K" V 4700 1700 50 0000 C CNN
F 2 "discret:R4" V 4850 1700 60 0000 C CNN
F 2 "discret:R4" V 4850 1700 30 0000 C CNN
F 3 "" H 4700 1700 60 0001 C CNN
1 4700 1700
0 -1 -1 0
......@@ -973,7 +973,7 @@ U 1 1 442A4D8D
P 5100 5100
F 0 "R13" V 5180 5100 50 0000 C CNN
F 1 "470" V 5100 5100 50 0000 C CNN
F 2 "discret:R4" V 5250 5100 60 0000 C CNN
F 2 "discret:R4" V 5250 5100 30 0000 C CNN
F 3 "" H 5100 5100 60 0001 C CNN
1 5100 5100
0 -1 -1 0
......@@ -1050,7 +1050,7 @@ U 1 1 442A4D65
P 3850 5400
F 0 "D7" H 3850 5500 40 0000 C CNN
F 1 "BAT43" H 3850 5300 40 0000 C CNN
F 2 "discret:D3" H 3850 5250 60 0000 C CNN
F 2 "discret:D3" H 3850 5250 30 0000 C CNN
F 3 "" H 3850 5400 60 0001 C CNN
1 3850 5400
0 -1 -1 0
......@@ -1072,7 +1072,7 @@ U 1 1 442A4D63
P 3200 5400
F 0 "R6" V 3280 5400 50 0000 C CNN
F 1 "10K" V 3200 5400 50 0000 C CNN
F 2 "discret:R4" V 3100 5400 60 0000 C CNN
F 2 "discret:R4" V 3100 5400 30 0000 C CNN
F 3 "" H 3200 5400 60 0001 C CNN
1 3200 5400
1 0 0 -1
......@@ -1083,7 +1083,7 @@ U 1 1 442A4D62
P 3500 5100
F 0 "R5" V 3580 5100 50 0000 C CNN
F 1 "10K" V 3500 5100 50 0000 C CNN
F 2 "discret:R4" H 3500 5100 60 0000 C CNN
F 2 "discret:R4" V 3420 5088 30 0000 C CNN
F 3 "" H 3500 5100 60 0001 C CNN
1 3500 5100
0 -1 -1 0
......@@ -1226,7 +1226,7 @@ U 1 1 442A4D25
P 3450 2000
F 0 "D3" H 3450 2100 40 0000 C CNN
F 1 "BAT43" H 3450 1900 40 0000 C CNN
F 2 "discret:D3" H 3450 1850 60 0000 C CNN
F 2 "discret:D3" H 3450 1850 30 0000 C CNN
F 3 "" H 3450 2000 60 0001 C CNN
1 3450 2000
0 -1 -1 0
......@@ -1237,7 +1237,7 @@ U 1 1 442A4D1B
P 3450 1450
F 0 "D2" H 3450 1550 40 0000 C CNN
F 1 "BAT43" H 3450 1350 40 0000 C CNN
F 2 "discret:D3" H 3500 1300 60 0000 C CNN
F 2 "discret:D3" H 3500 1300 30 0000 C CNN
F 3 "" H 3450 1450 60 0001 C CNN
1 3450 1450
0 -1 -1 0
......@@ -1289,68 +1289,78 @@ $EndComp
$Comp
L CONN_1 P101
U 1 1 54020BEA
P 6400 6850
F 0 "P101" H 6480 6850 40 0000 L CNN
F 1 "CONN_1" H 6400 6905 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 6850 60 0001 C CNN
F 3 "" H 6400 6850 60 0000 C CNN
1 6400 6850
P 6400 6800
F 0 "P101" H 6480 6800 40 0000 L CNN
F 1 "CONN_1" H 6400 6855 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 6800 60 0001 C CNN
F 3 "" H 6400 6800 60 0000 C CNN
1 6400 6800
1 0 0 -1
$EndComp
$Comp
L CONN_1 P102
U 1 1 54020DA9
P 6400 7000
F 0 "P102" H 6480 7000 40 0000 L CNN
F 1 "CONN_1" H 6400 7055 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7000 60 0001 C CNN
F 3 "" H 6400 7000 60 0000 C CNN
1 6400 7000
P 6400 6950
F 0 "P102" H 6480 6950 40 0000 L CNN
F 1 "CONN_1" H 6400 7005 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 6950 60 0001 C CNN
F 3 "" H 6400 6950 60 0000 C CNN
1 6400 6950
1 0 0 -1
$EndComp
$Comp
L CONN_1 P103
U 1 1 54020DC2
P 6400 7150
F 0 "P103" H 6480 7150 40 0000 L CNN
F 1 "CONN_1" H 6400 7205 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7150 60 0001 C CNN
F 3 "" H 6400 7150 60 0000 C CNN
1 6400 7150
P 6400 7100
F 0 "P103" H 6480 7100 40 0000 L CNN
F 1 "CONN_1" H 6400 7155 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7100 60 0001 C CNN
F 3 "" H 6400 7100 60 0000 C CNN
1 6400 7100
1 0 0 -1
$EndComp
$Comp
L CONN_1 P104
U 1 1 54020DE3
P 6400 7300
F 0 "P104" H 6480 7300 40 0000 L CNN
F 1 "CONN_1" H 6400 7355 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7300 60 0001 C CNN
F 3 "" H 6400 7300 60 0000 C CNN
1 6400 7300
P 6400 7250
F 0 "P104" H 6480 7250 40 0000 L CNN
F 1 "CONN_1" H 6400 7305 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7250 60 0001 C CNN
F 3 "" H 6400 7250 60 0000 C CNN
1 6400 7250
1 0 0 -1
$EndComp
$Comp
L CONN_1 P105
U 1 1 54020E5D
P 6400 7450
F 0 "P105" H 6480 7450 40 0000 L CNN
F 1 "CONN_1" H 6400 7505 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7450 60 0001 C CNN
F 3 "" H 6400 7450 60 0000 C CNN
1 6400 7450
P 6400 7400
F 0 "P105" H 6480 7400 40 0000 L CNN
F 1 "CONN_1" H 6400 7455 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7400 60 0001 C CNN
F 3 "" H 6400 7400 60 0000 C CNN
1 6400 7400
1 0 0 -1
$EndComp
$Comp
L CONN_1 P106
U 1 1 54020E76
P 6400 7600
F 0 "P106" H 6480 7600 40 0000 L CNN
F 1 "CONN_1" H 6400 7655 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7600 60 0001 C CNN
F 3 "" H 6400 7600 60 0000 C CNN
1 6400 7600
P 6400 7550
F 0 "P106" H 6480 7550 40 0000 L CNN
F 1 "CONN_1" H 6400 7605 30 0001 C CNN
F 2 "footprints:1pin-4" H 6400 7550 60 0001 C CNN
F 3 "" H 6400 7550 60 0000 C CNN
1 6400 7550
1 0 0 -1
$EndComp
Connection ~ 8650 3200
Wire Notes Line
5850 6700 6800 6700
Wire Notes Line
6800 6700 6800 7750
Wire Notes Line
6800 7750 5850 7750
Wire Notes Line
5850 7750 5850 6700
Text Notes 6050 7700 0 40 Italic 0
Mounting holes
$EndSCHEMATC
demos/pic_programmer/pic_sockets.sch
View file @ 6bae852c
......@@ -252,7 +252,7 @@ U 1 1 442A88ED
P 9050 5100
F 0 "P3" H 9100 6200 70 0000 C CNN
F 1 "SUPP40" H 8900 4000 70 0000 C CNN
F 2 "footprints:textool_40" H 9100 3900 60 0000 C CNN
F 2 "sockets:40tex-Ell600" H 9100 3900 60 0000 C CNN
F 3 "" H 9050 5100 60 0001 C CNN
1 9050 5100
1 0 0 -1
......
eeschema/menubar.cpp
View file @ 6bae852c
......@@ -308,6 +308,12 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
HK_ADD_NOCONN_FLAG, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_NOCONN_BUTT, text, HELP_PLACE_NC_FLAG, KiBitmap( noconn_xpm ) );
text = AddHotkeyName( _( "&Junction" ), s_Schematic_Hokeys_Descr,
HK_ADD_JUNCTION, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_JUNCTION_BUTT, text,
HELP_PLACE_JUNCTION,
KiBitmap( add_junction_xpm ) );
text = AddHotkeyName( _( "&Label" ), s_Schematic_Hokeys_Descr,
HK_ADD_LABEL, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_LABEL_BUTT, text,
......@@ -320,12 +326,6 @@ void SCH_EDIT_FRAME::ReCreateMenuBar()
HELP_PLACE_GLOBALLABEL,
KiBitmap( add_glabel_xpm ) );
text = AddHotkeyName( _( "&Junction" ), s_Schematic_Hokeys_Descr,
HK_ADD_JUNCTION, IS_ACCELERATOR ); // add an accelerator, not a shortcut
AddMenuItem( placeMenu, ID_JUNCTION_BUTT, text,
HELP_PLACE_JUNCTION,
KiBitmap( add_junction_xpm ) );
placeMenu->AppendSeparator();
text = AddHotkeyName( _( "&Hierarchical Label" ), s_Schematic_Hokeys_Descr,
......
pcbnew/dialogs/dialog_fp_lib_table.cpp
View file @ 6bae852c
......@@ -347,6 +347,9 @@ public:
// Fit();
// We derive from DIALOG_SHIM so prior size will be used anyways.
// select the last selected page
m_auinotebook->ChangeSelection( m_pageNdx );
// fire pageChangedHandler() so m_cur_grid gets set
wxAuiNotebookEvent uneventful;
pageChangedHandler( uneventful );
......@@ -494,8 +497,8 @@ private:
void pageChangedHandler( wxAuiNotebookEvent& event )
{
int pageNdx = m_auinotebook->GetSelection();
m_cur_grid = ( pageNdx == 0 ) ? m_global_grid : m_project_grid;
m_pageNdx = m_auinotebook->GetSelection();
m_cur_grid = ( m_pageNdx == 0 ) ? m_global_grid : m_project_grid;
}
void appendRowHandler( wxMouseEvent& event )
......@@ -746,8 +749,11 @@ private:
FP_TBL_MODEL* cur_model() const { return (FP_TBL_MODEL*) m_cur_grid->GetTable(); }
wxGrid* m_cur_grid; ///< changed based on tab choice
static int m_pageNdx; ///< Remember the last notebook page selected during a session
};
int DIALOG_FP_LIB_TABLE::m_pageNdx = 0;
int InvokePcbLibTableEditor( wxTopLevelWindow* aParent, FP_LIB_TABLE* aGlobal, FP_LIB_TABLE* aProject )
{
......
pcbnew/dialogs/dialog_fp_lib_table_base.cpp
View file @ 6bae852c
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013)
// C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......@@ -98,12 +98,12 @@ DIALOG_FP_LIB_TABLE_BASE::DIALOG_FP_LIB_TABLE_BASE( wxWindow* parent, wxWindowID
wxBoxSizer* bSizer51;
bSizer51 = new wxBoxSizer( wxHORIZONTAL );
m_append_button = new wxButton( this, wxID_ANY, _("Append Row"), wxDefaultPosition, wxDefaultSize, 0 );
m_append_button = new wxButton( this, wxID_ANY, _("Append Library"), wxDefaultPosition, wxDefaultSize, 0 );
m_append_button->SetToolTip( _("Add a PCB library row to this table") );
bSizer51->Add( m_append_button, 0, wxALL, 5 );
m_delete_button = new wxButton( this, wxID_ANY, _("Delete Row"), wxDefaultPosition, wxDefaultSize, 0 );
m_delete_button = new wxButton( this, wxID_ANY, _("Remove Library"), wxDefaultPosition, wxDefaultSize, 0 );
m_delete_button->SetToolTip( _("Remove a PCB library from this library table") );
bSizer51->Add( m_delete_button, 0, wxALL, 5 );
......
pcbnew/dialogs/dialog_fp_lib_table_base.fbp
View file @ 6bae852c
<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
<wxFormBuilder_Project>
<FileVersion major="1" minor="11" />
<FileVersion major="1" minor="13" />
<object class="Project" expanded="1">
<property name="class_decoration"></property>
<property name="code_generation">C++</property>
......@@ -696,7 +696,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Append Row</property>
<property name="label">Append Library</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
......@@ -784,7 +784,7 @@
<property name="gripper">0</property>
<property name="hidden">0</property>
<property name="id">wxID_ANY</property>
<property name="label">Delete Row</property>
<property name="label">Remove Library</property>
<property name="max_size"></property>
<property name="maximize_button">0</property>
<property name="maximum_size"></property>
......
pcbnew/dialogs/dialog_fp_lib_table_base.h
View file @ 6bae852c
///////////////////////////////////////////////////////////////////////////
// C++ code generated with wxFormBuilder (version Nov 6 2013)
// C++ code generated with wxFormBuilder (version Jun 5 2014)
// http://www.wxformbuilder.org/
//
// PLEASE DO "NOT" EDIT THIS FILE!
......
pcbnew/specctra_export.cpp
View file @ 6bae852c
......@@ -236,8 +236,8 @@ static inline double mapY( int y )
/**
* Function mapPt
* converts a KiCad point into a DSN file point. Kicad's BOARD coordinates
* are in deci-mils (i.e. 1/10,000th of an inch) and we are exporting in units
* of mils, so we have to divide by 10.
* are in nanometers (called Internal Units or IU)and we are exporting in units
* of mils, so we have to scale them.
*/
static POINT mapPt( const wxPoint& pt )
{
......@@ -864,12 +864,14 @@ static void makeCircle( PATH* aPath, DRAWSEGMENT* aGraphic )
// do a circle segmentation
const int STEPS = 2 * 36;
wxPoint start;
wxPoint center = aGraphic->GetCenter();
int radius = aGraphic->GetRadius();
double angle = 3600.0;
start = center;
if( radius <= 0 ) // Should not occur, but ...
return;
wxPoint center = aGraphic->GetCenter();
double angle = 3600.0;
wxPoint start = center;
start.x += radius;
wxPoint nextPt;
......@@ -990,7 +992,8 @@ void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary ) throw( IO_ER
// pt has minimum x point
pt.x -= graphic->GetRadius();
if( pt.x < xmin.x )
// when the radius <= 0, this is a mal-formed circle. Skip it
if( graphic->GetRadius() > 0 && pt.x < xmin.x )
{
xmin = pt;
xmini = i;
......@@ -1020,7 +1023,7 @@ void SPECCTRA_DB::fillBOUNDARY( BOARD* aBoard, BOUNDARY* boundary ) throw( IO_ER
// Set maximum proximity threshold for point to point nearness metric for
// board perimeter only, not interior keepouts yet.
prox = Millimeter2iu( 0.002 ); // should be enough to fix rounding issues
prox = Millimeter2iu( 0.01 ); // should be enough to fix rounding issues
// is arc start and end point calculations
// Output the Edge.Cuts perimeter as circle or polygon.
......
pcbnew/tools/drawing_tool.cpp
View file @ 6bae852c
......@@ -1019,7 +1019,7 @@ bool DRAWING_TOOL::drawSegment( int aShape, DRAWSEGMENT*& aGraphic,
else if( evt->IsAction( &COMMON_ACTIONS::decWidth ) )
{
if( lineWidth > WIDTH_STEP )
if( lineWidth > (unsigned) WIDTH_STEP )
{
lineWidth -= WIDTH_STEP;
aGraphic->SetWidth( lineWidth );
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment