fixed and optimized pyserial usage, added dmpl support, small stuff

(bzr r12787)

1 files changed, 46 insertions, 38 deletions

diff --git a/share/extensions/plotter.py b/share/extensions/plotter.py
index d518de4c9..e1d20c01b 100644
--- a/share/extensions/plotter.py
+++ b/share/extensions/plotter.py
@@ -19,6 +19,7 @@ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 '''
 
 # standard library
+import re
 import sys
 # local libraries
 import gettext
@@ -28,31 +29,31 @@ import inkex
 inkex.localize()
 
 
-# TODO: Unittests
-# TODO: Material feed after plot, plot rectangles
+# TODO: Unittests, Material feed after plot, plot rectangles and circles (convert to paths), maybe interpret layers as pens
 class MyEffect(inkex.Effect):
 
     def __init__(self):
         inkex.Effect.__init__(self)
-        self.OptionParser.add_option('--tab',            action='store', type='string',  dest='tab')
-        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')
-        self.OptionParser.add_option('--orientation',    action='store', type='string',  dest='orientation',    default='90',    help='orientation')
-        self.OptionParser.add_option('--mirrorX',        action='store', type='inkbool', dest='mirrorX',        default='FALSE', help='Mirror X-axis')
-        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('--flat',           action='store', type='float',   dest='flat',           default=1.2,     help='Curve flatness')
-        self.OptionParser.add_option('--useOvercut',     action='store', type='inkbool', dest='useOvercut',     default='TRUE',  help='Use overcut')
-        self.OptionParser.add_option('--overcut',        action='store', type='float',   dest='overcut',        default=1.0,     help='Overcut (mm)')
-        self.OptionParser.add_option('--useToolOffset',  action='store', type='inkbool', dest='useToolOffset',  default='TRUE',  help='Correct tool offset')
-        self.OptionParser.add_option('--toolOffset',     action='store', type='float',   dest='toolOffset',     default=0.25,    help='Tool offset (mm)')
-        self.OptionParser.add_option('--precut',         action='store', type='inkbool', dest='precut',         default='TRUE',  help='Use precut')
-        self.OptionParser.add_option('--offsetX',        action='store', type='float',   dest='offsetX',        default=0.0,     help='X offset (mm)')
-        self.OptionParser.add_option('--offsetY',        action='store', type='float',   dest='offsetY',        default=0.0,     help='Y offset (mm)')
-        self.OptionParser.add_option('--serialPort',     action='store', type='string',  dest='serialPort',     default='COM1',  help='Serial port')
-        self.OptionParser.add_option('--serialBaudRate', action='store', type='string',  dest='serialBaudRate', default='9600',  help='Serial Baud rate')
-        self.OptionParser.add_option('--flowControl',    action='store', type='string',  dest='flowControl',    default='0',     help='Flow control')
+        self.OptionParser.add_option('--tab',             action='store', type='string',  dest='tab')
+        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')
+        self.OptionParser.add_option('--orientation',     action='store', type='string',  dest='orientation',     default='90',    help='Rotation (Clockwise)')
+        self.OptionParser.add_option('--mirrorX',         action='store', type='inkbool', dest='mirrorX',         default='FALSE', help='Mirror X-axis')
+        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('--flat',            action='store', type='float',   dest='flat',            default=1.2,     help='Curve flatness')
+        self.OptionParser.add_option('--useOvercut',      action='store', type='inkbool', dest='useOvercut',      default='TRUE',  help='Use overcut')
+        self.OptionParser.add_option('--overcut',         action='store', type='float',   dest='overcut',         default=1.0,     help='Overcut (mm)')
+        self.OptionParser.add_option('--useToolOffset',   action='store', type='inkbool', dest='useToolOffset',   default='TRUE',  help='Correct tool offset')
+        self.OptionParser.add_option('--toolOffset',      action='store', type='float',   dest='toolOffset',      default=0.25,    help='Tool offset (mm)')
+        self.OptionParser.add_option('--precut',          action='store', type='inkbool', dest='precut',          default='TRUE',  help='Use precut')
+        self.OptionParser.add_option('--offsetX',         action='store', type='float',   dest='offsetX',         default=0.0,     help='X offset (mm)')
+        self.OptionParser.add_option('--offsetY',         action='store', type='float',   dest='offsetY',         default=0.0,     help='Y offset (mm)')
+        self.OptionParser.add_option('--serialPort',      action='store', type='string',  dest='serialPort',      default='COM1',  help='Serial port')
+        self.OptionParser.add_option('--serialBaudRate',  action='store', type='string',  dest='serialBaudRate',  default='9600',  help='Serial Baud rate')
+        self.OptionParser.add_option('--flowControl',     action='store', type='string',  dest='flowControl',     default='0',     help='Flow control')
+        self.OptionParser.add_option('--commandLanguage', action='store', type='string',  dest='commandLanguage', default='hpgl',  help='Command Language')
 
     def effect(self):
         # gracefully exit script when pySerial is missing
@@ -64,7 +65,6 @@ class MyEffect(inkex.Effect):
                 + "\n2. Extract the \"serial\" subfolder from the zip to the following folder: C:\\[Program files]\\inkscape\\python\\Lib\\"
                 + "\n3. Restart Inkscape."))
             return
-        # TODO: Maybe implement DMPL?
         # get hpgl data
         myHpglEncoder = hpgl_encoder.hpglEncoder(self)
         try:
@@ -76,7 +76,7 @@ class MyEffect(inkex.Effect):
                 return 1
             else:
                 type, value, traceback = sys.exc_info()
-                raise ValueError, ("", type, value), traceback
+                raise ValueError, ('', type, value), traceback
         # TODO: Get preview to work. This requires some work on the C++ side to be able to determine if it is
         # a preview or a final run. (Remember to set <effect needs-live-preview='false'> to true)
         '''
