summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBob Jamison <ishmalius@gmail.com>2007-05-11 23:33:37 +0000
committerishmal <ishmal@users.sourceforge.net>2007-05-11 23:33:37 +0000
commitf451fc247959d9c6ad3517252b1aeb0f6e4f21a0 (patch)
treef0cbc7ef18fa9e5f6c4e6714216d97b562c56fc8
parentAdd doc for terry brown's Edge3d effect (diff)
downloadinkscape-f451fc247959d9c6ad3517252b1aeb0f6e4f21a0.tar.gz
inkscape-f451fc247959d9c6ad3517252b1aeb0f6e4f21a0.zip
Applied patch 1707577 to add "ft" and "yd"
(bzr r3005)
-rw-r--r--share/extensions/measure.inx2
-rw-r--r--share/extensions/measure.py4
2 files changed, 6 insertions, 0 deletions
diff --git a/share/extensions/measure.inx b/share/extensions/measure.inx
index b04456a8b..350751463 100644
--- a/share/extensions/measure.inx
+++ b/share/extensions/measure.inx
@@ -15,6 +15,8 @@
<item value="px">px</item>
<item value="pt">pt</item>
<item value="in">in</item>
+ <item value="ft">ft</item>
+ <item value="yd">yd</item>
<item value="mm">mm</item>
<item value="cm">cm</item>
<item value="m">m</item>
diff --git a/share/extensions/measure.py b/share/extensions/measure.py
index d19dde931..4a4435ceb 100644
--- a/share/extensions/measure.py
+++ b/share/extensions/measure.py
@@ -140,6 +140,10 @@ class Length(inkex.Effect):
factor=0.0000002822219 # px->km
elif self.options.unit=="in":
factor=0.2822219/25.4 # px->in
+ elif self.options.unit=="ft":
+ factor=0.2822219/(25.4*12) # px->ft
+ elif self.options.unit=="yd":
+ factor=0.2822219/(25.4*36) # px->yd
else :
''' Default unit is px'''
factor=1