diff options
| author | Jon A. Cruz <jon@joncruz.org> | 2010-12-18 06:03:56 +0000 |
|---|---|---|
| committer | Jon A. Cruz <jon@joncruz.org> | 2010-12-18 06:03:56 +0000 |
| commit | 9568768f68b4d97b37fc3da92d5c2f92628e0512 (patch) | |
| tree | 565f7044566ab5cc8466a2302414a65a9ae61ddd /share | |
| parent | Simple first pass for rough timing (diff) | |
| parent | Simple tracking of time to display dialogs and main window. (diff) | |
| download | inkscape-9568768f68b4d97b37fc3da92d5c2f92628e0512.tar.gz inkscape-9568768f68b4d97b37fc3da92d5c2f92628e0512.zip | |
Merge from trunk.
(bzr r9955.1.2)
Diffstat (limited to 'share')
| -rw-r--r-- | share/extensions/dxf_input.py | 6 | ||||
| -rw-r--r-- | share/extensions/gcodetools_all_in_one.inx | 2 | ||||
| -rw-r--r-- | share/extensions/gcodetools_area.inx | 2 | ||||
| -rw-r--r-- | share/extensions/measure.inx | 2 |
4 files changed, 8 insertions, 4 deletions
diff --git a/share/extensions/dxf_input.py b/share/extensions/dxf_input.py index b46477de1..ee52b8c30 100644 --- a/share/extensions/dxf_input.py +++ b/share/extensions/dxf_input.py @@ -88,6 +88,10 @@ def export_SPLINE(): path = 'M %f,%f Q %f,%f %f,%f' % (vals[groups['10']][0], vals[groups['20']][0], vals[groups['10']][1], vals[groups['20']][1], vals[groups['10']][2], vals[groups['20']][2]) attribs = {'d': path, 'style': style} inkex.etree.SubElement(layer, 'path', attribs) + if not (vals[groups['70']][0] & 3) and len(vals[groups['10']]) == 5 and len(vals[groups['20']]) == 5: + path = 'M %f,%f Q %f,%f %f,%f Q %f,%f %f,%f' % (vals[groups['10']][0], vals[groups['20']][0], vals[groups['10']][1], vals[groups['20']][1], vals[groups['10']][2], vals[groups['20']][2], vals[groups['10']][3], vals[groups['20']][3], vals[groups['10']][4], vals[groups['20']][4]) + attribs = {'d': path, 'style': style} + inkex.etree.SubElement(layer, 'path', attribs) def export_CIRCLE(): # mandatory group codes : (10, 20, 40) (x, y, radius) @@ -322,7 +326,7 @@ parser.add_option("--font", action="store", type="string", dest="font", default= parser.add_option("--tab", action="store", type="string", dest="tab", default="Options") parser.add_option("--inputhelp", action="store", type="string", dest="inputhelp", default="") (options, args) = parser.parse_args(inkex.sys.argv[1:]) -doc = inkex.etree.parse(StringIO('<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"></svg>')) +doc = inkex.etree.parse(StringIO('<svg xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" width="%s" height="%s"></svg>' % (210*90/25.4, 297*90/25.4))) desc = inkex.etree.SubElement(doc.getroot(), 'desc', {}) defs = inkex.etree.SubElement(doc.getroot(), 'defs', {}) marker = inkex.etree.SubElement(defs, 'marker', {'id': 'DistanceX', 'orient': 'auto', 'refX': '0.0', 'refY': '0.0', 'style': 'overflow:visible'}) diff --git a/share/extensions/gcodetools_all_in_one.inx b/share/extensions/gcodetools_all_in_one.inx index 0f566fc7b..85d7cfbee 100644 --- a/share/extensions/gcodetools_all_in_one.inx +++ b/share/extensions/gcodetools_all_in_one.inx @@ -15,7 +15,7 @@ The segment will be split into two segments if the distance between path's segme </_param> </page> - <page name='area' _gui-text='Area'> + <page name='area' msgctxt="gcodetools extension" _gui-text='Area'> <param name="max-area-curves" type="int" min="0" max="1000" _gui-text="Maximum area cutting curves:">100</param> <param name="area-inkscape-radius" type="float" min="-1000" max="1000" _gui-text="Area width:">-10</param> diff --git a/share/extensions/gcodetools_area.inx b/share/extensions/gcodetools_area.inx index 718ae0d9f..53ceeafaa 100644 --- a/share/extensions/gcodetools_area.inx +++ b/share/extensions/gcodetools_area.inx @@ -6,7 +6,7 @@ <dependency type="executable" location="extensions">inkex.py</dependency> <param name='active-tab' type="notebook"> - <page name='area' _gui-text='Area'> + <page name='area' msgctxt="gcodetools extension" _gui-text='Area'> <param name="max-area-curves" type="int" min="0" max="1000" _gui-text="Maximum area cutting curves:">100</param> <param name="area-inkscape-radius" type="float" min="-1000" max="1000" _gui-text="Area width:">-10</param> diff --git a/share/extensions/measure.inx b/share/extensions/measure.inx index 264e33ab6..63a919806 100644 --- a/share/extensions/measure.inx +++ b/share/extensions/measure.inx @@ -8,7 +8,7 @@ <page name="measure" _gui-text="Measure"> <param name="type" type="enum" _gui-text="Measurement Type: "> <_item value="length">Length</_item> - <_item value="area">Area</_item> + <_item msgctxt="measure extension" value="area">Area</_item> </param> <param name="fontsize" type="int" min="1" max="1000" _gui-text="Font size (px):">12</param> <param name="offset" type="float" min="-10000" max="10000" _gui-text="Offset (px):">-6</param> |