[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: gaf.git: branch: master updated (1.5.0-20080706-261-g816c873)
The branch, master has been updated
via 816c8735215b76faeaa15bfc5de01d345aedc87d (commit)
via aa6b1cf719bc8c31c1763a6160e133e6e3bc46ce (commit)
via 2b5ac5d34a71bfb5f91012ac14bbf2e442858303 (commit)
via cd01bc7d056983beb3957618cdc7557af2d40c8e (commit)
via 9cf8c8ac92c43eb50f2639c576722a287e73017f (commit)
from d99fb5c1cebfed26e027b134ebf2a4c3a0d524bd (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
=========
Summary
=========
.../common/outputs/PCBboard/singlenet-output.net | 41 ++++++++++++++++-
gnetlist/tests/common/outputs/bom2/JD-output.net | 24 +++++-----
.../common/outputs/bom2/JD_Include-output.net | 24 +++++-----
.../outputs/bom2/JD_Include_nomunge-output.net | 24 +++++-----
.../tests/common/outputs/bom2/JD_Sort-output.net | 24 +++++-----
.../common/outputs/bom2/JD_Sort_nomunge-output.net | 24 +++++-----
.../common/outputs/bom2/SlottedOpamps-output.net | 4 +-
.../common/outputs/bom2/TwoStageAmp-output.net | 48 ++++++++++----------
.../outputs/bom2/TwoStageAmp_Include-output.net | 48 ++++++++++----------
.../outputs/bom2/TwoStageAmp_Sort-output.net | 48 ++++++++++----------
.../tests/common/outputs/bom2/cascade-output.net | 18 ++++----
.../common/outputs/bom2/multiequal-output.net | 8 ++--
.../tests/common/outputs/bom2/netattrib-output.net | 10 ++--
.../common/outputs/bom2/powersupply-output.net | 26 +++++-----
.../tests/common/outputs/bom2/singlenet-output.net | 4 +-
.../tests/common/outputs/gsch2pcb/JD-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/JD_Include-output.net | 41 +++++++++++------
.../outputs/gsch2pcb/JD_Include_nomunge-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/JD_Sort-output.net | 41 +++++++++++------
.../outputs/gsch2pcb/JD_Sort_nomunge-output.net | 41 +++++++++++------
.../outputs/gsch2pcb/SlottedOpamps-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/TwoStageAmp-output.net | 41 +++++++++++------
.../gsch2pcb/TwoStageAmp_Include-output.net | 41 +++++++++++------
.../outputs/gsch2pcb/TwoStageAmp_Sort-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/cascade-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/multiequal-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/netattrib-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/powersupply-output.net | 41 +++++++++++------
.../common/outputs/gsch2pcb/singlenet-output.net | 41 +++++++++++------
gschem/include/Makefile.am | 1 +
libgeda/include/prototype_priv.h | 2 +-
libgeda/include/struct.h | 2 +-
libgeda/src/m_basic.c | 2 -
libgeda/src/m_bounds.c | 2 +-
libgeda/src/m_hatch.c | 12 +++---
libgeda/src/m_transform.c | 4 +-
36 files changed, 583 insertions(+), 391 deletions(-)
=================
Commit Messages
=================
commit 816c8735215b76faeaa15bfc5de01d345aedc87d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:13 2008 +0000
Update golden files for gsch2pcb backend
These were out of date since changes were made to make the gsch2pcb
backend to emit boards which fit better with PCB's current default
options and layer stackup.
:100644 100644 5b0eab2... 825885f... M gnetlist/tests/common/outputs/gsch2pcb/JD-output.net
:100644 100644 5b0eab2... 825885f... M gnetlist/tests/common/outputs/gsch2pcb/JD_Include-output.net
:100644 100644 5b0eab2... 825885f... M gnetlist/tests/common/outputs/gsch2pcb/JD_Include_nomunge-output.net
:100644 100644 5b0eab2... 825885f... M gnetlist/tests/common/outputs/gsch2pcb/JD_Sort-output.net
:100644 100644 5b0eab2... 825885f... M gnetlist/tests/common/outputs/gsch2pcb/JD_Sort_nomunge-output.net
:100644 100644 371310a... d8ef4dc... M gnetlist/tests/common/outputs/gsch2pcb/SlottedOpamps-output.net
:100644 100644 4098d3d... b7db44a... M gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp-output.net
:100644 100644 4098d3d... b7db44a... M gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Include-output.net
:100644 100644 4098d3d... b7db44a... M gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Sort-output.net
:100644 100644 e8f8a0a... 0e39df7... M gnetlist/tests/common/outputs/gsch2pcb/cascade-output.net
:100644 100644 89423f3... 497a18d... M gnetlist/tests/common/outputs/gsch2pcb/multiequal-output.net
:100644 100644 bb87af6... a30399d... M gnetlist/tests/common/outputs/gsch2pcb/netattrib-output.net
:100644 100644 28efa25... 42cffb4... M gnetlist/tests/common/outputs/gsch2pcb/powersupply-output.net
:100644 100644 f424bb0... 42b0d58... M gnetlist/tests/common/outputs/gsch2pcb/singlenet-output.net
commit aa6b1cf719bc8c31c1763a6160e133e6e3bc46ce
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
Update golden files for PCBboard backend
The "singlenet" output now emits the PKG_DIP14 package correctly,
whereas the previous golden file just has the M4 macro listed
unexpanded.
Whether some bug was fixed, or if this was just a mistake when the
previous golden files were generated is unknown, but the new output
is better.
:100644 100644 a005bdf... 4081b3d... M gnetlist/tests/common/outputs/PCBboard/singlenet-output.net
commit 2b5ac5d34a71bfb5f91012ac14bbf2e442858303
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
gnetlist: Update golden files for desired BOM2 changes
BOM2 now has a qty column, so update the test-suite to match.
:100644 100644 5c6ad74... 3d13386... M gnetlist/tests/common/outputs/bom2/JD-output.net
:100644 100644 5c6ad74... 3d13386... M gnetlist/tests/common/outputs/bom2/JD_Include-output.net
:100644 100644 5c6ad74... 3d13386... M gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
:100644 100644 5c6ad74... 3d13386... M gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
:100644 100644 5c6ad74... 3d13386... M gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
:100644 100644 a18ba80... 697511e... M gnetlist/tests/common/outputs/bom2/SlottedOpamps-output.net
:100644 100644 ed8994a... 77f6e4f... M gnetlist/tests/common/outputs/bom2/TwoStageAmp-output.net
:100644 100644 ed8994a... 77f6e4f... M gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
:100644 100644 ed8994a... 77f6e4f... M gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
:100644 100644 cce44a9... d7acdf8... M gnetlist/tests/common/outputs/bom2/cascade-output.net
:100644 100644 a559c42... c2a4d43... M gnetlist/tests/common/outputs/bom2/multiequal-output.net
:100644 100644 74759b2... f345f29... M gnetlist/tests/common/outputs/bom2/netattrib-output.net
:100644 100644 6726452... fd66a08... M gnetlist/tests/common/outputs/bom2/powersupply-output.net
:100644 100644 5a90273... 6461dc5... M gnetlist/tests/common/outputs/bom2/singlenet-output.net
commit cd01bc7d056983beb3957618cdc7557af2d40c8e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
gschem: Add missing header file gschem_defines.h to Makefile.am
Missed this when splitting out gschem_defines.h
:100644 100644 8a1b981... ca13ee0... M gschem/include/Makefile.am
commit 9cf8c8ac92c43eb50f2639c576722a287e73017f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
Rename POINT to sPOINT (as used in m_basic.c), to avoid clash on win32.
:100644 100644 f97972e... b60622c... M libgeda/include/prototype_priv.h
:100644 100644 ae09abc... ea46ddb... M libgeda/include/struct.h
:100644 100644 c8cc63f... a1e7c82... M libgeda/src/m_basic.c
:100644 100644 049d64c... fa3c77d... M libgeda/src/m_bounds.c
:100644 100644 0a61e8c... f61e748... M libgeda/src/m_hatch.c
:100644 100644 8c028fd... 260781e... M libgeda/src/m_transform.c
=========
Changes
=========
commit 816c8735215b76faeaa15bfc5de01d345aedc87d
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:13 2008 +0000
Update golden files for gsch2pcb backend
These were out of date since changes were made to make the gsch2pcb
backend to emit boards which fit better with PCB's current default
options and layer stackup.
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/JD-output.net b/gnetlist/tests/common/outputs/gsch2pcb/JD-output.net
index 5b0eab2..825885f 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/JD-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/JD-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,V1,pulse 3.3 0 1u 10p 10p 1.25u 2.5u)
PKG_unknown(unknown,Cm,20p)
PKG_unknown(unknown,A1,unknown)
@@ -16,27 +21,33 @@ PKG_none(none,Vdd,DC 3.3V)
PKG_unknown(unknown,Rlm,500k)
PKG_unknown(unknown,Cp,20p)
PKG_unknown(unknown,Rb,5.6k)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/JD_Include-output.net b/gnetlist/tests/common/outputs/gsch2pcb/JD_Include-output.net
index 5b0eab2..825885f 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/JD_Include-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/JD_Include-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,V1,pulse 3.3 0 1u 10p 10p 1.25u 2.5u)
PKG_unknown(unknown,Cm,20p)
PKG_unknown(unknown,A1,unknown)
@@ -16,27 +21,33 @@ PKG_none(none,Vdd,DC 3.3V)
PKG_unknown(unknown,Rlm,500k)
PKG_unknown(unknown,Cp,20p)
PKG_unknown(unknown,Rb,5.6k)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/JD_Include_nomunge-output.net b/gnetlist/tests/common/outputs/gsch2pcb/JD_Include_nomunge-output.net
index 5b0eab2..825885f 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/JD_Include_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/JD_Include_nomunge-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,V1,pulse 3.3 0 1u 10p 10p 1.25u 2.5u)
PKG_unknown(unknown,Cm,20p)
PKG_unknown(unknown,A1,unknown)
@@ -16,27 +21,33 @@ PKG_none(none,Vdd,DC 3.3V)
PKG_unknown(unknown,Rlm,500k)
PKG_unknown(unknown,Cp,20p)
PKG_unknown(unknown,Rb,5.6k)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort-output.net b/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort-output.net
index 5b0eab2..825885f 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,V1,pulse 3.3 0 1u 10p 10p 1.25u 2.5u)
PKG_unknown(unknown,Cm,20p)
PKG_unknown(unknown,A1,unknown)
@@ -16,27 +21,33 @@ PKG_none(none,Vdd,DC 3.3V)
PKG_unknown(unknown,Rlm,500k)
PKG_unknown(unknown,Cp,20p)
PKG_unknown(unknown,Rb,5.6k)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort_nomunge-output.net b/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort_nomunge-output.net
index 5b0eab2..825885f 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/JD_Sort_nomunge-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,V1,pulse 3.3 0 1u 10p 10p 1.25u 2.5u)
PKG_unknown(unknown,Cm,20p)
PKG_unknown(unknown,A1,unknown)
@@ -16,27 +21,33 @@ PKG_none(none,Vdd,DC 3.3V)
PKG_unknown(unknown,Rlm,500k)
PKG_unknown(unknown,Cp,20p)
PKG_unknown(unknown,Rb,5.6k)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/SlottedOpamps-output.net b/gnetlist/tests/common/outputs/gsch2pcb/SlottedOpamps-output.net
index 371310a..d8ef4dc 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/SlottedOpamps-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/SlottedOpamps-output.net
@@ -1,32 +1,43 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_unknown(unknown,U1,unknown)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp-output.net b/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp-output.net
index 4098d3d..b7db44a 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_unknown(unknown,Cout,2.2uF)
PKG_unknown(unknown,R5,10)
PKG_unknown(unknown,R4,2.8K)
@@ -28,27 +33,33 @@ PKG_none(none,VCC,DC 15V)
PKG_unknown(unknown,RC2,1K)
PKG_unknown(unknown,RC1,3.3K)
PKG_unknown(unknown,RL,100K)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Include-output.net b/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Include-output.net
index 4098d3d..b7db44a 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Include-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Include-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_unknown(unknown,Cout,2.2uF)
PKG_unknown(unknown,R5,10)
PKG_unknown(unknown,R4,2.8K)
@@ -28,27 +33,33 @@ PKG_none(none,VCC,DC 15V)
PKG_unknown(unknown,RC2,1K)
PKG_unknown(unknown,RC1,3.3K)
PKG_unknown(unknown,RL,100K)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Sort-output.net b/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Sort-output.net
index 4098d3d..b7db44a 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Sort-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/TwoStageAmp_Sort-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_unknown(unknown,Cout,2.2uF)
PKG_unknown(unknown,R5,10)
PKG_unknown(unknown,R4,2.8K)
@@ -28,27 +33,33 @@ PKG_none(none,VCC,DC 15V)
PKG_unknown(unknown,RC2,1K)
PKG_unknown(unknown,RC1,3.3K)
PKG_unknown(unknown,RL,100K)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/cascade-output.net b/gnetlist/tests/common/outputs/gsch2pcb/cascade-output.net
index e8f8a0a..0e39df7 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/cascade-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/cascade-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,AMP2,unknown)
PKG_none(none,AMP1,unknown)
PKG_none(none,SOURCE,unknown)
@@ -13,27 +18,33 @@ PKG_none(none,MX1,unknown)
PKG_none(none,DEF1,unknown)
PKG_none(none,T1,unknown)
PKG_none(none,FL1,unknown)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/multiequal-output.net b/gnetlist/tests/common/outputs/gsch2pcb/multiequal-output.net
index 89423f3..497a18d 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/multiequal-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/multiequal-output.net
@@ -1,34 +1,45 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_none(none,V1,DC 1V)
PKG_unknown(unknown,A1,abotol=1e-11)
PKG_unknown(unknown,R1,20)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/netattrib-output.net b/gnetlist/tests/common/outputs/gsch2pcb/netattrib-output.net
index bb87af6..a30399d 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/netattrib-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/netattrib-output.net
@@ -1,35 +1,46 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_unknown(unknown,F1,unknown)
PKG_DIP14(DIP14,U100,unknown)
PKG_DIP14(DIP14,U300,unknown)
PKG_DIP14(DIP14,U200,unknown)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/powersupply-output.net b/gnetlist/tests/common/outputs/gsch2pcb/powersupply-output.net
index 28efa25..42cffb4 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/powersupply-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/powersupply-output.net
@@ -1,10 +1,15 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_unknown(unknown,F1,unknown)
PKG_unknown(unknown,R2,220)
PKG_unknown(unknown,CONN1,unknown)
@@ -17,27 +22,33 @@ PKG_unknown(unknown,C1,2200uF)
PKG_unknown(unknown,T1,unknown)
PKG_unknown(unknown,U2,unknown)
PKG_unknown(unknown,U1,unknown)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
diff --git a/gnetlist/tests/common/outputs/gsch2pcb/singlenet-output.net b/gnetlist/tests/common/outputs/gsch2pcb/singlenet-output.net
index f424bb0..42b0d58 100644
--- a/gnetlist/tests/common/outputs/gsch2pcb/singlenet-output.net
+++ b/gnetlist/tests/common/outputs/gsch2pcb/singlenet-output.net
@@ -1,32 +1,43 @@
-# release: pcb 1.6.3
-PCB("" 6000 5000)
-Grid(10 0 0)
-Cursor(0 0 3)
-Flags(0x000000d0)
-Groups("1,2,3,s:4,5,6,c:7:8:")
-Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
+# release: pcb 1.99x
+# To read pcb files, the pcb version (or the cvs source date) must be >= the file version
+FileVersion[20070407]
+PCB["" 600000 500000]
+Grid[10000.000000 0 0 0]
+Cursor[0 0 0.000000]
+PolyArea[200000000.000000]
+Thermal[0.500000]
+DRC[1000 1000 1000 1000 1500 1000]
+Flags("nameonpcb,uniquename,clearnew,snappin")
+Groups("1,c:2,s:3:4:5:6:7:8")
+Styles["Signal,1000,3600,2000,1000:Power,2500,6000,3500,1000:Fat,4000,6000,3500,1000:Skinny,600,2402,1181,600"]
PKG_DIP14(DIP14,U100,unknown)
-Layer(1 "solder")
+Layer(1 "component")
(
)
-Layer(2 "GND-sldr")
+Layer(2 "solder")
(
)
-Layer(3 "Vcc-sldr")
+Layer(3 "outline")
(
)
-Layer(4 "component")
+Layer(4 "GND")
(
)
-Layer(5 "GND-comp")
+Layer(5 "power")
(
)
-Layer(6 "Vcc-comp")
+Layer(6 "signal1")
(
)
-Layer(7 "unused")
+Layer(7 "signal2")
(
)
-Layer(8 "unused")
+Layer(8 "signal3")
+(
+)
+Layer(9 "silk")
+(
+)
+Layer(10 "silk")
(
)
commit aa6b1cf719bc8c31c1763a6160e133e6e3bc46ce
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
Update golden files for PCBboard backend
The "singlenet" output now emits the PKG_DIP14 package correctly,
whereas the previous golden file just has the M4 macro listed
unexpanded.
Whether some bug was fixed, or if this was just a mistake when the
previous golden files were generated is unknown, but the new output
is better.
diff --git a/gnetlist/tests/common/outputs/PCBboard/singlenet-output.net b/gnetlist/tests/common/outputs/PCBboard/singlenet-output.net
index a005bdf..4081b3d 100644
--- a/gnetlist/tests/common/outputs/PCBboard/singlenet-output.net
+++ b/gnetlist/tests/common/outputs/PCBboard/singlenet-output.net
@@ -5,7 +5,46 @@ Cursor(10 270 3)
Flags(0x000000d0)
Groups("1,2,3,s:4,5,6,c:7:8:")
Styles("Signal,10,40,20:Power,25,60,35:Fat,40,60,35:Skinny,8,36,20")
-PKG_DIP14(7400,U100,unknown)
+
+# retain backwards compatibility to older versions of PKG_DIL
+# which did not have 100,60,28 args
+
+
+
+
+
+
+
+
+
+
+
+Element(0x00 "7400" "U100" "unknown" 220 100 3 100 0x00)
+(
+ Pin(50 50 60 28 "1" 0x101)
+ Pin(50 150 60 28 "2" 0x01)
+ Pin(50 250 60 28 "3" 0x01)
+ Pin(50 350 60 28 "4" 0x01)
+ Pin(50 450 60 28 "5" 0x01)
+ Pin(50 550 60 28 "6" 0x01)
+ Pin(50 650 60 28 "7" 0x01)
+
+ Pin(350 650 60 28 "8" 0x01)
+ Pin(350 550 60 28 "9" 0x01)
+ Pin(350 450 60 28 "10" 0x01)
+ Pin(350 350 60 28 "11" 0x01)
+ Pin(350 250 60 28 "12" 0x01)
+ Pin(350 150 60 28 "13" 0x01)
+ Pin(350 50 60 28 "14" 0x01)
+
+ ElementLine(0 0 0 700 10)
+ ElementLine(0 700 400 700 10)
+ ElementLine(400 700 400 0 10)
+ ElementLine(0 0 150 0 10)
+ ElementLine(250 0 400 0 10)
+ ElementArc(200 0 50 50 0 180 10)
+ Mark(50 50)
+)
Layer(1 "solder")
(
)
commit 2b5ac5d34a71bfb5f91012ac14bbf2e442858303
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
gnetlist: Update golden files for desired BOM2 changes
BOM2 now has a qty column, so update the test-suite to match.
diff --git a/gnetlist/tests/common/outputs/bom2/JD-output.net b/gnetlist/tests/common/outputs/bom2/JD-output.net
index 5c6ad74..3d13386 100644
--- a/gnetlist/tests/common/outputs/bom2/JD-output.net
+++ b/gnetlist/tests/common/outputs/bom2/JD-output.net
@@ -1,12 +1,12 @@
-refdes:refdes:value:device
-Rb:Rb:5.6k:RESISTOR
-Cp:Cp:20p:CAPACITOR
-Rlm:Rlm:500k:RESISTOR
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE
-Rlp:Rlp:1meg:RESISTOR
-X1:X1:unknown:LVD
-M1:M1:unknown:PMOS_TRANSISTOR
-Rt:Rt:1k:RESISTOR
-A1:A1:unknown:model
-Cm:Cm:20p:CAPACITOR
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse
+refdes:refdes:value:device:qty
+Rb:Rb:5.6k:RESISTOR:1
+Cp:Cp:20p:CAPACITOR:1
+Rlm:Rlm:500k:RESISTOR:1
+Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
+Rlp:Rlp:1meg:RESISTOR:1
+X1:X1:unknown:LVD:1
+M1:M1:unknown:PMOS_TRANSISTOR:1
+Rt:Rt:1k:RESISTOR:1
+A1:A1:unknown:model:1
+Cm:Cm:20p:CAPACITOR:1
+V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Include-output.net b/gnetlist/tests/common/outputs/bom2/JD_Include-output.net
index 5c6ad74..3d13386 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Include-output.net
+++ b/gnetlist/tests/common/outputs/bom2/JD_Include-output.net
@@ -1,12 +1,12 @@
-refdes:refdes:value:device
-Rb:Rb:5.6k:RESISTOR
-Cp:Cp:20p:CAPACITOR
-Rlm:Rlm:500k:RESISTOR
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE
-Rlp:Rlp:1meg:RESISTOR
-X1:X1:unknown:LVD
-M1:M1:unknown:PMOS_TRANSISTOR
-Rt:Rt:1k:RESISTOR
-A1:A1:unknown:model
-Cm:Cm:20p:CAPACITOR
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse
+refdes:refdes:value:device:qty
+Rb:Rb:5.6k:RESISTOR:1
+Cp:Cp:20p:CAPACITOR:1
+Rlm:Rlm:500k:RESISTOR:1
+Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
+Rlp:Rlp:1meg:RESISTOR:1
+X1:X1:unknown:LVD:1
+M1:M1:unknown:PMOS_TRANSISTOR:1
+Rt:Rt:1k:RESISTOR:1
+A1:A1:unknown:model:1
+Cm:Cm:20p:CAPACITOR:1
+V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net b/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
index 5c6ad74..3d13386 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/bom2/JD_Include_nomunge-output.net
@@ -1,12 +1,12 @@
-refdes:refdes:value:device
-Rb:Rb:5.6k:RESISTOR
-Cp:Cp:20p:CAPACITOR
-Rlm:Rlm:500k:RESISTOR
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE
-Rlp:Rlp:1meg:RESISTOR
-X1:X1:unknown:LVD
-M1:M1:unknown:PMOS_TRANSISTOR
-Rt:Rt:1k:RESISTOR
-A1:A1:unknown:model
-Cm:Cm:20p:CAPACITOR
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse
+refdes:refdes:value:device:qty
+Rb:Rb:5.6k:RESISTOR:1
+Cp:Cp:20p:CAPACITOR:1
+Rlm:Rlm:500k:RESISTOR:1
+Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
+Rlp:Rlp:1meg:RESISTOR:1
+X1:X1:unknown:LVD:1
+M1:M1:unknown:PMOS_TRANSISTOR:1
+Rt:Rt:1k:RESISTOR:1
+A1:A1:unknown:model:1
+Cm:Cm:20p:CAPACITOR:1
+V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Sort-output.net b/gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
index 5c6ad74..3d13386 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
+++ b/gnetlist/tests/common/outputs/bom2/JD_Sort-output.net
@@ -1,12 +1,12 @@
-refdes:refdes:value:device
-Rb:Rb:5.6k:RESISTOR
-Cp:Cp:20p:CAPACITOR
-Rlm:Rlm:500k:RESISTOR
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE
-Rlp:Rlp:1meg:RESISTOR
-X1:X1:unknown:LVD
-M1:M1:unknown:PMOS_TRANSISTOR
-Rt:Rt:1k:RESISTOR
-A1:A1:unknown:model
-Cm:Cm:20p:CAPACITOR
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse
+refdes:refdes:value:device:qty
+Rb:Rb:5.6k:RESISTOR:1
+Cp:Cp:20p:CAPACITOR:1
+Rlm:Rlm:500k:RESISTOR:1
+Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
+Rlp:Rlp:1meg:RESISTOR:1
+X1:X1:unknown:LVD:1
+M1:M1:unknown:PMOS_TRANSISTOR:1
+Rt:Rt:1k:RESISTOR:1
+A1:A1:unknown:model:1
+Cm:Cm:20p:CAPACITOR:1
+V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
diff --git a/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net b/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
index 5c6ad74..3d13386 100644
--- a/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
+++ b/gnetlist/tests/common/outputs/bom2/JD_Sort_nomunge-output.net
@@ -1,12 +1,12 @@
-refdes:refdes:value:device
-Rb:Rb:5.6k:RESISTOR
-Cp:Cp:20p:CAPACITOR
-Rlm:Rlm:500k:RESISTOR
-Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE
-Rlp:Rlp:1meg:RESISTOR
-X1:X1:unknown:LVD
-M1:M1:unknown:PMOS_TRANSISTOR
-Rt:Rt:1k:RESISTOR
-A1:A1:unknown:model
-Cm:Cm:20p:CAPACITOR
-V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse
+refdes:refdes:value:device:qty
+Rb:Rb:5.6k:RESISTOR:1
+Cp:Cp:20p:CAPACITOR:1
+Rlm:Rlm:500k:RESISTOR:1
+Vdd:Vdd:DC 3.3V:VOLTAGE_SOURCE:1
+Rlp:Rlp:1meg:RESISTOR:1
+X1:X1:unknown:LVD:1
+M1:M1:unknown:PMOS_TRANSISTOR:1
+Rt:Rt:1k:RESISTOR:1
+A1:A1:unknown:model:1
+Cm:Cm:20p:CAPACITOR:1
+V1:V1:pulse 3.3 0 1u 10p 10p 1.25u 2.5u:vpulse:1
diff --git a/gnetlist/tests/common/outputs/bom2/SlottedOpamps-output.net b/gnetlist/tests/common/outputs/bom2/SlottedOpamps-output.net
index a18ba80..697511e 100644
--- a/gnetlist/tests/common/outputs/bom2/SlottedOpamps-output.net
+++ b/gnetlist/tests/common/outputs/bom2/SlottedOpamps-output.net
@@ -1,2 +1,2 @@
-refdes:refdes:value:device
-U1:U1:unknown:LM324
+refdes:refdes:value:device:qty
+U1:U1:unknown:LM324:1
diff --git a/gnetlist/tests/common/outputs/bom2/TwoStageAmp-output.net b/gnetlist/tests/common/outputs/bom2/TwoStageAmp-output.net
index ed8994a..77f6e4f 100644
--- a/gnetlist/tests/common/outputs/bom2/TwoStageAmp-output.net
+++ b/gnetlist/tests/common/outputs/bom2/TwoStageAmp-output.net
@@ -1,24 +1,24 @@
-refdes:refdes:value:device
-RL:RL:100K:RESISTOR
-RC1:RC1:3.3K:RESISTOR
-RC2:RC2:1K:RESISTOR
-VCC:VCC:DC 15V:VOLTAGE_SOURCE
-R8:R8:1:RESISTOR
-CE1:CE1:1pF:CAPACITOR
-C1:C1:2.2uF:CAPACITOR
-CE2:CE2:1pF:CAPACITOR
-C2:C2:2.2uF:CAPACITOR
-R1:R1:28K:RESISTOR
-Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin
-R2:R2:2K:RESISTOR
-A1:A1:unknown:model
-Q1:Q1:unknown:NPN_TRANSISTOR
-RE1:RE1:100:RESISTOR
-A2:A2:unknown:include
-R3:R3:28K:RESISTOR
-A3:A3:.options TEMP=25:directive
-Q2:Q2:unknown:NPN_TRANSISTOR
-RE2:RE2:100:RESISTOR
-R4:R4:2.8K:RESISTOR
-R5:R5:10:RESISTOR
-Cout:Cout:2.2uF:CAPACITOR
+refdes:refdes:value:device:qty
+RL:RL:100K:RESISTOR:1
+RC1:RC1:3.3K:RESISTOR:1
+RC2:RC2:1K:RESISTOR:1
+VCC:VCC:DC 15V:VOLTAGE_SOURCE:1
+R8:R8:1:RESISTOR:1
+CE1:CE1:1pF:CAPACITOR:1
+C1:C1:2.2uF:CAPACITOR:1
+CE2:CE2:1pF:CAPACITOR:1
+C2:C2:2.2uF:CAPACITOR:1
+R1:R1:28K:RESISTOR:1
+Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin:1
+R2:R2:2K:RESISTOR:1
+A1:A1:unknown:model:1
+Q1:Q1:unknown:NPN_TRANSISTOR:1
+RE1:RE1:100:RESISTOR:1
+A2:A2:unknown:include:1
+R3:R3:28K:RESISTOR:1
+A3:A3:.options TEMP=25:directive:1
+Q2:Q2:unknown:NPN_TRANSISTOR:1
+RE2:RE2:100:RESISTOR:1
+R4:R4:2.8K:RESISTOR:1
+R5:R5:10:RESISTOR:1
+Cout:Cout:2.2uF:CAPACITOR:1
diff --git a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
index ed8994a..77f6e4f 100644
--- a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
+++ b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Include-output.net
@@ -1,24 +1,24 @@
-refdes:refdes:value:device
-RL:RL:100K:RESISTOR
-RC1:RC1:3.3K:RESISTOR
-RC2:RC2:1K:RESISTOR
-VCC:VCC:DC 15V:VOLTAGE_SOURCE
-R8:R8:1:RESISTOR
-CE1:CE1:1pF:CAPACITOR
-C1:C1:2.2uF:CAPACITOR
-CE2:CE2:1pF:CAPACITOR
-C2:C2:2.2uF:CAPACITOR
-R1:R1:28K:RESISTOR
-Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin
-R2:R2:2K:RESISTOR
-A1:A1:unknown:model
-Q1:Q1:unknown:NPN_TRANSISTOR
-RE1:RE1:100:RESISTOR
-A2:A2:unknown:include
-R3:R3:28K:RESISTOR
-A3:A3:.options TEMP=25:directive
-Q2:Q2:unknown:NPN_TRANSISTOR
-RE2:RE2:100:RESISTOR
-R4:R4:2.8K:RESISTOR
-R5:R5:10:RESISTOR
-Cout:Cout:2.2uF:CAPACITOR
+refdes:refdes:value:device:qty
+RL:RL:100K:RESISTOR:1
+RC1:RC1:3.3K:RESISTOR:1
+RC2:RC2:1K:RESISTOR:1
+VCC:VCC:DC 15V:VOLTAGE_SOURCE:1
+R8:R8:1:RESISTOR:1
+CE1:CE1:1pF:CAPACITOR:1
+C1:C1:2.2uF:CAPACITOR:1
+CE2:CE2:1pF:CAPACITOR:1
+C2:C2:2.2uF:CAPACITOR:1
+R1:R1:28K:RESISTOR:1
+Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin:1
+R2:R2:2K:RESISTOR:1
+A1:A1:unknown:model:1
+Q1:Q1:unknown:NPN_TRANSISTOR:1
+RE1:RE1:100:RESISTOR:1
+A2:A2:unknown:include:1
+R3:R3:28K:RESISTOR:1
+A3:A3:.options TEMP=25:directive:1
+Q2:Q2:unknown:NPN_TRANSISTOR:1
+RE2:RE2:100:RESISTOR:1
+R4:R4:2.8K:RESISTOR:1
+R5:R5:10:RESISTOR:1
+Cout:Cout:2.2uF:CAPACITOR:1
diff --git a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
index ed8994a..77f6e4f 100644
--- a/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
+++ b/gnetlist/tests/common/outputs/bom2/TwoStageAmp_Sort-output.net
@@ -1,24 +1,24 @@
-refdes:refdes:value:device
-RL:RL:100K:RESISTOR
-RC1:RC1:3.3K:RESISTOR
-RC2:RC2:1K:RESISTOR
-VCC:VCC:DC 15V:VOLTAGE_SOURCE
-R8:R8:1:RESISTOR
-CE1:CE1:1pF:CAPACITOR
-C1:C1:2.2uF:CAPACITOR
-CE2:CE2:1pF:CAPACITOR
-C2:C2:2.2uF:CAPACITOR
-R1:R1:28K:RESISTOR
-Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin
-R2:R2:2K:RESISTOR
-A1:A1:unknown:model
-Q1:Q1:unknown:NPN_TRANSISTOR
-RE1:RE1:100:RESISTOR
-A2:A2:unknown:include
-R3:R3:28K:RESISTOR
-A3:A3:.options TEMP=25:directive
-Q2:Q2:unknown:NPN_TRANSISTOR
-RE2:RE2:100:RESISTOR
-R4:R4:2.8K:RESISTOR
-R5:R5:10:RESISTOR
-Cout:Cout:2.2uF:CAPACITOR
+refdes:refdes:value:device:qty
+RL:RL:100K:RESISTOR:1
+RC1:RC1:3.3K:RESISTOR:1
+RC2:RC2:1K:RESISTOR:1
+VCC:VCC:DC 15V:VOLTAGE_SOURCE:1
+R8:R8:1:RESISTOR:1
+CE1:CE1:1pF:CAPACITOR:1
+C1:C1:2.2uF:CAPACITOR:1
+CE2:CE2:1pF:CAPACITOR:1
+C2:C2:2.2uF:CAPACITOR:1
+R1:R1:28K:RESISTOR:1
+Vinput:Vinput:DC 1.6V AC 10MV SIN(0 1MV 1KHZ):vsin:1
+R2:R2:2K:RESISTOR:1
+A1:A1:unknown:model:1
+Q1:Q1:unknown:NPN_TRANSISTOR:1
+RE1:RE1:100:RESISTOR:1
+A2:A2:unknown:include:1
+R3:R3:28K:RESISTOR:1
+A3:A3:.options TEMP=25:directive:1
+Q2:Q2:unknown:NPN_TRANSISTOR:1
+RE2:RE2:100:RESISTOR:1
+R4:R4:2.8K:RESISTOR:1
+R5:R5:10:RESISTOR:1
+Cout:Cout:2.2uF:CAPACITOR:1
diff --git a/gnetlist/tests/common/outputs/bom2/cascade-output.net b/gnetlist/tests/common/outputs/bom2/cascade-output.net
index cce44a9..d7acdf8 100644
--- a/gnetlist/tests/common/outputs/bom2/cascade-output.net
+++ b/gnetlist/tests/common/outputs/bom2/cascade-output.net
@@ -1,9 +1,9 @@
-refdes:refdes:value:device
-FL1:FL1:unknown:cascade-filter
-T1:T1:unknown:cascade-transformer
-DEF1:DEF1:unknown:cascade-defaults
-MX1:MX1:unknown:cascade-mixer
-DEFAULTS:DEFAULTS:unknown:cascade-defaults-top
-SOURCE:SOURCE:unknown:cascade-source
-AMP1:AMP1:unknown:cascade-amp
-AMP2:AMP2:unknown:cascade-amp
+refdes:refdes:value:device:qty
+FL1:FL1:unknown:cascade-filter:1
+T1:T1:unknown:cascade-transformer:1
+DEF1:DEF1:unknown:cascade-defaults:1
+MX1:MX1:unknown:cascade-mixer:1
+DEFAULTS:DEFAULTS:unknown:cascade-defaults-top:1
+SOURCE:SOURCE:unknown:cascade-source:1
+AMP1:AMP1:unknown:cascade-amp:1
+AMP2:AMP2:unknown:cascade-amp:1
diff --git a/gnetlist/tests/common/outputs/bom2/multiequal-output.net b/gnetlist/tests/common/outputs/bom2/multiequal-output.net
index a559c42..c2a4d43 100644
--- a/gnetlist/tests/common/outputs/bom2/multiequal-output.net
+++ b/gnetlist/tests/common/outputs/bom2/multiequal-output.net
@@ -1,4 +1,4 @@
-refdes:refdes:value:device
-R1:R1:20:RESISTOR
-A1:A1:abotol=1e-11:options
-V1:V1:DC 1V:VOLTAGE_SOURCE
+refdes:refdes:value:device:qty
+R1:R1:20:RESISTOR:1
+A1:A1:abotol=1e-11:options:1
+V1:V1:DC 1V:VOLTAGE_SOURCE:1
diff --git a/gnetlist/tests/common/outputs/bom2/netattrib-output.net b/gnetlist/tests/common/outputs/bom2/netattrib-output.net
index 74759b2..f345f29 100644
--- a/gnetlist/tests/common/outputs/bom2/netattrib-output.net
+++ b/gnetlist/tests/common/outputs/bom2/netattrib-output.net
@@ -1,5 +1,5 @@
-refdes:refdes:value:device
-U200:U200:unknown:7404
-U300:U300:unknown:7404
-U100:U100:unknown:7400
-F1:F1:unknown:FUSE
+refdes:refdes:value:device:qty
+U200:U200:unknown:7404:1
+U300:U300:unknown:7404:1
+U100:U100:unknown:7400:1
+F1:F1:unknown:FUSE:1
diff --git a/gnetlist/tests/common/outputs/bom2/powersupply-output.net b/gnetlist/tests/common/outputs/bom2/powersupply-output.net
index 6726452..fd66a08 100644
--- a/gnetlist/tests/common/outputs/bom2/powersupply-output.net
+++ b/gnetlist/tests/common/outputs/bom2/powersupply-output.net
@@ -1,13 +1,13 @@
-refdes:refdes:value:device
-U1:U1:unknown:DIODE-BRIDGE
-U2:U2:unknown:LM317
-T1:T1:unknown:transformer
-C1:C1:2200uF:POLARIZED_CAPACITOR
-S1:S1:unknown:SPST
-C2:C2:0.1uF:POLARIZED_CAPACITOR
-C3:C3:22uF:POLARIZED_CAPACITOR
-R1:R1:5k:VARIABLE_RESISTOR
-C4:C4:1uf:POLARIZED_CAPACITOR
-CONN1:CONN1:unknown:MAINS_CONNECTOR
-R2:R2:220:RESISTOR
-F1:F1:unknown:FUSE
+refdes:refdes:value:device:qty
+U1:U1:unknown:DIODE-BRIDGE:1
+U2:U2:unknown:LM317:1
+T1:T1:unknown:transformer:1
+C1:C1:2200uF:POLARIZED_CAPACITOR:1
+S1:S1:unknown:SPST:1
+C2:C2:0.1uF:POLARIZED_CAPACITOR:1
+C3:C3:22uF:POLARIZED_CAPACITOR:1
+R1:R1:5k:VARIABLE_RESISTOR:1
+C4:C4:1uf:POLARIZED_CAPACITOR:1
+CONN1:CONN1:unknown:MAINS_CONNECTOR:1
+R2:R2:220:RESISTOR:1
+F1:F1:unknown:FUSE:1
diff --git a/gnetlist/tests/common/outputs/bom2/singlenet-output.net b/gnetlist/tests/common/outputs/bom2/singlenet-output.net
index 5a90273..6461dc5 100644
--- a/gnetlist/tests/common/outputs/bom2/singlenet-output.net
+++ b/gnetlist/tests/common/outputs/bom2/singlenet-output.net
@@ -1,2 +1,2 @@
-refdes:refdes:value:device
-U100:U100:unknown:7400
+refdes:refdes:value:device:qty
+U100:U100:unknown:7400:1
commit cd01bc7d056983beb3957618cdc7557af2d40c8e
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
gschem: Add missing header file gschem_defines.h to Makefile.am
Missed this when splitting out gschem_defines.h
diff --git a/gschem/include/Makefile.am b/gschem/include/Makefile.am
index 8a1b981..ca13ee0 100644
--- a/gschem/include/Makefile.am
+++ b/gschem/include/Makefile.am
@@ -8,6 +8,7 @@ noinst_HEADERS = \
x_compselect.h \
x_log.h x_multiattrib.h x_pagesel.h x_print.h x_preview.h \
gschem.h \
+ gschem_defines.h \
gschem_dialog.h \
gschem_struct.h
commit 9cf8c8ac92c43eb50f2639c576722a287e73017f
Author: Peter Clifton <pcjc2@xxxxxxxxx>
Date: Sun Oct 26 20:07:12 2008 +0000
Rename POINT to sPOINT (as used in m_basic.c), to avoid clash on win32.
diff --git a/libgeda/include/prototype_priv.h b/libgeda/include/prototype_priv.h
index f97972e..b60622c 100644
--- a/libgeda/include/prototype_priv.h
+++ b/libgeda/include/prototype_priv.h
@@ -53,7 +53,7 @@ SCM g_get_page_filename(SCM page_smob);
/* m_bounds.c */
void m_bounds_init(BOUNDS *bounds);
-void m_bounds_of_points(BOUNDS *bounds, POINT points[], gint count);
+void m_bounds_of_points(BOUNDS *bounds, sPOINT points[], gint count);
/* m_hatch.c */
void m_hatch_box(BOX *box, gint angle, gint pitch, GArray *lines);
diff --git a/libgeda/include/struct.h b/libgeda/include/struct.h
index ae09abc..ea46ddb 100644
--- a/libgeda/include/struct.h
+++ b/libgeda/include/struct.h
@@ -36,7 +36,7 @@ typedef struct st_arc ARC;
typedef struct st_box BOX;
typedef struct st_picture PICTURE;
typedef struct st_text TEXT;
-typedef struct st_point POINT;
+typedef struct st_point sPOINT;
typedef struct st_transform TRANSFORM;
typedef struct st_object OBJECT;
diff --git a/libgeda/src/m_basic.c b/libgeda/src/m_basic.c
index c8cc63f..a1e7c82 100644
--- a/libgeda/src/m_basic.c
+++ b/libgeda/src/m_basic.c
@@ -361,8 +361,6 @@ int on_snap(int val)
/*! \brief */
typedef struct st_halfspace HALFSPACE;
-/*! \brief */
-typedef struct st_point sPOINT;
/*! \brief */
struct st_halfspace {
diff --git a/libgeda/src/m_bounds.c b/libgeda/src/m_bounds.c
index 049d64c..fa3c77d 100644
--- a/libgeda/src/m_bounds.c
+++ b/libgeda/src/m_bounds.c
@@ -44,7 +44,7 @@ void m_bounds_init(BOUNDS *bounds)
* zero, this parameter must not be NULL.
* \param count [in] The number of points in the set.
*/
-void m_bounds_of_points(BOUNDS *bounds, POINT points[], gint count)
+void m_bounds_of_points(BOUNDS *bounds, sPOINT points[], gint count)
{
gint index;
diff --git a/libgeda/src/m_hatch.c b/libgeda/src/m_hatch.c
index 0a61e8c..f61e748 100644
--- a/libgeda/src/m_hatch.c
+++ b/libgeda/src/m_hatch.c
@@ -115,12 +115,12 @@ static gint compare_status(gconstpointer a, gconstpointer b)
void m_hatch_box(BOX *box, gint angle, gint pitch, GArray *lines)
{
GArray *corners;
- POINT point;
+ sPOINT point;
g_return_if_fail(box!=NULL);
g_return_if_fail(lines!=NULL);
- corners = g_array_sized_new(FALSE, FALSE, sizeof(POINT), 4);
+ corners = g_array_sized_new(FALSE, FALSE, sizeof(sPOINT), 4);
point.x = box->upper_x;
point.y = box->upper_y;
@@ -220,7 +220,7 @@ void m_hatch_polygon(GArray *points, gint angle, gint pitch, GArray *lines)
g_return_if_fail(lines!=NULL);
events = g_array_new(FALSE, FALSE, sizeof(SWEEP_EVENT));
- points2 = g_array_sized_new(FALSE, FALSE, sizeof(POINT), points->len);
+ points2 = g_array_sized_new(FALSE, FALSE, sizeof(sPOINT), points->len);
status = g_array_new(FALSE, FALSE, sizeof(SWEEP_STATUS));
m_transform_init(&transform);
@@ -234,9 +234,9 @@ void m_hatch_polygon(GArray *points, gint angle, gint pitch, GArray *lines)
/* build list of sweep events */
if ( points2->len > 1 ) {
gint index;
- POINT *p0 = &g_array_index(points2, POINT, points2->len-1);
+ sPOINT *p0 = &g_array_index(points2, sPOINT, points2->len-1);
for (index=0; index<points2->len; index++) {
- POINT *p1 = &g_array_index(points2, POINT, index);
+ sPOINT *p1 = &g_array_index(points2, sPOINT, index);
if ( p0->y != p1->y ) {
SWEEP_EVENT event;
event.y0 = min(p0->y, p1->y);
@@ -252,7 +252,7 @@ void m_hatch_polygon(GArray *points, gint angle, gint pitch, GArray *lines)
/* sort sweep events in ascending order by starting y coordinate */
g_array_sort(events, compare_events);
- m_bounds_of_points(&bounds, (POINT*)points2->data, points2->len);
+ m_bounds_of_points(&bounds, (sPOINT*)points2->data, points2->len);
sweep_y = calculate_initial_sweep(10 * pitch, bounds.min_y, bounds.max_y);
while ( events->len > 0 || status->len > 0 ) {
diff --git a/libgeda/src/m_transform.c b/libgeda/src/m_transform.c
index 8c028fd..260781e 100644
--- a/libgeda/src/m_transform.c
+++ b/libgeda/src/m_transform.c
@@ -139,7 +139,7 @@ void m_transform_point(TRANSFORM *transform, gint *x, gint *y)
/** \brief Transforms a polyline or polygon
*
* \param transform [in] The transform function.
- * \param line [inout] The GArray of POINT to transform.
+ * \param line [inout] The GArray of sPOINT to transform.
*/
void m_transform_points(TRANSFORM *transform, GArray *points)
{
@@ -149,7 +149,7 @@ void m_transform_points(TRANSFORM *transform, GArray *points)
g_return_if_fail(points!=NULL);
for (index=0; index<points->len; index++) {
- POINT *point = &g_array_index(points, POINT, index);
+ sPOINT *point = &g_array_index(points, sPOINT, index);
m_transform_point(transform, &(point->x), &(point->y));
}
}
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs