[Author Prev][Author Next][Thread Prev][Thread Next][Author Index][Thread Index]
gEDA-cvs: branch: master updated (1.4.0-20080127-87-gfaa7917)
The branch, master has been updated
via faa7917f687694937baee932ea2efaa6fd16fd26 (commit)
via 234bb645ae97eb11f3ea04fadde107bc9865abf6 (commit)
from 016cd29c2d4cb540f70f01c14059b0d538b801d6 (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
=========
utils/examples/tragesym/test2.src | 2 +-
utils/scripts/tragesym | 20 +++++++++++---------
2 files changed, 12 insertions(+), 10 deletions(-)
=================
Commit Messages
=================
commit faa7917f687694937baee932ea2efaa6fd16fd26
Author: Werner Hoch <werner.ho@xxxxxx>
Date: Thu May 22 18:56:47 2008 +0200
tragesym: improved text alignment of top/bottom pin numbers. Version 0.0.14
The origin of the top and bottom pin numbers and pin sequence did not have
the same relativ position to the pin compared to the left and right pin.
Fixed this relativ positions and the text alignments.
This cosmetic issue was reported by Stefan Salewski. [1945153]
:100755 100755 0f258fe... 267a057... M utils/scripts/tragesym
commit 234bb645ae97eb11f3ea04fadde107bc9865abf6
Author: Werner Hoch <werner.ho@xxxxxx>
Date: Thu May 22 18:36:15 2008 +0200
tragesym: fixed version string handling
With the commit 5a35c238f19622f8045784fa61497c80c4144fa6 a trailing " 1"
was added to the version string. This is only correct if the source files
do not contain that part of the version definition.
Changed tragesym to accept both version strings "20060113 1" and
"20060113" in the source file. Bug pointed out by Stefan Salewski.
:100644 100644 5477304... 1f4ce7b... M utils/examples/tragesym/test2.src
:100755 100755 17063fc... 0f258fe... M utils/scripts/tragesym
=========
Changes
=========
commit faa7917f687694937baee932ea2efaa6fd16fd26
Author: Werner Hoch <werner.ho@xxxxxx>
Date: Thu May 22 18:56:47 2008 +0200
tragesym: improved text alignment of top/bottom pin numbers. Version 0.0.14
The origin of the top and bottom pin numbers and pin sequence did not have
the same relativ position to the pin compared to the left and right pin.
Fixed this relativ positions and the text alignments.
This cosmetic issue was reported by Stefan Salewski. [1945153]
diff --git a/utils/scripts/tragesym b/utils/scripts/tragesym
index 0f258fe..267a057 100755
--- a/utils/scripts/tragesym
+++ b/utils/scripts/tragesym
@@ -27,7 +27,7 @@
import getopt, os.path, re, string, sys
##################### GLOBALS ############################################
-VERSION="0.0.13"
+VERSION="0.0.14"
CHARHIGH=26
preset_options = {"wordswap":"yes",
@@ -399,10 +399,10 @@ def writesym(filename,options,attr,pins):
pina=(0,350,2,90)
pinq=(50,200,8,90)
else:
- pint=(50,100,0,0)
+ pint=(50,200,2,0)
pinl=(0,350,3,0)
pina=(0,500,3,0)
- pinq=(50,100,2,0)
+ pinq=(-50,200,8,0)
swap=0
pbottomx=pbottomx + o_hdist
elif pin.pos == "t": # top pin
@@ -418,7 +418,7 @@ def writesym(filename,options,attr,pins):
pint=(50,-200,0,0)
pinl=(0,-350,5,0)
pina=(0,-500,5,0)
- pinq=(50,-200,2,0)
+ pinq=(-50,-200,6,0)
swap=0
ptopx=ptopx + o_hdist
### draw the pin
@@ -435,16 +435,12 @@ def writesym(filename,options,attr,pins):
pintx, pinty, pinta, pintr=pint
x=basex+pintx
y=basey+pinty
- if pin.pos == "t": # top pin
- y += 50
f.write("T %i"%x+" %i"%y+" 5 8 1 1 %i"%pintr+" %i 1\n"%pinta)
f.write("pinnumber="+pin.nr+"\n")
### draw pinseq
pintx, pinty, pinta, pintr=pinq
x=basex+pintx
y=basey+pinty
- if pin.pos == "t": # top pin
- y += 50
f.write("T %i"%x+" %i"%y+" 5 8 0 1 %i"%pintr+" %i 1\n"%pinta)
f.write("pinseq="+pin.seq+"\n")
### draw pinlabel and pintype
commit 234bb645ae97eb11f3ea04fadde107bc9865abf6
Author: Werner Hoch <werner.ho@xxxxxx>
Date: Thu May 22 18:36:15 2008 +0200
tragesym: fixed version string handling
With the commit 5a35c238f19622f8045784fa61497c80c4144fa6 a trailing " 1"
was added to the version string. This is only correct if the source files
do not contain that part of the version definition.
Changed tragesym to accept both version strings "20060113 1" and
"20060113" in the source file. Bug pointed out by Stefan Salewski.
diff --git a/utils/examples/tragesym/test2.src b/utils/examples/tragesym/test2.src
index 5477304..1f4ce7b 100644
--- a/utils/examples/tragesym/test2.src
+++ b/utils/examples/tragesym/test2.src
@@ -12,7 +12,7 @@ pinwidthvertical 400
pinwidthhorizontal 800
[geda_attr]
-version 20060113 1
+version 20060113
name TEST2
device devTEST2
refdes U?
diff --git a/utils/scripts/tragesym b/utils/scripts/tragesym
index 17063fc..0f258fe 100755
--- a/utils/scripts/tragesym
+++ b/utils/scripts/tragesym
@@ -339,7 +339,13 @@ def writesym(filename,options,attr,pins):
### Draw the symbol version
if attr.has_key(("version",1)):
value=attr[("version",1)]
- f.write("v " + value + " 1\n")
+ if re.match("[0-9]{8}$", value):
+ f.write("v " + value + " 1\n")
+ elif re.match("[0-9]{8} 1$", value):
+ f.write("v " + value + "\n")
+ else:
+ print "error: version string format invalid: [%s]" % value
+ sys.exit()
else:
print "error: version attribut missing"
sys.exit()
_______________________________________________
geda-cvs mailing list
geda-cvs@xxxxxxxxxxxxxx
http://www.seul.org/cgi-bin/mailman/listinfo/geda-cvs