From 1654c7cdf0cdedf2d2c5befa560bcc5688428c65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20W=C3=BCst?= Date: Sun, 13 Sep 2015 17:30:35 +0200 Subject: Extensions: changed wording for tool offset correction (bzr r14359) --- share/extensions/plotter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/extensions/plotter.py') diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index c0f180f60..e579e2630 100644 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -53,7 +53,7 @@ class Plot(inkex.Effect): self.OptionParser.add_option('--mirrorY', action='store', type='inkbool', dest='mirrorY', default='FALSE', help='Mirror Y axis') self.OptionParser.add_option('--center', action='store', type='inkbool', dest='center', default='FALSE', help='Center zero point') self.OptionParser.add_option('--overcut', action='store', type='float', dest='overcut', default=1.0, help='Overcut (mm)') - self.OptionParser.add_option('--toolOffset', action='store', type='float', dest='toolOffset', default=0.25, help='Tool offset (mm)') + self.OptionParser.add_option('--toolOffset', action='store', type='float', dest='toolOffset', default=0.25, help='Tool (Knife) offset correction (mm)') self.OptionParser.add_option('--precut', action='store', type='inkbool', dest='precut', default='TRUE', help='Use precut') self.OptionParser.add_option('--flat', action='store', type='float', dest='flat', default=1.2, help='Curve flatness') self.OptionParser.add_option('--autoAlign', action='store', type='inkbool', dest='autoAlign', default='TRUE', help='Auto align') -- cgit v1.2.3 From 43783fa8293b066329d00b523d8931326feb7b60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20W=C3=BCst?= Date: Sun, 13 Sep 2015 17:55:36 +0200 Subject: Extensions: removed pre stream commands feature (too complicated, not needed) (bzr r14360) --- share/extensions/plotter.py | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) (limited to 'share/extensions/plotter.py') diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index e579e2630..7e34f2953 100644 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -42,7 +42,6 @@ class Plot(inkex.Effect): self.OptionParser.add_option('--serialParity', action='store', type='string', dest='serialParity', default='none', help='Serial parity') self.OptionParser.add_option('--serialFlowControl', action='store', type='string', dest='serialFlowControl', default='0', help='Flow control') self.OptionParser.add_option('--commandLanguage', action='store', type='string', dest='commandLanguage', default='hpgl', help='Command Language') - self.OptionParser.add_option('--initCommands', action='store', type='string', dest='initCommands', default='', help='Initialization commands') self.OptionParser.add_option('--resolutionX', action='store', type='float', dest='resolutionX', default=1016.0, help='Resolution X (dpi)') self.OptionParser.add_option('--resolutionY', action='store', type='float', dest='resolutionY', default=1016.0, help='Resolution Y (dpi)') self.OptionParser.add_option('--pen', action='store', type='int', dest='pen', default=1, help='Pen number') @@ -203,8 +202,6 @@ class Plot(inkex.Effect): type, value, traceback = sys.exc_info() raise ValueError, ('', type, value), traceback # send data to plotter - if self.options.initCommands != '': - mySerial.write(self.options.initCommands.decode('string_escape')) mySerial.write(self.hpgl) mySerial.read(2) mySerial.close() @@ -219,7 +216,6 @@ class Plot(inkex.Effect): inkex.errormsg(' Serial parity: ' + self.options.serialParity) inkex.errormsg(' Serial Flow control: ' + self.options.serialFlowControl) inkex.errormsg(' Command language: ' + self.options.commandLanguage) - inkex.errormsg(' Initialization commands: ' + self.options.initCommands) inkex.errormsg(' Resolution X (dpi): ' + str(self.options.resolutionX)) inkex.errormsg(' Resolution Y (dpi): ' + str(self.options.resolutionY)) inkex.errormsg(' Pen number: ' + str(self.options.pen)) @@ -263,7 +259,7 @@ class Plot(inkex.Effect): inkex.errormsg(' Flatness: ' + str(debugObject.flat) + ' plotter steps') inkex.errormsg(' Tool offset flatness: ' + str(debugObject.toolOffsetFlat) + ' plotter steps') inkex.errormsg("\n" + self.options.commandLanguage + " data:\n") - inkex.errormsg(self.options.initCommands + self.hpgl) + inkex.errormsg(self.hpgl) if __name__ == '__main__': # start extension -- cgit v1.2.3 From 1245fa37694b8cce14639bfc9b016aa4bd23776c Mon Sep 17 00:00:00 2001 From: Krzysztof Kosi??ski Date: Sun, 13 Sep 2015 19:09:56 +0200 Subject: Second round of extension executable bit cleanup. Add/remove executable bits and shebangs as appropriate. The extension entry point should be executable, while Python files that contain libraries and are not entry points should not be executable. Shebang lines should only be present in executable files. (bzr r14362) --- share/extensions/plotter.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) mode change 100644 => 100755 share/extensions/plotter.py (limited to 'share/extensions/plotter.py') diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py old mode 100644 new mode 100755 -- cgit v1.2.3