Skip to content

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

Update demos. Fix pspice netlist issues when using ( and ) in net names (... 

Update demos. Fix  pspice netlist issues when using ( and ) in net names ( parenthesis are replaced by underscore) .
parent b02f12f4
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 6083 additions and 5807 deletions
demos/pic_programmer/pic_programmer-cache.lib
View file @ fe919cd4
EESchema-LIBRARY Version 2.3 Date: 15/10/2009 11:34:58 EESchema-LIBRARY Version 2.3
#encoding utf-8
# #
# 24C16 # 24C16
# #
DEF 24C16 U 0 30 Y Y 1 F N DEF 24C16 U 0 30 Y Y 1 F N
F0 "U" 150 350 60 H V C CNN F0 "U" 150 350 60 H V C CNN
F1 "24C16" 200 -350 60 H V C CNN F1 "24C16" 200 -350 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
ALIAS 24C512 ALIAS 24C512
DRAW DRAW
X GND 4 0 -300 0 U 60 60 0 0 W N X GND 4 0 -500 200 U 60 60 0 0 W
X VCC 8 0 300 0 D 60 60 0 0 W N X VCC 8 0 500 200 D 60 60 0 0 W
S -400 -300 400 300 0 1 0 N S -400 -300 400 300 1 1 0 N
X A0 1 -700 200 300 R 60 60 1 1 I X A0 1 -700 200 300 R 60 60 1 1 I
X A1 2 -700 100 300 R 60 60 1 1 I X A1 2 -700 100 300 R 60 60 1 1 I
X A2 3 -700 0 300 R 60 60 1 1 I X A2 3 -700 0 300 R 60 60 1 1 I
...@@ -24,6 +27,8 @@ ENDDEF ...@@ -24,6 +27,8 @@ ENDDEF
DEF 74LS125 U 0 30 Y Y 4 F N DEF 74LS125 U 0 30 Y Y 4 F N
F0 "U" 0 100 50 H V L BNN F0 "U" 0 100 50 H V L BNN
F1 "74LS125" 50 -150 40 H V L TNN F1 "74LS125" 50 -150 40 H V L TNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X GND 7 -150 -150 0 U 50 30 0 0 W N X GND 7 -150 -150 0 U 50 30 0 0 W N
X VCC 14 -150 150 0 D 50 30 0 0 W N X VCC 14 -150 150 0 D 50 30 0 0 W N
...@@ -48,6 +53,8 @@ ENDDEF ...@@ -48,6 +53,8 @@ ENDDEF
DEF 7805 U 0 30 N Y 1 F N DEF 7805 U 0 30 N Y 1 F N
F0 "U" 150 -196 60 H V C CNN F0 "U" 150 -196 60 H V C CNN
F1 "7805" 0 200 60 H V C CNN F1 "7805" 0 200 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
ALIAS LM7805 LM7812 78L05 ALIAS LM7805 LM7812 78L05
DRAW DRAW
S -200 -150 200 150 0 1 0 N S -200 -150 200 150 0 1 0 N
...@@ -60,16 +67,18 @@ ENDDEF ...@@ -60,16 +67,18 @@ ENDDEF
# C # C
# #
DEF C C 0 10 N Y 1 F N DEF C C 0 10 N Y 1 F N
F0 "C" 50 100 50 H V L CNN F0 "C" 0 100 40 H V L CNN
F1 "C" 50 -100 50 H V L CNN F1 "C" 6 -85 40 H V L CNN
F2 "" 38 -150 30 H V C CNN
F3 "" 0 100 30 H V C CNN
$FPLIST $FPLIST
SM* SM*
C? C?
C1-1 C1-1
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 2 0 1 10 -100 -30 100 -30 N P 2 0 1 20 -80 -30 80 -30 N
P 2 0 1 10 -100 30 100 30 N P 2 0 1 20 -80 30 80 30 N
X ~ 1 0 200 170 D 40 40 1 1 P X ~ 1 0 200 170 D 40 40 1 1 P
X ~ 2 0 -200 170 U 40 40 1 1 P X ~ 2 0 -200 170 U 40 40 1 1 P
ENDDRAW ENDDRAW
...@@ -80,6 +89,8 @@ ENDDEF ...@@ -80,6 +89,8 @@ ENDDEF
DEF CONN_2 P 0 40 Y N 1 F N DEF CONN_2 P 0 40 Y N 1 F N
F0 "P" -50 0 40 V V C CNN F0 "P" -50 0 40 V V C CNN
F1 "CONN_2" 50 0 40 V V C CNN F1 "CONN_2" 50 0 40 V V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -100 150 100 -150 0 1 0 N S -100 150 100 -150 0 1 0 N
X P1 1 -350 100 250 R 60 60 1 1 P I X P1 1 -350 100 250 R 60 60 1 1 P I
...@@ -90,44 +101,30 @@ ENDDEF ...@@ -90,44 +101,30 @@ ENDDEF
# CP # CP
# #
DEF CP C 0 10 N N 1 F N DEF CP C 0 10 N N 1 F N
F0 "C" 50 100 50 H V L CNN F0 "C" 50 100 40 H V L CNN
F1 "CP" 50 -100 50 H V L CNN F1 "CP" 50 -100 40 H V L CNN
F2 "" 100 -150 30 H V C CNN
F3 "" 50 100 30 H V C CNN
ALIAS CAPAPOL ALIAS CAPAPOL
$FPLIST $FPLIST
CP* CP*
SM* SM*
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 4 0 1 8 -100 50 -100 -50 100 -50 100 50 N P 4 0 1 8 -80 50 -80 -50 80 -50 80 50 N
P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F
X ~ 1 0 200 150 D 40 40 1 1 P X ~ 1 0 200 150 D 40 40 1 1 P
X ~ 2 0 -200 150 U 40 40 1 1 P X ~ 2 0 -200 150 U 40 40 1 1 P
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# CP1
#
DEF CP1 C 0 10 N N 1 F N
F0 "C" 50 100 50 H V L CNN
F1 "CP1" 50 -100 50 H V L CNN
$FPLIST
CP*
SM*
$ENDFPLIST
DRAW
T 0 -50 100 80 0 0 0 + Normal 0 C C
A 0 -200 180 563 1236 0 1 15 N 100 -50 -100 -50
P 4 0 1 15 -100 50 100 50 50 50 50 50 N
X ~ 1 0 200 150 D 40 40 1 1 P
X ~ 2 0 -200 180 U 40 40 1 1 P
ENDDRAW
ENDDEF
#
# DB9 # DB9
# #
DEF DB9 J 0 40 Y N 1 F N DEF DB9 J 0 40 Y N 1 F N
F0 "J" 0 550 70 H V C CNN F0 "J" 0 550 70 H V C CNN
F1 "DB9" 0 -550 70 H V C CNN F1 "DB9" 0 -550 70 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
DB9* DB9*
$ENDFPLIST $ENDFPLIST
...@@ -179,6 +176,8 @@ ENDDEF ...@@ -179,6 +176,8 @@ ENDDEF
DEF DIODE D 0 40 N N 1 F N DEF DIODE D 0 40 N N 1 F N
F0 "D" 0 100 40 H V C CNN F0 "D" 0 100 40 H V C CNN
F1 "DIODE" 0 -100 40 H V C CNN F1 "DIODE" 0 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
D? D?
S* S*
...@@ -196,6 +195,8 @@ ENDDEF ...@@ -196,6 +195,8 @@ ENDDEF
DEF DIODESCH D 0 40 N N 1 F N DEF DIODESCH D 0 40 N N 1 F N
F0 "D" 0 100 40 H V C CNN F0 "D" 0 100 40 H V C CNN
F1 "DIODESCH" 0 -100 40 H V C CNN F1 "DIODESCH" 0 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
D? D?
S* S*
...@@ -213,17 +214,21 @@ ENDDEF ...@@ -213,17 +214,21 @@ ENDDEF
DEF ~GND #PWR 0 0 Y Y 1 F P DEF ~GND #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 0 30 H I C CNN F0 "#PWR" 0 0 30 H I C CNN
F1 "GND" 0 -70 30 H I C CNN F1 "GND" 0 -70 30 H I C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
P 4 0 1 4 -50 0 0 -50 50 0 -50 0 N P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
X GND 1 0 0 0 U 30 30 1 1 W N X GND 1 0 0 0 U 30 30 1 1 W N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# INDUCTOR # INDUCTOR
# #
DEF INDUCTOR L 0 40 N N 0 F N DEF INDUCTOR L 0 40 N N 1 F N
F0 "L" -50 0 40 V V C CNN F0 "L" -50 0 40 V V C CNN
F1 "INDUCTOR" 100 0 40 V V C CNN F1 "INDUCTOR" 100 0 40 V V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100 A 0 -150 50 -889 889 0 1 0 N 1 -199 1 -100
A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2 A 0 -49 51 -889 889 0 1 0 N 1 -99 1 2
...@@ -239,6 +244,8 @@ ENDDEF ...@@ -239,6 +244,8 @@ ENDDEF
DEF JUMPER JP 0 30 Y N 1 F N DEF JUMPER JP 0 30 Y N 1 F N
F0 "JP" 0 150 60 H V C CNN F0 "JP" 0 150 60 H V C CNN
F1 "JUMPER" 0 -80 40 H V C CNN F1 "JUMPER" 0 -80 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
A 0 -26 125 1426 373 0 1 0 N -98 50 99 50 A 0 -26 125 1426 373 0 1 0 N -98 50 99 50
C -100 0 35 0 1 0 N C -100 0 35 0 1 0 N
...@@ -253,6 +260,8 @@ ENDDEF ...@@ -253,6 +260,8 @@ ENDDEF
DEF LED D 0 40 Y N 1 F N DEF LED D 0 40 Y N 1 F N
F0 "D" 0 100 50 H V C CNN F0 "D" 0 100 50 H V C CNN
F1 "LED" 0 -100 50 H V C CNN F1 "LED" 0 -100 50 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
LED-3MM LED-3MM
LED-5MM LED-5MM
...@@ -277,6 +286,8 @@ ENDDEF ...@@ -277,6 +286,8 @@ ENDDEF
DEF LT1372 U 0 30 Y Y 1 F N DEF LT1372 U 0 30 Y Y 1 F N
F0 "U" 600 500 60 H V C CNN F0 "U" 600 500 60 H V C CNN
F1 "LT1372" -500 500 60 H V C CNN F1 "LT1372" -500 500 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
ALIAS LT1373 ALIAS LT1373
DRAW DRAW
S -700 -400 700 400 0 1 0 N S -700 -400 700 400 0 1 0 N
...@@ -293,11 +304,12 @@ ENDDEF ...@@ -293,11 +304,12 @@ ENDDEF
# #
# NPN # NPN
# #
DEF NPN Q 0 0 Y Y 0 F N DEF NPN Q 0 0 Y Y 1 F N
F0 "Q" 150 0 50 H V C CNN F0 "Q" 0 -150 50 H V R CNN
F1 "NPN" -98 150 50 H V C CNN F1 "NPN" 0 150 50 H V R CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
C 50 0 0 0 1 0 N
C 50 0 111 0 1 10 N C 50 0 111 0 1 10 N
P 2 0 1 0 0 0 100 100 N P 2 0 1 0 0 0 100 100 N
P 3 0 1 10 0 75 0 -75 0 -75 N P 3 0 1 10 0 75 0 -75 0 -75 N
...@@ -315,6 +327,8 @@ ENDDEF ...@@ -315,6 +327,8 @@ ENDDEF
DEF PIC12C508A U 0 40 Y Y 1 F N DEF PIC12C508A U 0 40 Y Y 1 F N
F0 "U" 0 700 60 H V C CNN F0 "U" 0 700 60 H V C CNN
F1 "PIC12C508A" 0 -650 60 H V C CNN F1 "PIC12C508A" 0 -650 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
ALIAS PIC12C509A ALIAS PIC12C509A
DRAW DRAW
S 400 -600 -450 650 0 1 0 N S 400 -600 -450 650 0 1 0 N
...@@ -342,6 +356,8 @@ ENDDEF ...@@ -342,6 +356,8 @@ ENDDEF
DEF PIC16F54 U? 0 40 Y Y 1 F N DEF PIC16F54 U? 0 40 Y Y 1 F N
F0 "U?" 0 -750 60 H V C CNN F0 "U?" 0 -750 60 H V C CNN
F1 "PIC16F54" 0 800 60 H V C CNN F1 "PIC16F54" 0 800 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -500 700 450 -700 0 1 0 N S -500 700 450 -700 0 1 0 N
X RA2 1 -800 600 300 R 50 50 1 1 B X RA2 1 -800 600 300 R 50 50 1 1 B
...@@ -385,11 +401,12 @@ ENDDEF ...@@ -385,11 +401,12 @@ ENDDEF
# #
# PNP # PNP
# #
DEF PNP Q 0 0 Y Y 0 F N DEF PNP Q 0 0 Y Y 1 F N
F0 "Q" 150 0 60 H V C CNN F0 "Q" 0 -150 60 H V R CNN
F1 "PNP" -96 150 60 H V C CNN F1 "PNP" 0 150 60 H V R CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
C 50 0 0 0 1 0 N
C 50 0 111 0 1 10 N C 50 0 111 0 1 10 N
P 2 0 1 0 0 0 100 100 N P 2 0 1 0 0 0 100 100 N
P 3 0 1 10 0 75 0 -75 0 -75 F P 3 0 1 10 0 75 0 -75 0 -75 F
...@@ -404,9 +421,11 @@ ENDDEF ...@@ -404,9 +421,11 @@ ENDDEF
# #
# POT # POT
# #
DEF POT RV 0 40 Y N 0 F N DEF POT RV 0 40 Y N 1 F N
F0 "RV" 0 -100 50 H V C CNN F0 "RV" 0 -100 50 H V C CNN
F1 "POT" 0 0 50 H V C CNN F1 "POT" 0 0 50 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -150 50 150 -50 0 1 0 N S -150 50 150 -50 0 1 0 N
P 3 0 1 0 0 50 -20 70 20 70 F P 3 0 1 0 0 50 -20 70 20 70 F
...@@ -419,27 +438,32 @@ ENDDEF ...@@ -419,27 +438,32 @@ ENDDEF
# PWR_FLAG # PWR_FLAG
# #
DEF PWR_FLAG #FLG 0 0 N N 1 F P DEF PWR_FLAG #FLG 0 0 N N 1 F P
F0 "#FLG" 0 270 30 H I C CNN F0 "#FLG" 0 95 30 H I C CNN
F1 "PWR_FLAG" 0 230 30 H V C CNN F1 "PWR_FLAG" 0 180 30 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X pwr 1 0 0 0 U 20 20 0 0 w X pwr 1 0 0 0 U 20 20 0 0 w
P 3 0 1 0 0 0 0 100 0 100 N P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N
P 5 0 1 0 0 100 -100 150 0 200 100 150 0 100 N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# R # R
# #
DEF R R 0 0 N Y 1 F N DEF R R 0 0 N Y 1 F N
F0 "R" 80 0 50 V V C CNN F0 "R" 80 0 40 V V C CNN
F1 "R" 0 0 50 V V C CNN F1 "R" 7 1 40 V V C CNN
F2 "" -70 0 30 V V C CNN
F3 "" 0 0 30 H V C CNN
$FPLIST $FPLIST
R? R?
SM0603 SM0603
SM0805 SM0805
R?-*
SM1206
$ENDFPLIST $ENDFPLIST
DRAW DRAW
S -40 150 40 -150 0 1 8 N S -40 150 40 -150 0 1 12 N
X ~ 1 0 250 100 D 60 60 1 1 P X ~ 1 0 250 100 D 60 60 1 1 P
X ~ 2 0 -250 100 U 60 60 1 1 P X ~ 2 0 -250 100 U 60 60 1 1 P
ENDDRAW ENDDRAW
...@@ -450,6 +474,8 @@ ENDDEF ...@@ -450,6 +474,8 @@ ENDDEF
DEF SUPP28 J 0 40 Y Y 1 F N DEF SUPP28 J 0 40 Y Y 1 F N
F0 "J" 0 100 70 H V C CNN F0 "J" 0 100 70 H V C CNN
F1 "SUPP28" 0 -100 70 H V C CNN F1 "SUPP28" 0 -100 70 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -300 -750 300 750 0 1 0 N S -300 -750 300 750 0 1 0 N
X 1 1 -600 650 300 R 60 60 1 1 P X 1 1 -600 650 300 R 60 60 1 1 P
...@@ -488,6 +514,8 @@ ENDDEF ...@@ -488,6 +514,8 @@ ENDDEF
DEF SUPP40 P 0 40 Y Y 1 F N DEF SUPP40 P 0 40 Y Y 1 F N
F0 "P" 0 1100 70 H V C CNN F0 "P" 0 1100 70 H V C CNN
F1 "SUPP40" 0 -1100 70 H V C CNN F1 "SUPP40" 0 -1100 70 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -300 -1050 300 1050 0 1 0 N S -300 -1050 300 1050 0 1 0 N
X 1 1 -600 950 300 R 60 60 1 1 P X 1 1 -600 950 300 R 60 60 1 1 P
...@@ -538,10 +566,12 @@ ENDDEF ...@@ -538,10 +566,12 @@ ENDDEF
DEF VCC #PWR 0 0 Y Y 1 F P DEF VCC #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 100 30 H I C CNN F0 "#PWR" 0 100 30 H I C CNN
F1 "VCC" 0 100 30 H V C CNN F1 "VCC" 0 100 30 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X VCC 1 0 0 0 U 20 20 0 0 W N X VCC 1 0 0 0 U 20 20 0 0 W N
C 0 50 20 0 1 4 N C 0 50 20 0 1 0 N
P 3 0 1 4 0 0 0 30 0 30 N P 3 0 1 0 0 0 0 30 0 30 N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
...@@ -550,6 +580,8 @@ ENDDEF ...@@ -550,6 +580,8 @@ ENDDEF
DEF VPP #PWR 0 0 Y Y 1 F N DEF VPP #PWR 0 0 Y Y 1 F N
F0 "#PWR" 0 200 40 H I C CNN F0 "#PWR" 0 200 40 H I C CNN
F1 "VPP" 0 150 40 H V C CNN F1 "VPP" 0 150 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X VPP 1 0 0 0 U 40 40 0 0 W N X VPP 1 0 0 0 U 40 40 0 0 W N
C 0 80 20 0 1 0 N C 0 80 20 0 1 0 N
......
demos/pic_programmer/pic_programmer.net
View file @ fe919cd4
This diff is collapsed.
demos/pic_programmer/pic_programmer.pro
View file @ fe919cd4
update=09/06/2011 08:34:19 update=05/01/2014 10:29:06
last_client=cvpcb last_client=kicad
[general]
version=1
RootSch=pic_programmer.sch
BoardNm=pic_programmer.brd
[common] [common]
NetDir= NetDir=
[cvpcb]
version=1
NetIExt=net
[cvpcb/libraries]
EquName1=devcms
[pcbnew] [pcbnew]
version=1 version=1
PadDril=400 PageLayoutDescrFile=
PadDimH=700 LastNetListRead=
PadDimV=700 UseCmpFile=1
PadForm=1 PadDrill=0.8128
PadMask=14745599 PadDrillOvalY=0.8128
ViaDiam=650 PadSizeH=1.5748
ViaDril=250 PadSizeV=2.794
Isol=100 PcbTextSizeV=1.5
Countlayer=2 PcbTextSizeH=1.5
Lpiste=250 PcbTextThickness=0.3048
RouteTo=15 ModuleTextSizeV=1
RouteBo=0 ModuleTextSizeH=1
TypeVia=3 ModuleTextSizeThickness=0.2
Segm45=1 SolderMaskClearance=0.09999999999999999
Racc45=1 SolderMaskMinWidth=0
Unite=0 DrawSegmentWidth=0.4
SegFill=1 BoardOutlineThickness=0.2
SegAffG=0 ModuleOutlineThickness=0.2
NewAffG=1
PadFill=1
PadAffG=1
PadSNum=1
ModAffC=1
ModAffT=1
PcbAffT=1
SgPcb45=1
TxtPcbV=800
TxtPcbH=600
TxtModV=600
TxtModH=600
TxtModW=120
HPGLnum=1
HPGdiam=15
HPGLSpd=20
HPGLrec=2
HPGLorg=0
GERBmin=15
VEgarde=100
DrawLar=150
EdgeLar=150
TxtLar=120
MSegLar=150
ForPlot=1
WpenSer=10
UserGrX=0,01
UserGrY=0,01
UserGrU=1
DivGrPc=1
TimeOut=600
MaxLnkS=3
ShowRat=0
ShowMRa=1
[pcbnew/libraries] [pcbnew/libraries]
LibDir=
LibName1=dip_sockets LibName1=dip_sockets
LibName2=sockets LibName2=sockets
LibName3=connect LibName3=connect
LibName4=discret LibName4=discret
LibName5=pin_array LibName5=pin_array
LibName6=divers LibName6=divers
LibName7=libcms [general]
LibName8=display
LibDir=
[cvpcb]
version=1 version=1
NetIExt=net
[cvpcb/libraries]
EquName1=devcms
demos/pic_programmer/pic_programmer.sch
View file @ fe919cd4
This diff is collapsed.
demos/pic_programmer/pic_sockets.sch
View file @ fe919cd4
This diff is collapsed.
demos/pspice/pspice-cache.lib
View file @ fe919cd4
EESchema-LIBRARY Version 2.3 Date: 14/07/2010 20:10:02 EESchema-LIBRARY Version 2.3
#encoding utf-8
# #
# +12V # +12V
# #
DEF +12V #PWR 0 0 N Y 1 F N DEF +12V #PWR 0 0 N Y 1 F N
F0 "#PWR" 0 200 40 H I C CNN F0 "#PWR" 0 200 40 H I C CNN
F1 "+12V" 0 150 40 H V C CNN F1 "+12V" 0 150 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X +12V 1 0 0 0 R 40 40 0 0 W N X +12V 1 0 0 0 R 40 40 0 0 W N
C 0 80 20 0 1 0 N C 0 80 20 0 1 0 N
...@@ -14,9 +17,11 @@ ENDDEF ...@@ -14,9 +17,11 @@ ENDDEF
# #
# 0 # 0
# #
DEF 0 #GND 0 0 Y Y 1 F N DEF 0 #GND 0 0 Y Y 1 F P
F0 "#GND" 0 -100 40 H I C CNN F0 "#GND" 0 -100 40 H I C CNN
F1 "0" 0 -70 40 H V C CNN F1 "0" 0 -70 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
X 0 1 0 0 0 R 40 40 1 1 W N X 0 1 0 0 0 R 40 40 1 1 W N
...@@ -28,6 +33,8 @@ ENDDEF ...@@ -28,6 +33,8 @@ ENDDEF
DEF CAP C 0 10 Y Y 1 F N DEF CAP C 0 10 Y Y 1 F N
F0 "C" 100 150 50 V V C CNN F0 "C" 100 150 50 V V C CNN
F1 "CAP" 100 -150 50 V V C CNN F1 "CAP" 100 -150 50 V V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
ALIAS C ALIAS C
DRAW DRAW
P 2 0 1 0 -150 -50 150 -50 N P 2 0 1 0 -150 -50 150 -50 N
...@@ -40,15 +47,17 @@ ENDDEF ...@@ -40,15 +47,17 @@ ENDDEF
# INDUCTOR # INDUCTOR
# #
DEF INDUCTOR L 0 0 N Y 1 F N DEF INDUCTOR L 0 0 N Y 1 F N
F0 "L" 0 100 70 H V C CNN F0 "L" 0 100 50 H V C CNN
F1 "INDUCTOR" 0 -100 70 H V C CNN F1 "INDUCTOR" 0 -50 50 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
A -300 0 100 0 1800 0 0 0 N -200 0 -400 0 A -150 0 50 1 1799 0 1 0 N -100 0 -200 0
A -100 0 100 0 1800 0 0 0 N 0 0 -200 0 A -50 0 50 1 1799 0 1 0 N 0 0 -100 0
A 100 0 100 0 1800 0 0 0 N 200 0 0 0 A 50 0 50 1 1799 0 1 0 N 100 0 0 0
A 300 0 100 0 1800 0 0 0 N 400 0 200 0 A 150 0 50 1 1799 0 1 0 N 200 0 100 0
X 1 1 -700 0 300 R 70 70 1 1 I X 1 1 -250 0 50 R 30 30 1 1 I
X 2 2 700 0 300 L 70 70 1 1 I X 2 2 250 0 50 L 30 30 1 1 I
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
...@@ -57,6 +66,8 @@ ENDDEF ...@@ -57,6 +66,8 @@ ENDDEF
DEF QNPN Q 0 0 Y Y 1 F N DEF QNPN Q 0 0 Y Y 1 F N
F0 "Q" -100 300 50 H V C CNN F0 "Q" -100 300 50 H V C CNN
F1 "QNPN" -100 200 50 H V C CNN F1 "QNPN" -100 200 50 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
P 2 0 0 0 0 0 150 -150 N P 2 0 0 0 0 0 150 -150 N
P 4 0 0 0 150 -150 150 -50 50 -150 150 -150 F P 4 0 0 0 150 -150 150 -50 50 -150 150 -150 F
...@@ -75,6 +86,8 @@ ENDDEF ...@@ -75,6 +86,8 @@ ENDDEF
DEF R R 0 0 N Y 1 F N DEF R R 0 0 N Y 1 F N
F0 "R" 80 0 50 V V C CNN F0 "R" 80 0 50 V V C CNN
F1 "R" 0 0 50 V V C CNN F1 "R" 0 0 50 V V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -40 150 40 -150 0 1 0 N S -40 150 40 -150 0 1 0 N
X ~ 1 0 250 100 D 60 60 1 1 P X ~ 1 0 250 100 D 60 60 1 1 P
...@@ -87,9 +100,11 @@ ENDDEF ...@@ -87,9 +100,11 @@ ENDDEF
DEF VSOURCE V 0 40 Y Y 1 F N DEF VSOURCE V 0 40 Y Y 1 F N
F0 "V" 0 -100 60 H V C CNN F0 "V" 0 -100 60 H V C CNN
F1 "VSOURCE" 0 100 60 H V C CNN F1 "VSOURCE" 0 100 60 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
C 0 0 400 0 1 0 N C 0 0 400 0 1 0 N
T 0 -320 -10 100 0 0 1 V Normal 1 C C T 0 -320 -10 100 0 0 1 V Normal 0 C C
P 2 0 1 0 -250 -250 -250 150 F P 2 0 1 0 -250 -250 -250 150 F
P 3 0 1 0 -300 150 -250 250 -200 150 F P 3 0 1 0 -300 150 -250 250 -200 150 F
X E1 1 0 700 300 D 60 60 1 1 I X E1 1 0 700 300 D 60 60 1 1 I
......
demos/pspice/pspice.cir
View file @ fe919cd4
* EESchema Netlist Version 1.1 (Spice format) creation date: 05/01/2014 19:00:38
* To exclude a component from the Spice Netlist add [Spice_Netlist_Enabled] user FIELD set to: N
* To reorder the component spice node sequence add [Spice_Node_Sequence] user FIELD and define sequence: 2,1,0
*Sheet Name:/
R12 /VOUT Net-_L1-Pad1_ 22K
R11 +12V Net-_L1-Pad1_ 100
L1 Net-_L1-Pad1_ /VOUT 100mH
R10 Net-_C3-Pad1_ Net-_Q3-Pad3_ 220
C3 Net-_C3-Pad1_ 0 10uF
C2 Net-_C2-Pad1_ 0 1nF
R8 Net-_Q3-Pad3_ 0 2.2K
Q3 /VOUT Net-_C2-Pad1_ Net-_Q3-Pad3_ Net-_Q3-Pad3_ Q2N2222
V2 Net-_C1-Pad2_ 0 AC 0.1
C1 /VIN Net-_C1-Pad2_ 1UF
V1 +12V 0 DC 12V
R2 /VIN 0 10K
R6 +12V /VIN 22K
R5 +12V Net-_Q2-Pad2_ 22K
R1 Net-_Q2-Pad2_ 0 10K
R7 Net-_Q1-Pad3_ 0 470
R4 +12V Net-_C2-Pad1_ 1K
R3 +12V Net-_Q1-Pad1_ 1K
Q2 Net-_C2-Pad1_ Net-_Q2-Pad2_ Net-_Q1-Pad3_ Net-_Q1-Pad3_ Q2N2222
Q1 Net-_Q1-Pad1_ /VIN Net-_Q1-Pad3_ Net-_Q1-Pad3_ Q2N2222
No circuit simulation currently defined .model Q2N2222 npn (bf=200)
\ No newline at end of file .print tran v(nodes)
.print dc v(nodes)
.tran 10 10000 10 > pspice.dat
.end
demos/pspice/pspice.pro
View file @ fe919cd4
update=14/07/2010 14:39:58 update=05/01/2014 19:00:46
last_client=pcbnew last_client=eeschema
[general] [general]
version=1 version=1
RootSch=pspice.sch RootSch=pspice.sch
BoardNm=pspice.brd BoardNm=pspice.brd
[eeschema]
version=1
LibDir=
NetFmt=4
HPGLSpd=20
HPGLDm=15
HPGLNum=1
offX_A4=0
offY_A4=0
offX_A3=0
offY_A3=0
offX_A2=0
offY_A2=0
offX_A1=0
offY_A1=0
offX_A0=0
offY_A0=0
offX_A=0
offY_A=0
offX_B=0
offY_B=0
offX_C=0
offY_C=0
offX_D=0
offY_D=0
offX_E=0
offY_E=0
RptD_X=0
RptD_Y=100
RptLab=1
SimCmd=f:/kicad/bin/gnucap.exe -b
UseNetN=1
LabSize=60
PrintMonochrome=1
ShowSheetReferenceAndTitleBlock=1
[eeschema/libraries]
LibName1=pspice
[pcbnew] [pcbnew]
version=1 version=1
PadDrlX=320 PadDrlX=320
...@@ -71,3 +34,16 @@ LibName7=display ...@@ -71,3 +34,16 @@ LibName7=display
LibName8=valves LibName8=valves
LibName9=led LibName9=led
LibName10=dip_sockets LibName10=dip_sockets
[eeschema]
version=1
PageLayoutDescrFile=
SubpartIdSeparator=0
SubpartFirstId=65
LibDir=
NetFmtName=Spice
RptD_X=0
RptD_Y=100
RptLab=1
LabSize=60
[eeschema/libraries]
LibName1=pspice
demos/pspice/pspice.sch
View file @ fe919cd4
This diff is collapsed.
demos/sonde xilinx/sonde xilinx-cache.lib
View file @ fe919cd4
EESchema-LIBRARY Version 2.3 Date: 09/02/2011 18:36:39 EESchema-LIBRARY Version 2.3
#encoding utf-8
# #
# 74LS125 # 74LS125
# #
DEF 74LS125 U 0 30 Y Y 4 F N DEF 74LS125 U 0 30 Y Y 4 F N
F0 "U" 0 100 50 H V L BNN F0 "U" 0 100 50 H V L BNN
F1 "74LS125" 50 -150 40 H V L TNN F1 "74LS125" 50 -150 40 H V L TNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X GND 7 -150 -150 0 U 50 30 0 0 W N X GND 7 -150 -150 0 U 50 30 0 0 W N
X VCC 14 -150 150 0 D 50 30 0 0 W N X VCC 14 -150 150 0 D 50 30 0 0 W N
...@@ -27,16 +30,18 @@ ENDDEF ...@@ -27,16 +30,18 @@ ENDDEF
# C # C
# #
DEF C C 0 10 N Y 1 F N DEF C C 0 10 N Y 1 F N
F0 "C" 50 100 50 H V L CNN F0 "C" 0 100 40 H V L CNN
F1 "C" 50 -100 50 H V L CNN F1 "C" 6 -85 40 H V L CNN
F2 "" 38 -150 30 H V C CNN
F3 "" 0 100 30 H V C CNN
$FPLIST $FPLIST
SM* SM*
C? C?
C1-1 C1-1
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 2 0 1 10 -100 -30 100 -30 N P 2 0 1 20 -80 -30 80 -30 N
P 2 0 1 10 -100 30 100 30 N P 2 0 1 20 -80 30 80 30 N
X ~ 1 0 200 170 D 40 40 1 1 P X ~ 1 0 200 170 D 40 40 1 1 P
X ~ 2 0 -200 170 U 40 40 1 1 P X ~ 2 0 -200 170 U 40 40 1 1 P
ENDDRAW ENDDRAW
...@@ -47,6 +52,8 @@ ENDDEF ...@@ -47,6 +52,8 @@ ENDDEF
DEF CONN_6 P 0 30 Y N 1 F N DEF CONN_6 P 0 30 Y N 1 F N
F0 "P" -50 0 60 V V C CNN F0 "P" -50 0 60 V V C CNN
F1 "CONN_6" 50 0 60 V V C CNN F1 "CONN_6" 50 0 60 V V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
S -100 300 100 -300 0 1 0 N S -100 300 100 -300 0 1 0 N
X 1 1 -350 250 250 R 60 60 1 1 P I X 1 1 -350 250 250 R 60 60 1 1 P I
...@@ -61,15 +68,17 @@ ENDDEF ...@@ -61,15 +68,17 @@ ENDDEF
# CP # CP
# #
DEF CP C 0 10 N N 1 F N DEF CP C 0 10 N N 1 F N
F0 "C" 50 100 50 H V L CNN F0 "C" 50 100 40 H V L CNN
F1 "CP" 50 -100 50 H V L CNN F1 "CP" 50 -100 40 H V L CNN
F2 "" 100 -150 30 H V C CNN
F3 "" 50 100 30 H V C CNN
ALIAS CAPAPOL ALIAS CAPAPOL
$FPLIST $FPLIST
CP* CP*
SM* SM*
$ENDFPLIST $ENDFPLIST
DRAW DRAW
P 4 0 1 8 -100 50 -100 -50 100 -50 100 50 N P 4 0 1 8 -80 50 -80 -50 80 -50 80 50 N
P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F P 4 0 1 0 -50 50 -50 -20 50 -20 50 50 F
X ~ 1 0 200 150 D 40 40 1 1 P X ~ 1 0 200 150 D 40 40 1 1 P
X ~ 2 0 -200 150 U 40 40 1 1 P X ~ 2 0 -200 150 U 40 40 1 1 P
...@@ -81,6 +90,8 @@ ENDDEF ...@@ -81,6 +90,8 @@ ENDDEF
DEF DB25 J 0 40 Y N 1 F N DEF DB25 J 0 40 Y N 1 F N
F0 "J" 50 1350 70 H V C CNN F0 "J" 50 1350 70 H V C CNN
F1 "DB25" -50 -1350 70 H V C CNN F1 "DB25" -50 -1350 70 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
DB25* DB25*
$ENDFPLIST $ENDFPLIST
...@@ -176,6 +187,8 @@ ENDDEF ...@@ -176,6 +187,8 @@ ENDDEF
DEF DB9 J 0 40 Y N 1 F N DEF DB9 J 0 40 Y N 1 F N
F0 "J" 0 550 70 H V C CNN F0 "J" 0 550 70 H V C CNN
F1 "DB9" 0 -550 70 H V C CNN F1 "DB9" 0 -550 70 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
DB9* DB9*
$ENDFPLIST $ENDFPLIST
...@@ -227,6 +240,8 @@ ENDDEF ...@@ -227,6 +240,8 @@ ENDDEF
DEF DIODESCH D 0 40 N N 1 F N DEF DIODESCH D 0 40 N N 1 F N
F0 "D" 0 100 40 H V C CNN F0 "D" 0 100 40 H V C CNN
F1 "DIODESCH" 0 -100 40 H V C CNN F1 "DIODESCH" 0 -100 40 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
$FPLIST $FPLIST
D? D?
S* S*
...@@ -244,6 +259,8 @@ ENDDEF ...@@ -244,6 +259,8 @@ ENDDEF
DEF ~GND #PWR 0 0 Y Y 1 F P DEF ~GND #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 0 30 H I C CNN F0 "#PWR" 0 0 30 H I C CNN
F1 "GND" 0 -70 30 H I C CNN F1 "GND" 0 -70 30 H I C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N P 4 0 1 0 -50 0 0 -50 50 0 -50 0 N
X GND 1 0 0 0 U 30 30 1 1 W N X GND 1 0 0 0 U 30 30 1 1 W N
...@@ -253,20 +270,23 @@ ENDDEF ...@@ -253,20 +270,23 @@ ENDDEF
# PWR_FLAG # PWR_FLAG
# #
DEF PWR_FLAG #FLG 0 0 N N 1 F P DEF PWR_FLAG #FLG 0 0 N N 1 F P
F0 "#FLG" 0 270 30 H I C CNN F0 "#FLG" 0 95 30 H I C CNN
F1 "PWR_FLAG" 0 230 30 H V C CNN F1 "PWR_FLAG" 0 180 30 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X pwr 1 0 0 0 U 20 20 0 0 w X pwr 1 0 0 0 U 20 20 0 0 w
P 3 0 1 0 0 0 0 100 0 100 N P 6 0 1 0 0 0 0 50 -75 100 0 150 75 100 0 50 N
P 5 0 1 0 0 100 -100 150 0 200 100 150 0 100 N
ENDDRAW ENDDRAW
ENDDEF ENDDEF
# #
# R # R
# #
DEF R R 0 0 N Y 1 F N DEF R R 0 0 N Y 1 F N
F0 "R" 80 0 50 V V C CNN F0 "R" 80 0 40 V V C CNN
F1 "R" 0 0 50 V V C CNN F1 "R" 7 1 40 V V C CNN
F2 "" -70 0 30 V V C CNN
F3 "" 0 0 30 H V C CNN
$FPLIST $FPLIST
R? R?
SM0603 SM0603
...@@ -286,6 +306,8 @@ ENDDEF ...@@ -286,6 +306,8 @@ ENDDEF
DEF VCC #PWR 0 0 Y Y 1 F P DEF VCC #PWR 0 0 Y Y 1 F P
F0 "#PWR" 0 100 30 H I C CNN F0 "#PWR" 0 100 30 H I C CNN
F1 "VCC" 0 100 30 H V C CNN F1 "VCC" 0 100 30 H V C CNN
F2 "" 0 0 60 H V C CNN
F3 "" 0 0 60 H V C CNN
DRAW DRAW
X VCC 1 0 0 0 U 20 20 0 0 W N X VCC 1 0 0 0 U 20 20 0 0 W N
C 0 50 20 0 1 0 N C 0 50 20 0 1 0 N
......
demos/sonde xilinx/sonde xilinx.kicad_pcb
View file @ fe919cd4
This diff is collapsed.
demos/sonde xilinx/sonde xilinx.net
View file @ fe919cd4
This diff is collapsed.
demos/sonde xilinx/sonde xilinx.pro
View file @ fe919cd4
update=07/03/2011 09:04:59 update=07/01/2014 20:13:17
version=1 version=1
last_client=pcbnew last_client=eeschema
[cvpcb] [cvpcb]
NetITyp=0 NetITyp=0
NetIExt=.net NetIExt=.net
...@@ -8,69 +8,6 @@ PkgIExt=.pkg ...@@ -8,69 +8,6 @@ PkgIExt=.pkg
NetDir= NetDir=
LibDir= LibDir=
NetType=0 NetType=0
[general]
version=1
RootSch=sonde.sch
BoardNm=sonde.brd
[eeschema]
version=1
LibDir=
NetFmt=1
HPGLSpd=20
HPGLDm=15
HPGLNum=1
offX_A4=0
offY_A4=0
offX_A3=0
offY_A3=0
offX_A2=0
offY_A2=0
offX_A1=0
offY_A1=0
offX_A0=0
offY_A0=0
offX_A=0
offY_A=0
offX_B=0
offY_B=0
offX_C=0
offY_C=0
offX_D=0
offY_D=0
offX_E=0
offY_E=0
RptD_X=0
RptD_Y=100
RptLab=1
PenMin=20
SimCmd=
UseNetN=0
[eeschema/libraries]
LibName1=power
LibName2=device
LibName3=conn
LibName4=linear
LibName5=regul
LibName6=74xx
LibName7=cmos4000
LibName8=adc-dac
LibName9=memory
LibName10=xilinx
LibName11=special
LibName12=microcontrollers
LibName13=microchip
LibName14=microchip1
LibName15=analog_switches
LibName16=motorola
LibName17=intel
LibName18=audio
LibName19=interface
LibName20=digital-audio
LibName21=philips
LibName22=display
LibName23=cypress
LibName24=siliconi
LibName25=contrib
[pcbnew] [pcbnew]
version=1 version=1
PadDrlX=320 PadDrlX=320
...@@ -98,3 +35,21 @@ LibName5=divers ...@@ -98,3 +35,21 @@ LibName5=divers
LibName6=libcms LibName6=libcms
LibName7=display LibName7=display
LibName8=valves LibName8=valves
[general]
version=1
[eeschema]
version=1
PageLayoutDescrFile=
SubpartIdSeparator=0
SubpartFirstId=65
LibDir=
NetFmtName=
RptD_X=0
RptD_Y=100
RptLab=1
LabSize=60
[eeschema/libraries]
LibName1=power
LibName2=device
LibName3=conn
LibName4=74xx
demos/sonde xilinx/sonde xilinx.sch
View file @ fe919cd4
This diff is collapsed.
eeschema/netform.cpp
View file @ fe919cd4
...@@ -1288,6 +1288,10 @@ bool NETLIST_EXPORT_TOOL::WriteNetListPspice( FILE* f, bool aUsePrefix ) ...@@ -1288,6 +1288,10 @@ bool NETLIST_EXPORT_TOOL::WriteNetListPspice( FILE* f, bool aUsePrefix )
sprintPinNetName( netName , wxT( "N-%.6d" ), pin ); sprintPinNetName( netName , wxT( "N-%.6d" ), pin );
//Replace parenthesis with underscore to prevent parse issues with Simulators:
netName.Replace(wxT("("),wxT("_"));
netName.Replace(wxT(")"),wxT("_"));
if( netName.IsEmpty() ) if( netName.IsEmpty() )
netName = wxT( "?" ); netName = wxT( "?" );
......
polygon/clipper.hpp
View file @ fe919cd4
...@@ -45,10 +45,10 @@ ...@@ -45,10 +45,10 @@
//use_lines: Enables line clipping. Adds a very minor cost to performance. //use_lines: Enables line clipping. Adds a very minor cost to performance.
//#define use_lines //#define use_lines
//use_deprecated: Enables support for the obsolete OffsetPaths() function //use_deprecated: Enables support for the obsolete OffsetPaths() function
//which has been replace with the ClipperOffset class. //which has been replace with the ClipperOffset class.
#define use_deprecated #define use_deprecated
#include <vector> #include <vector>
#include <set> #include <set>
...@@ -92,7 +92,7 @@ struct IntPoint { ...@@ -92,7 +92,7 @@ struct IntPoint {
} }
friend inline bool operator!= (const IntPoint& a, const IntPoint& b) friend inline bool operator!= (const IntPoint& a, const IntPoint& b)
{ {
return a.X != b.X || a.Y != b.Y; return a.X != b.X || a.Y != b.Y;
} }
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
...@@ -130,8 +130,8 @@ enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRou ...@@ -130,8 +130,8 @@ enum EndType {etClosedPolygon, etClosedLine, etOpenButt, etOpenSquare, etOpenRou
class PolyNode; class PolyNode;
typedef std::vector< PolyNode* > PolyNodes; typedef std::vector< PolyNode* > PolyNodes;
class PolyNode class PolyNode
{ {
public: public:
PolyNode(); PolyNode();
Path Contour; Path Contour;
...@@ -149,11 +149,11 @@ private: ...@@ -149,11 +149,11 @@ private:
PolyNode* GetNextSiblingUp() const; PolyNode* GetNextSiblingUp() const;
void AddChild(PolyNode& child); void AddChild(PolyNode& child);
friend class Clipper; //to access Index friend class Clipper; //to access Index
friend class ClipperOffset; friend class ClipperOffset;
}; };
class PolyTree: public PolyNode class PolyTree: public PolyNode
{ {
public: public:
~PolyTree(){Clear();}; ~PolyTree(){Clear();};
PolyNode* GetFirst() const; PolyNode* GetFirst() const;
...@@ -284,10 +284,10 @@ private: ...@@ -284,10 +284,10 @@ private:
PolyFillType m_ClipFillType; PolyFillType m_ClipFillType;
PolyFillType m_SubjFillType; PolyFillType m_SubjFillType;
bool m_ReverseOutput; bool m_ReverseOutput;
bool m_UsingPolyTree; bool m_UsingPolyTree;
bool m_StrictSimple; bool m_StrictSimple;
#ifdef use_xyz #ifdef use_xyz
TZFillCallback m_ZFill; //custom callback TZFillCallback m_ZFill; //custom callback
#endif #endif
void SetWindingCount(TEdge& edge); void SetWindingCount(TEdge& edge);
bool IsEvenOddFillType(const TEdge& edge) const; bool IsEvenOddFillType(const TEdge& edge) const;
...@@ -347,7 +347,7 @@ private: ...@@ -347,7 +347,7 @@ private:
}; };
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
class ClipperOffset class ClipperOffset
{ {
public: public:
ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25); ClipperOffset(double miterLimit = 2.0, double roundPrecision = 0.25);
......
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