From 4cb15fa89b6cca6f116e797e46d05ed207cc8921 Mon Sep 17 00:00:00 2001 From: Alexandre Prokoudine Date: Sat, 12 Jan 2013 17:43:39 +0400 Subject: Fixed a typo in a user-visible message (bzr r12016) --- share/extensions/webslicer_export.inx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share') diff --git a/share/extensions/webslicer_export.inx b/share/extensions/webslicer_export.inx index f82e42f33..f20f66637 100644 --- a/share/extensions/webslicer_export.inx +++ b/share/extensions/webslicer_export.inx @@ -12,7 +12,7 @@ true - <_param name="about" type="description">All sliced images, and optionaly code, will be generated as you had configured and saved to one directory. + <_param name="about" type="description">All sliced images, and optionally - code, will be generated as you had configured and saved to one directory. -- cgit v1.2.3 From 603019be02ef3e423a3a0eddf73af1ed5910b337 Mon Sep 17 00:00:00 2001 From: Alexandre Prokoudine Date: Sat, 12 Jan 2013 18:30:42 +0400 Subject: Restored i18n markup fo names of extensions (bzr r12017) --- share/extensions/gcodetools_about.inx | 2 +- share/extensions/gcodetools_area.inx | 2 +- share/extensions/gcodetools_check_for_updates.inx | 2 +- share/extensions/gcodetools_dxf_points.inx | 2 +- share/extensions/gcodetools_engraving.inx | 2 +- share/extensions/gcodetools_graffiti.inx | 2 +- share/extensions/gcodetools_lathe.inx | 2 +- share/extensions/gcodetools_orientation_points.inx | 2 +- share/extensions/gcodetools_path_to_gcode.inx | 2 +- share/extensions/gcodetools_prepare_path_for_plasma.inx | 2 +- share/extensions/gcodetools_tools_library.inx | 2 +- 11 files changed, 11 insertions(+), 11 deletions(-) (limited to 'share') diff --git a/share/extensions/gcodetools_about.inx b/share/extensions/gcodetools_about.inx index b6c0fcde2..c1016477d 100644 --- a/share/extensions/gcodetools_about.inx +++ b/share/extensions/gcodetools_about.inx @@ -1,7 +1,7 @@ - About + <_name>About ru.cnc-club.filter.gcodetools_about_no_options_no_preferences gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_area.inx b/share/extensions/gcodetools_area.inx index 30ed362cd..ad27ecee4 100644 --- a/share/extensions/gcodetools_area.inx +++ b/share/extensions/gcodetools_area.inx @@ -1,7 +1,7 @@ - Area + <_name>Area ru.cnc-club.filter.gcodetools_area_area_fill_area_artefacts_ptg gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_check_for_updates.inx b/share/extensions/gcodetools_check_for_updates.inx index ef0313ecf..6eaa098a5 100644 --- a/share/extensions/gcodetools_check_for_updates.inx +++ b/share/extensions/gcodetools_check_for_updates.inx @@ -1,7 +1,7 @@ - Check for updates + <_name>Check for updates ru.cnc-club.filter.gcodetools_update_no_options_no_preferences gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_dxf_points.inx b/share/extensions/gcodetools_dxf_points.inx index cccd64497..e4534e8af 100644 --- a/share/extensions/gcodetools_dxf_points.inx +++ b/share/extensions/gcodetools_dxf_points.inx @@ -1,7 +1,7 @@ - DXF Points + <_name>DXF Points ru.cnc-club.filter.gcodetools_dxfpoints_no_options gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_engraving.inx b/share/extensions/gcodetools_engraving.inx index e278f64bc..6885f32fd 100644 --- a/share/extensions/gcodetools_engraving.inx +++ b/share/extensions/gcodetools_engraving.inx @@ -1,7 +1,7 @@ - Engraving + <_name>Engraving ru.cnc-club.filter.gcodetools_engraving gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_graffiti.inx b/share/extensions/gcodetools_graffiti.inx index 73235ee16..7253b8fa4 100644 --- a/share/extensions/gcodetools_graffiti.inx +++ b/share/extensions/gcodetools_graffiti.inx @@ -1,7 +1,7 @@ - Graffiti + <_name>Graffiti ru.cnc-club.filter.gcodetools_graffiti_orientation gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_lathe.inx b/share/extensions/gcodetools_lathe.inx index 641a4f065..d3c6916fd 100644 --- a/share/extensions/gcodetools_lathe.inx +++ b/share/extensions/gcodetools_lathe.inx @@ -1,7 +1,7 @@ - Lathe + <_name>Lathe ru.cnc-club.filter.gcodetools_lathe_lathe_modify_path_ptg gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_orientation_points.inx b/share/extensions/gcodetools_orientation_points.inx index 3de8ba594..604369881 100644 --- a/share/extensions/gcodetools_orientation_points.inx +++ b/share/extensions/gcodetools_orientation_points.inx @@ -1,7 +1,7 @@ - Orientation points + <_name>Orientation points ru.cnc-club.filter.gcodetools_orientation_no_options_no_preferences gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_path_to_gcode.inx b/share/extensions/gcodetools_path_to_gcode.inx index b610c490b..8a79d6aae 100644 --- a/share/extensions/gcodetools_path_to_gcode.inx +++ b/share/extensions/gcodetools_path_to_gcode.inx @@ -1,7 +1,7 @@ - Path to Gcode + <_name>Path to Gcode ru.cnc-club.filter.gcodetools_ptg gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_prepare_path_for_plasma.inx b/share/extensions/gcodetools_prepare_path_for_plasma.inx index c3e46c8ac..ab054714e 100644 --- a/share/extensions/gcodetools_prepare_path_for_plasma.inx +++ b/share/extensions/gcodetools_prepare_path_for_plasma.inx @@ -1,7 +1,7 @@ - Prepare path for plasma + <_name>Prepare path for plasma ru.cnc-club.filter.gcodetools_plasma-prepare-path_no_options_no_preferences gcodetools.py inkex.py diff --git a/share/extensions/gcodetools_tools_library.inx b/share/extensions/gcodetools_tools_library.inx index aefd4b896..e7be0d996 100644 --- a/share/extensions/gcodetools_tools_library.inx +++ b/share/extensions/gcodetools_tools_library.inx @@ -1,7 +1,7 @@ - Tools library + <_name>Tools library ru.cnc-club.filter.gcodetools_tools_library_no_options_no_preferences gcodetools.py inkex.py -- cgit v1.2.3 From 04b95ec3b366bc4323ad5be54a66974b0a96877e Mon Sep 17 00:00:00 2001 From: su_v Date: Thu, 17 Jan 2013 00:09:13 +0100 Subject: Fix support for UniConvertor 1.1.4 (see bug #425202) (bzr r12032) --- share/extensions/uniconv-ext.py | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'share') diff --git a/share/extensions/uniconv-ext.py b/share/extensions/uniconv-ext.py index 5608000c4..f4c80b5d6 100755 --- a/share/extensions/uniconv-ext.py +++ b/share/extensions/uniconv-ext.py @@ -22,6 +22,14 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA """ # standard library import sys +# local library +from run_command import run +import inkex + +inkex.localize() + +cmd = None + try: from subprocess import Popen, PIPE p = Popen('uniconvertor', shell=True, stdout=PIPE, stderr=PIPE).wait() @@ -37,13 +45,6 @@ except ImportError: if p!=32512 : cmd = 'uniconv' p = Popen3('uniconvertor', True).wait() if p!=32512 : cmd = 'uniconvertor' -# local library -from run_command import run -import inkex - -cmd = None - -inkex.localize() if cmd == None: # there's no succeffully-returning uniconv command; try to get the module directly (on Windows) -- cgit v1.2.3 From a31fb308fbd345df21a0ac04f9690ee3dbdfb3bc Mon Sep 17 00:00:00 2001 From: Alvin Penner Date: Wed, 16 Jan 2013 18:56:26 -0500 Subject: extensions. dxf output. set flag if LWPOLYLINE is closed (Bug 1098283) Fixed bugs: - https://launchpad.net/bugs/1098283 (bzr r12033) --- share/extensions/dxf_outlines.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'share') diff --git a/share/extensions/dxf_outlines.py b/share/extensions/dxf_outlines.py index fd01e83e9..57f4e4198 100755 --- a/share/extensions/dxf_outlines.py +++ b/share/extensions/dxf_outlines.py @@ -108,12 +108,13 @@ class MyEffect(inkex.Effect): self.poly = [csp[0]] # initiallize new polyline self.color_LWPOLY = self.color self.layer_LWPOLY = self.layer + self.closed_LWPOLY = self.closed self.poly.append(csp[1]) def LWPOLY_output(self): if len(self.poly) == 1: return self.handle += 1 - self.dxf_add(" 0\nLWPOLYLINE\n 5\n%x\n100\nAcDbEntity\n 8\n%s\n 62\n%d\n100\nAcDbPolyline\n 90\n%d\n 70\n0\n" % (self.handle, self.layer_LWPOLY, self.color_LWPOLY, len(self.poly))) + self.dxf_add(" 0\nLWPOLYLINE\n 5\n%x\n100\nAcDbEntity\n 8\n%s\n 62\n%d\n100\nAcDbPolyline\n 90\n%d\n 70\n%d\n" % (self.handle, self.layer_LWPOLY, self.color_LWPOLY, len(self.poly), self.closed_LWPOLY)) for i in range(len(self.poly)): self.dxf_add(" 10\n%f\n 20\n%f\n 30\n0.0\n" % (self.poly[i][0],self.poly[i][1])) def dxf_spline(self,csp): @@ -189,6 +190,7 @@ class MyEffect(inkex.Effect): if style['stroke'] and style['stroke'] != 'none' and style['stroke'][0:3] != 'url': rgb = simplestyle.parseColor(style['stroke']) hsl = coloreffect.ColorEffect.rgb_to_hsl(coloreffect.ColorEffect(),rgb[0]/255.0,rgb[1]/255.0,rgb[2]/255.0) + self.closed = 0 # only for LWPOLYLINE self.color = 7 # default is black if hsl[2]: self.color = 1 + (int(6*hsl[0] + 0.5) % 6) # use 6 hues @@ -196,8 +198,11 @@ class MyEffect(inkex.Effect): d = node.get('d') if not d: return + if (d[-1] == 'z' or d[-1] == 'Z'): + self.closed = 1 p = cubicsuperpath.parsePath(d) elif node.tag == inkex.addNS('rect','svg'): + self.closed = 1 x = float(node.get('x')) y = float(node.get('y')) width = float(node.get('width')) -- cgit v1.2.3