summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAlvin Penner <penner@vaxxine.com>2014-11-29 15:55:24 +0000
committerapenner <penner@vaxxine.com>2014-11-29 15:55:24 +0000
commit0ba11757bf8c7816fc50eb1322899a95748e52cc (patch)
tree72ec7a67227a6e5a51b88741566173710c21610b
parentfix errors in string conversion. (rev13762, 13763) (diff)
downloadinkscape-0ba11757bf8c7816fc50eb1322899a95748e52cc.tar.gz
inkscape-0ba11757bf8c7816fc50eb1322899a95748e52cc.zip
allow use of units identifier for width, height in measure.py (Bug 1395567)
Fixed bugs: - https://launchpad.net/bugs/1395567 (bzr r13778)
-rwxr-xr-xshare/extensions/measure.py7
1 files changed, 4 insertions, 3 deletions
diff --git a/share/extensions/measure.py b/share/extensions/measure.py
index edcd2e92f..cdccb6bb8 100755
--- a/share/extensions/measure.py
+++ b/share/extensions/measure.py
@@ -183,9 +183,10 @@ class Length(inkex.Effect):
doc = self.document.getroot()
if doc.get('viewBox'):
[viewx, viewy, vieww, viewh] = doc.get('viewBox').split(' ')
- factor = float(doc.get('width'))/float(vieww)
- if float(doc.get('height'))/float(viewh) < factor:
- factor = float(doc.get('height'))/float(viewh)
+ factor = self.unittouu(doc.get('width'))/float(vieww)
+ if self.unittouu(doc.get('height'))/float(viewh) < factor:
+ factor = self.unittouu(doc.get('height'))/float(viewh)
+ factor /= self.unittouu('1px')
self.options.fontsize /= factor
# loop over all selected paths
for id, node in self.selected.iteritems():