diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2013-11-10 02:08:46 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2013-11-10 02:08:46 +0000 |
| commit | ca1286aa677b5ff8d80fe274dfa3e759478570b3 (patch) | |
| tree | 36c7edfa575cea3d3bddfc4b034f7a35a8374ade /share | |
| parent | Fixing bugs on update to trunk (diff) | |
| parent | Revert unintentional change. (diff) | |
| download | inkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.tar.gz inkscape-ca1286aa677b5ff8d80fe274dfa3e759478570b3.zip | |
Update to trunk
(bzr r11950.1.195)
Diffstat (limited to 'share')
| -rw-r--r-- | share/extensions/hpgl_input.inx | 2 | ||||
| -rw-r--r-- | share/extensions/hpgl_output.inx | 2 | ||||
| -rw-r--r-- | share/extensions/plotter.inx | 7 | ||||
| -rw-r--r-- | share/extensions/plotter.py | 8 |
4 files changed, 11 insertions, 8 deletions
diff --git a/share/extensions/hpgl_input.inx b/share/extensions/hpgl_input.inx index 69711d85a..8dd90b3f7 100644 --- a/share/extensions/hpgl_input.inx +++ b/share/extensions/hpgl_input.inx @@ -14,7 +14,7 @@ <extension>.hpgl</extension> <mimetype>image/hpgl</mimetype> <_filetypename>HP Graphics Language file (*.hpgl)</_filetypename> - <_filetypetooltip>Import HP Graphics Language file</_filetypetooltip> + <_filetypetooltip>Import an HP Graphics Language file</_filetypetooltip> </input> <script> <command reldir="extensions" interpreter="python">hpgl_input.py</command> diff --git a/share/extensions/hpgl_output.inx b/share/extensions/hpgl_output.inx index 7f8705996..c51215b4c 100644 --- a/share/extensions/hpgl_output.inx +++ b/share/extensions/hpgl_output.inx @@ -42,7 +42,7 @@ <extension>.hpgl</extension> <mimetype>image/hpgl</mimetype> <_filetypename>HP Graphics Language file (*.hpgl)</_filetypename> - <_filetypetooltip>Export to an HP Graphics Language file</_filetypetooltip> + <_filetypetooltip>Export an HP Graphics Language file</_filetypetooltip> <dataloss>true</dataloss> </output> <script> diff --git a/share/extensions/plotter.inx b/share/extensions/plotter.inx index b950e0246..526ab1bd3 100644 --- a/share/extensions/plotter.inx +++ b/share/extensions/plotter.inx @@ -27,9 +27,10 @@ <option value="115200">115200</option> </param> <param name="flowControl" type="optiongroup" appearance="minimal" _gui-text="Flow control" _gui-description="Software / Hardware flow control - Try different settings to find the one that fits your plotter (Default: None)"> - <option value="0">None</option> - <option value="1">Software (XON/XOFF)</option> - <option value="2">Hardware (RTS/CTS)</option> + <_option value="">None</_option> + <_option value="xonxoff">Software (XON/XOFF)</_option> + <_option value="rtscts">Hardware (RTS/CTS)</_option> + <_option value="dsrdtrrtscts">Hardware (DSR/DTR + RTS/CTS)</_option> </param> <param name="space" type="description"> </param> <_param name="serialHelp" type="description">This can be a physical serial connection or a USB-to-Serial bridge. Ask your plotter manufacturer for drivers if needed.</_param> diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py index aef9e016d..d518de4c9 100644 --- a/share/extensions/plotter.py +++ b/share/extensions/plotter.py @@ -98,10 +98,12 @@ class MyEffect(inkex.Effect): raise ValueError, ("", type, value), traceback ''' # send data to plotter - if self.options.flowControl == '1': + if self.options.flowControl == 'xonxoff': mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, xonxoff=True) - elif self.options.flowControl == '2': - mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, dsrdtr=None, rtscts=True) + elif self.options.flowControl == 'rtscts': + mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, rtscts=True) + elif self.options.flowControl == 'dsrdtrrtscts': + mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10, dsrdtr=True, rtscts=True) else: mySerial = serial.Serial(port=self.options.serialPort, baudrate=self.options.serialBaudRate, timeout=0.1, writeTimeout=10) try: |