pyetherpix

@@ -1,6 +1,6 @@

-from display import Display

-from distributor import Distributor

-from mapping import Mapping

-from msg import Msg, MsgDef

-from parse import parse_addr, parse_no, parse_two_nos

+from pyetherpix.display import Display

+from pyetherpix.distributor import Distributor

+from pyetherpix.mapping import Mapping

+from pyetherpix.msg import Msg, MsgDef

+from pyetherpix.parse import parse_addr, parse_no, parse_two_nos

@@ -17,10 +17,10 @@

 import socket

-from distributor import Distributor

-from mapping import Mapping

-from msg import Msg, MsgDef

-from parse import parse_addr, parse_no, parse_two_nos

+from pyetherpix.distributor import Distributor

+from pyetherpix.mapping import Mapping

+from pyetherpix.msg import Msg, MsgDef

+from pyetherpix.parse import parse_addr, parse_no, parse_two_nos

 class Display(object):

@@ -20,7 +20,7 @@ import struct

 from PIL import Image

-from mapping import Mapping

+from pyetherpix.mapping import Mapping

 class Distributor(object):

@@ -66,8 +66,9 @@ class Distributor(object):

     def data_clear(self):

         """clear image data, i.e. set entire image to black"""

         # prepare message buffer with all pixels cleared (black)

-        clr = "".join([self._mappings[channel].table[0]

-                       for channel in range(Mapping.CHANNELS)])

+        clr = bytearray()

+        for channel in range(Mapping.CHANNELS):

+            clr += self._mappings[channel].table[0]

         self._buffer = self._udp_hdr + (clr * (self._outputs * self._pixels))

     def data_image(self, image):

@@ -77,7 +78,7 @@ class Distributor(object):

         (width, height) = image.size

         # collect pixels from image and assemble message in buffer

         clr = [0] * Mapping.CHANNELS

-        data = []

+        data = self._udp_hdr

         for output_pixel_coords in self._pixel_coords:

             for x_y in output_pixel_coords:

                 if x_y is None:

@@ -90,10 +91,10 @@ class Distributor(object):

                         # get pixel from image

                         pix = image.getpixel(x_y)

                 # add pixel to pixel data

-                data += [self._mappings[channel].table[pix[channel]]

-                                        for channel in range(Mapping.CHANNELS)]

-        # build UDP message from pixel data

-        self._buffer = self._udp_hdr + "".join(data)

+                for channel in range(Mapping.CHANNELS):

+                    data += self._mappings[channel].table[pix[channel]]

+        # store UDP message

+        self._buffer = data

     def send(self, socket):

         """send image data to actual distributor module using UDP"""

@@ -33,21 +33,21 @@ def main(argv):

     # create display

     display = pyetherpix.Display(config_file)

     (width, height) = display.get_size()

-    print "width %u, height %u" % (width, height)

+    print("width %u, height %u" % (width, height))

     # prepare "on" image (all white)

     on = Image.new("RGB", (width, height), "white")

     # blink

-    print "blink"

+    print("blink")

     for i in range(5):

-        print "on"

+        print("on")

         display.data_image(on)

         display.send()

         time.sleep(0.5)

-        print "off"

+        print("off")

         display.data_clear()

         display.send()

         time.sleep(0.5)

-    print "done"

+    print("done")

     # close display

     display.close()

     return 0

@@ -15,6 +15,7 @@

 # You should have received a copy of the GNU Lesser General Public License

 # along with this program. If not, see <http://www.gnu.org/licenses/>.

+from __future__ import print_function

 import sys

@@ -55,5 +56,5 @@ class MsgDef(Msg):

         else:

           prefix = "unknown"

         if level <= self._level:

-          print >>sys.stderr, prefix + ": " + text

+          print(prefix + ": " + text, file=sys.stderr)