From 5f54b018b3a84ba4b68009a1c326ba73eaea8cfd Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 5 Sep 2009 01:54:41 -0700
Subject: standardized the Element inheritance __init__ usage in gui

---
 grc/gui/Connection.py | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'grc/gui/Connection.py')

diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py
index 013bcb00f..a85650ee2 100644
--- a/grc/gui/Connection.py
+++ b/grc/gui/Connection.py
@@ -32,6 +32,8 @@ class Connection(Element):
 	The arrow coloring exposes the enabled and valid states.
 	"""
 
+	def __init__(self): Element.__init__(self)
+
 	def get_coordinate(self):
 		"""
 		Get the 0,0 coordinate.
-- 
cgit 


From fa465d160b0c53fae3ad7876cf429263157dd60a Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 5 Sep 2009 02:21:37 -0700
Subject: Created recursive create labels and shapes method for gui element.
 Replaces update methods in the gui classes and simplifies calls. The master
 update method in flow graph calls create labels and shapes.

---
 grc/gui/Connection.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'grc/gui/Connection.py')

diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py
index a85650ee2..45f8a689a 100644
--- a/grc/gui/Connection.py
+++ b/grc/gui/Connection.py
@@ -50,8 +50,9 @@ class Connection(Element):
 		"""
 		return 0
 
-	def update(self):
+	def create_shapes(self):
 		"""Precalculate relative coordinates."""
+		Element.create_shapes(self)
 		self._sink_rot = None
 		self._source_rot = None
 		self._sink_coor = None
@@ -74,7 +75,7 @@ class Connection(Element):
 
 	def _update_after_move(self):
 		"""Calculate coordinates."""
-		self.clear()
+		self.clear() #FIXME do i want this here?
 		#source connector
 		source = self.get_source()
 		X, Y = source.get_connector_coordinate()
@@ -125,7 +126,7 @@ class Connection(Element):
 		sink = self.get_sink()
 		source = self.get_source()
 		#check for changes
-		if self._sink_rot != sink.get_rotation() or self._source_rot != source.get_rotation(): self.update()
+		if self._sink_rot != sink.get_rotation() or self._source_rot != source.get_rotation(): self.create_shapes()
 		elif self._sink_coor != sink.get_coordinate() or self._source_coor != source.get_coordinate(): self._update_after_move()
 		#cache values
 		self._sink_rot = sink.get_rotation()
-- 
cgit 


From caf93a02068e8379ffa7f553deabb62cfc42b9a7 Mon Sep 17 00:00:00 2001
From: Josh Blum
Date: Sat, 5 Sep 2009 02:38:46 -0700
Subject: remove unused imports, copyright date update, tweak

---
 grc/gui/Connection.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'grc/gui/Connection.py')

diff --git a/grc/gui/Connection.py b/grc/gui/Connection.py
index 45f8a689a..fabf34ee7 100644
--- a/grc/gui/Connection.py
+++ b/grc/gui/Connection.py
@@ -1,5 +1,5 @@
 """
-Copyright 2007, 2008 Free Software Foundation, Inc.
+Copyright 2007, 2008, 2009 Free Software Foundation, Inc.
 This file is part of GNU Radio
 
 GNU Radio Companion is free software; you can redistribute it and/or
-- 
cgit