@@ -95,31 +95,39 @@ class MyEffect(inkex.Effect):
                 pass
             else:
                 type, value, traceback = sys.exc_info()
-                raise ValueError, ("", type, value), traceback
+                raise ValueError, ('', type, value), traceback
         '''
+        if self.options.commandLanguage == 'dmpl':
+            # convert HPGL to DMPL
+            self.hpgl = self.hpgl.replace(';', ',')
+            self.hpgl = self.hpgl.replace('PU', 'U')
+            self.hpgl = self.hpgl.replace('PD', 'D')
+            self.hpgl = re.sub(r'IN,SP([0-9]{1,2}),', r';:HAEC1L0P\1', self.hpgl)
+            self.hpgl += 'Z'
         # send data to plotter
+        mySerial = serial.Serial()
+        mySerial.port = self.options.serialPort
+        mySerial.baudrate = self.options.serialBaudRate
         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 == '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)
+            mySerial.xonxoff = True
+        if self.options.flowControl == 'rtscts' or self.options.flowControl == 'dsrdtrrtscts':
+            mySerial.rtscts = True
+        if self.options.flowControl == 'dsrdtrrtscts':
+            mySerial.dsrdtr = True
         try:
-            mySerial.write(self.hpgl)
+            mySerial.open()
         except Exception as inst:
-            if inst.args[0] == 'Write timeout':
-                inkex.errormsg(_("Could not send data. Please check that your plotter is running, connected and the settings are correct."))
+            if 'ould not open port' in inst.args[0]:
+                inkex.errormsg(_("Could not open port. Please check that your plotter is running, connected and the settings are correct."))
+                return
             else:
                 type, value, traceback = sys.exc_info()
-                raise ValueError, ("", type, value), traceback
-        # Read back 2 chars to avoid plotter not plotting last command (I have no idea why this is necessary)
-        mySerial.read(2)
+                raise ValueError, ('', type, value), traceback
+        mySerial.write(self.hpgl)
         mySerial.close()
 
 if __name__ == '__main__':
-    # Raise recursion limit to avoid exceptions on big documents
+    # raise recursion limit to avoid exceptions on big documents
     sys.setrecursionlimit(20000)
     # start extension
     e = MyEffect()