PiSupply · francesco-vannini · Mar 15, 2017 · Dec 31, 2016 · Dec 31, 2016 · Dec 31, 2016
diff --git a/README.md b/README.md
@@ -1,191 +0,0 @@
-# PaPiRus
-Resources for PaPiRus ePaper eInk display. This repository is based on the [rePaper/gratis GitHub repository](https://github.com/repaper/gratis).
-
-# Enabling SPI and I2C interfaces on Raspberry Pi
-Before using PaPiRus, do not forget to enable the SPI and the I2C interfaces.
-You can enable the SPI by typing `sudo raspi-config` at the command line and then selecting `Interfacing options` > `SPI` and then selecting Enable. Without exiting the tool still in `Interfacing options` > `I2C` and then selecting Enable.
-
-# Setup PaPiRus
-```bash
-# Run this line and PaPiRus will be setup and installed
-curl -sSL https://goo.gl/i1Imel | sudo bash
-```
-
-# Getting Started
-```bash
-# Select your screen size
-sudo papirus-set [1.44 | 1.9 | 2.0 | 2.6 | 2.7 ]
-or
-sudo papirus-config
-# System will now reboot
-```
-
-# Manual Installation
-
-#### Install Python API
-```bash
-
-# Install dependencies
-sudo apt-get install python-imaging
-
-git clone https://github.com/PiSupply/PaPiRus.git
-cd PaPiRus
-sudo python setup.py install    # Install PaPirRus python library
-```
-
-#### Install Driver (Option 1)
-```bash
-papirus-setup    # This will auto install the driver
-````
-
-#### Install Driver (Option 2)
-```bash
-# Install fuse driver
-sudo apt-get install libfuse-dev -y
-
-sudo mkdir /tmp/papirus
-cd /tmp/papirus
-git clone https://github.com/repaper/gratis.git
-
-cd /tmp/papirus/gratis-master/PlatformWithOS
-make rpi-epd_fuse
-sudo make rpi-install
-sudo service epd-fuse start
-```
-
-# Python API
-
-#### The Basic API
-
-```python
-from papirus import Papirus
-
-# The epaper screen object
-screen = Papirus()
-
-# Write a bitmap to the epaper screen
-screen.display('./path/to/bmp/image')
-
-# Perform a full update to the screen (slower)
-screen.update()
-
-# Update only the changed pixels (faster)
-screen.partial_update()
-
-# Change screen size
-# SCREEN SIZES 1_44INCH | 1_9INCH | 2_0INCH | 2_6INCH | 2_7INCH
-screen.set_size(papirus.2_7INCH)
-
-```
-
-#### The Text API
-```python
-from papirus import PapirusText
-
-text = PapirusText()
-
-# Write text to the screen
-# text.write(text)
-text.write("hello world")
-
-# Write text to the screen at selected point
-# text.write(text, (x,y))
-text.write("hello world", (10, 10) )
-```
-
-#### The Image API
-```python
-from papirus import PapirusImage
-
-image = PapirusImage()
-
-# easy write image to screen
-# image.write(path)
-image.write('/path/to/image')
-
-# write image to the screen with size and position
-# image.write(path, width, (x,y))
-image.write('/path/to/image', 20, (10, 10) )
-```
-#### Notes
-
-Your python script must be running with root privileges to update the screen and change sizes.
-This code will only allow the script to run as root
-
-```python
-import os
-import sys
-
-user = os.getuid()
-if user != 0:
-    print "Please run script as root"
-    sys.exit()
-```
-
-# Command Line
-
-```bash
-# Set the screen size you are using
-papirus-set [1.44 | 1.9 | 2.0 | 2.6 | 2.7 ]
-
-# Write data to the screen
-papirus-write "Some text to write"
-
-# Draw image on the screen
-papirus-draw /path/to/image -t [resize | crop]
-
-# Clear the screen
-papirus-clear
-```
-
-#### Demos
-All demos can be seen by running the following commands. Code can be found in the repo for the python bin directory. 
-
-```bash
-# Show clock
-papirus-clock
-
-# Run game of life
-papirus-gol
-
-# Show system information
-papirus-system (coming soon)
-
-# Push framebuffer to screen
-papirus-framepush (coming soon)
-
-# Demo of using the buttons
-papirus-buttons
-
-# Demo of getting temperature from LM75
-papirus-temp
-
-# Snakes game
-papirus-snakes (coming soon)
-```
-
-### Tips for using images
-The PaPiRus can only display Bitmap images (.BMP) in black and white (1 bit colour). If you pass an image to PaPiRus that is not a 1 Bit Bitmap, it will automatically be converted to this by the software. However, for best results and higher image quality we would recommend that you convert the image to a 1 Bit Bitmap before pushing to the PaPiRus screen using GIMP or Photoshop or similar photo editing tools like [the rePaper companion](https://github.com/aerialist/repaper_companion) to resize images and convert them to XBM format or [WIF (the WyoLum Image Format)](http://wyolum.com/introducing-wif-the-wyolum-image-format/).
-
-Use the following screen resolutions:
-```
-1.44"     128 x 96
-1.9"      144 x 128
-2.0"      200 x 96
-2.6"      232 x 128
-2.7"      264 x 176
-```
-Also try using the method partial_update() instead of the update() one if you want to refresh the screen faster and mayb want to create some simple animations. Remember though that the partial method cannot be used indefinitely and you will have to refresh the screen every once in a while. You should ideally do a full refresh of the screen every few minutes and it is also recommended to completely power down the screen every few hours.
-
-# Hardware tips
-In case you have problems assembling the board please [check this article on our website](https://www.pi-supply.com/make/papirus-assembly-tips-and-gotchas/) on which you can find:
-* Connect the screen to the PaPiRus board
-* Connect the GPIO adapter
-* Install the pogo pin connector
-* Install the push buttons
-Not all the sections apply to both the PaPiRus HAT and the PaPiRus Zero.
-
-### Datasheets, connectivity, pinout, jumpers and further information
-For additional information follow the links below:
-* [PaPiRus HAT](https://github.com/PiSupply/PaPiRus/tree/master/hardware/PaPiRus%20HAT)
-* [PaPiRus zero](https://github.com/PiSupply/PaPiRus/tree/master/hardware/PaPiRus%20Zero)

diff --git a/bin/papirus-write b/bin/papirus-write
@@ -1,11 +1,8 @@
-#!/usr/bin/env python
+#!/usr/bin/python
 
 import os
 import sys
-from papirus import Papirus
-from PIL import Image
-from PIL import ImageDraw
-from PIL import ImageFont
+from papirus import PapirusTextPos
 import argparse
 
 user = os.getuid()
@@ -14,60 +11,22 @@ if user != 0:
     sys.exit()
 
 # Command line usage
-# papirus-wite "Some text to write"
-
-WHITE = 1
-BLACK = 0
+# papirus-wite "Some text to write"  -x  -y -fsize
 
 def main():
     p = argparse.ArgumentParser()
-    p.add_argument('content', type=str)
-    p.add_argument('--fsize', '-s',type=int , default=20)
+    p.add_argument('content', type=str, help="Text to display")
+    p.add_argument('--posX', '-x', type=int, default=0, help="X position of the start of the text")
+    p.add_argument('--posY', '-y', type=int, default=0, help="Y position of the start of the text")
+    p.add_argument('--fsize', '-s',type=int , default=20, help="Font size to use for the text")
 
     args = p.parse_args()
 
-    papirus = Papirus()
-
     if args.content:
 	print("Writing to Papirus.......")
-        write_text(papirus, args.content, args.fsize)
+        text = PapirusTextPos()
+        text.AddText(args.content, args.posX, args.posY, args.fsize)
         print("Finished!")
 
-
-def write_text(papirus, text, size):
-
-    # initially set all white background
-    image = Image.new('1', papirus.size, WHITE)
-
-    # prepare for drawing
-    draw = ImageDraw.Draw(image)
-
-    font = ImageFont.truetype('/usr/share/fonts/truetype/freefont/FreeMono.ttf', size)
-
-    # Calculate the max number of char to fit on line
-    line_size = (papirus.width / (size*0.65))
-
-    current_line = 0
-    text_lines = [""]
-
-    # Compute each line
-    for word in text.split():
-        # If there is space on line add the word to it
-        if (len(text_lines[current_line]) + len(word)) < line_size:
-            text_lines[current_line] += " " + word
-        else:
-            # No space left on line so move to next one
-            text_lines.append("")
-            current_line += 1
-            text_lines[current_line] += " " + word
-
-    current_line = 0
-    for l in text_lines:
-        current_line += 1
-        draw.text( (0, ((size*current_line)-size)) , l, font=font, fill=BLACK)
-
-    papirus.display(image)
-    papirus.update()
-
 if __name__ == '__main__':
     main()
diff --git a/papirus/__init__.py b/papirus/__init__.py
@@ -1,3 +1,5 @@
 from epd import EPD as Papirus
 from text import PapirusText
 from image import PapirusImage
+from textpos import PapirusTextPos
+