Merge pull request #5 from geftactics/cut-control

Adding cut control. Closes #4

.gitignore

@@ -1,5 +1,6 @@
 .idea/
 *.pyc
+*.bin
 .pypirc
 *.egg-info/
 dist/

README.md

@@ -17,7 +17,7 @@ Print a file from disk:
 ```
 import StarTSPImage
 
-raster = StarTSPImage.imageFileToRaster('file.bmp')
+raster = StarTSPImage.imageFileToRaster('file.bmp', cut=True))
 
 printer = open('/dev/usb/lp0', 'wb')
 printer.write(raster)
@@ -32,8 +32,9 @@ from PIL import Image, ImageDraw
 image = Image.new('RGB', (500, 500), color='White')
 draw = ImageDraw.Draw(image)
 draw.ellipse((0, 0, 500, 500), fill='Black')
+draw.ellipse((10, 10, 490, 490), fill='White')
 
-raster = StarTSPImage.imageToRaster(image)
+raster = StarTSPImage.imageToRaster(image, cut=True)
 
 printer = open('/dev/usb/lp0', "wb")
 printer.write(raster)

StarTSPImage/StarTSPImage.py

@@ -2,7 +2,7 @@
 from PIL import Image
 
 
-def buildRaster(img):
+def buildRaster(img, cut=True):
 
   bytes_per_line = 72
 
@@ -21,6 +21,10 @@ def buildRaster(img):
   buf.extend([0x1b, ord('*'), ord('r'), ord('A')])                  # Enter raster mode
   buf.extend([0x1b, ord('*'), ord('r'), ord('P'), ord('0'), 0x00])  # continuous mode
 
+  # Handle cuts
+  if not cut:
+      buf.extend([0x1b, ord('*'), ord('r'), ord('E'), ord('1'), 0x00]) # Raster EOT no-cut
+
   # Loop over bytes array, adding a transfer data command for each line
   # followed by the amount of bytes that make up a line
   byte = 0
@@ -36,10 +40,10 @@ def buildRaster(img):
   return bytearray(buf)
 
 
-def imageToRaster(img):
-  return buildRaster(img)
+def imageToRaster(img, cut=True):
+  return buildRaster(img, cut)
 
 
-def imageFileToRaster(image_path):
+def imageFileToRaster(image_path, cut=True):
   img = Image.open(image_path)
-  return buildRaster(img)
+  return buildRaster(img, cut)

setup.py

@@ -1,6 +1,6 @@
 from setuptools import setup, find_packages
 
-version = '0.2.5'
+version = '0.2.6'
 
 setup(
     name='StarTSPImage',

test.py

@@ -0,0 +1,12 @@
+import StarTSPImage
+from PIL import Image, ImageDraw
+
+image = Image.new('RGB', (500, 500), color='White')
+draw = ImageDraw.Draw(image)
+draw.ellipse((0, 0, 500, 500), fill='Black')
+draw.ellipse((10, 10, 490, 490), fill='White')
+
+raster = StarTSPImage.imageToRaster(image, cut=True)
+
+printer = open('/dev/usb/lp0', "wb")
+printer.write(raster)