Created a pixmap rotation routine in Utils for handling those rotated labels.

The rotation is now performed by the gtk pixbuf class and not manually in python.

In addition, the block and port classes now draw from pixmaps and not from images.
Pixmaps are server-side objects, where images are client-side (meaning: possible speed-up).

3 files changed, 35 insertions, 14 deletions

diff --git a/grc/gui/Block.py b/grc/gui/Block.py
index bed50de9f..27143e070 100644
--- a/grc/gui/Block.py
+++ b/grc/gui/Block.py
@@ -155,12 +155,11 @@ class Block(Element):
 			else: w_off = 0
 			pixmap.draw_layout(gc, w_off, h_off, layout)
 			h_off = h + h_off + LABEL_SEPARATION
-		#create vertical and horizontal images
-		self.horizontal_label = image = pixmap.get_image(0, 0, width, height)
+		#create vertical and horizontal pixmaps
+		self.horizontal_label = pixmap
 		if self.is_vertical():
-			self.vertical_label = vimage = gtk.gdk.Image(gtk.gdk.IMAGE_NORMAL, pixmap.get_visual(), height, width)
-			for i in range(width):
-				for j in range(height): vimage.put_pixel(j, width-i-1, image.get_pixel(i, j))
+			self.vertical_label = self.get_parent().new_pixmap(height, width)
+			Utils.rotate_pixmap(gc, self.horizontal_label, self.vertical_label)
 		#calculate width and height needed
 		self.W = self.label_width + 2*BLOCK_LABEL_PADDING
 		self.H = max(*(
@@ -183,9 +182,9 @@ class Block(Element):
 		)
 		#draw label image
 		if self.is_horizontal():
-			window.draw_image(gc, self.horizontal_label, 0, 0, x+BLOCK_LABEL_PADDING, y+(self.H-self.label_height)/2, -1, -1)
+			window.draw_drawable(gc, self.horizontal_label, 0, 0, x+BLOCK_LABEL_PADDING, y+(self.H-self.label_height)/2, -1, -1)
 		elif self.is_vertical():
-			window.draw_image(gc, self.vertical_label, 0, 0, x+(self.H-self.label_height)/2, y+BLOCK_LABEL_PADDING, -1, -1)
+			window.draw_drawable(gc, self.vertical_label, 0, 0, x+(self.H-self.label_height)/2, y+BLOCK_LABEL_PADDING, -1, -1)
 		#draw ports
 		for port in self.get_ports(): port.draw(gc, window)
 
diff --git a/grc/gui/Port.py b/grc/gui/Port.py
index 6763f6cbd..2896d04c1 100644
--- a/grc/gui/Port.py
+++ b/grc/gui/Port.py
@@ -97,12 +97,11 @@ class Port(Element):
 		gc.set_foreground(self._bg_color)
 		pixmap.draw_rectangle(gc, True, 0, 0, self.w, self.h)
 		pixmap.draw_layout(gc, 0, 0, layout)
-		#create the images
-		self.horizontal_label = image = pixmap.get_image(0, 0, self.w, self.h)
+		#create vertical and horizontal pixmaps
+		self.horizontal_label = pixmap
 		if self.is_vertical():
-			self.vertical_label = vimage = gtk.gdk.Image(gtk.gdk.IMAGE_NORMAL, pixmap.get_visual(), self.h, self.w)
-			for i in range(self.w):
-				for j in range(self.h): vimage.put_pixel(j, self.w-i-1, image.get_pixel(i, j))
+			self.vertical_label = self.get_parent().get_parent().new_pixmap(self.h, self.w)
+			Utils.rotate_pixmap(gc, self.horizontal_label, self.vertical_label)
 
 	def draw(self, gc, window):
 		"""
@@ -117,9 +116,9 @@ class Port(Element):
 		X,Y = self.get_coordinate()
 		(x,y),(w,h) = self._areas_list[0] #use the first area's sizes to place the labels
 		if self.is_horizontal():
-			window.draw_image(gc, self.horizontal_label, 0, 0, x+X+(self.W-self.w)/2, y+Y+(self.H-self.h)/2, -1, -1)
+			window.draw_drawable(gc, self.horizontal_label, 0, 0, x+X+(self.W-self.w)/2, y+Y+(self.H-self.h)/2, -1, -1)
 		elif self.is_vertical():
-			window.draw_image(gc, self.vertical_label, 0, 0, x+X+(self.H-self.h)/2, y+Y+(self.W-self.w)/2, -1, -1)
+			window.draw_drawable(gc, self.vertical_label, 0, 0, x+X+(self.H-self.h)/2, y+Y+(self.W-self.w)/2, -1, -1)
 
 	def get_connector_coordinate(self):
 		"""
diff --git a/grc/gui/Utils.py b/grc/gui/Utils.py
index 83036a4b8..b5489d56e 100644
--- a/grc/gui/Utils.py
+++ b/grc/gui/Utils.py
@@ -19,8 +19,31 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
 
 from Constants import POSSIBLE_ROTATIONS
 from Cheetah.Template import Template
+import pygtk
+pygtk.require('2.0')
+import gtk
 import gobject
 
+def rotate_pixmap(gc, src_pixmap, dst_pixmap, angle=gtk.gdk.PIXBUF_ROTATE_COUNTERCLOCKWISE):
+	"""
+	Load the destination pixmap with a rotated version of the source pixmap.
+	The source pixmap will be loaded into a pixbuf, rotated, and drawn to the destination pixmap.
+	The pixbuf is a client-side drawable, where a pixmap is a server-side drawable.
+	@param gc the graphics context
+	@param src_pixmap the source pixmap
+	@param dst_pixmap the destination pixmap
+	@param angle the angle to rotate by
+	"""
+	width, height = src_pixmap.get_size()
+	pixbuf = gtk.gdk.Pixbuf(
+		colorspace=gtk.gdk.COLORSPACE_RGB,
+		has_alpha=False, bits_per_sample=8,
+		width=width, height=height,
+	)
+	pixbuf.get_from_drawable(src_pixmap, src_pixmap.get_colormap(), 0, 0, 0, 0, -1, -1)
+	pixbuf = pixbuf.rotate_simple(angle)
+	dst_pixmap.draw_pixbuf(gc, pixbuf, 0, 0, 0, 0)
+
 def get_rotated_coordinate(coor, rotation):
 	"""
 	Rotate the coordinate by the given rotation.