Changeset 622

Timestamp:

04/30/07 14:39:18 (6 years ago)

Author:

ignotus21

Message:

Start of animation of graph.

Location:

branch/joao/umitMapper

Files:

• Coordinate.py (modified) (2 diffs)
• Interpolation.py (modified) (2 diffs)
• RadialNet.py (modified) (19 diffs)
• image/border.png (added)

branch/joao/umitMapper/Coordinate.py

@@ -46 +46 @@
         @return: Polar coordinates (r, t)
         """
-        return (self.__r, self.__t)
+        return (self.__r, math.degrees(self.__t))
 
 
@@ -58 +58 @@
         """
         self.__r = r
-        self.__t = t
+        self.__t = math.radians(t)
 
 

branch/joao/umitMapper/Interpolation.py

@@ -71 +71 @@
         (af, bf) = self.__finalPoint
 
-        return (a, bi + ((a - ai) * (bf - bi) / (af - ai)))
+        try:
+            result = (a, bi + ((a - ai) * (bf - bi) / (af - ai)))
+        except ZeroDivisionError:
+            result = (a, bf)
+
+        return result
 
 
@@ -87 +92 @@
 
         aPass = float(af - ai) / numberOfPass
-        aList = arange(ai+aPass, af+aPass, aPass)
+
+        self.__interpolatedPoints = range(numberOfPass)
 
         for i in range(numberOfPass):
-            self.__interpolatedPoints.insert( i, self.interpolate(aList[i]) )
+            self.__interpolatedPoints[i] = self.interpolate(ai + (i + 1) * aPass)
 
         return self.__interpolatedPoints

branch/joao/umitMapper/RadialNet.py

@@ -19 +19 @@
 import gtk
 import math
+import time
 import pango
 import drawing
 import geometry
+import gobject
 from gtk import gdk
 from Coordinate import PolarCoordinate
+from Interpolation import Linear2DInterpolator
 from Graph import Graph, Node
 
@@ -31 +34 @@
     Radial network visualization widget
     """
-
     def __init__(self, numberOfRings=3):
         """
@@ -47 +49 @@
         """Store the center of widget"""
         self.__isInAnimation = False
+        """"""
+        self.exposedNodes = set([])
+        """"""
+        self.__animationRate = 10
+        """"""
 
         super(RadialNet, self).__init__()
@@ -53 +60 @@
         self.connect("button_release_event", self.button_release)
         self.connect("motion_notify_event", self.motion_notify)
+        self.connect("enter_notify_event", self.enter_notify)
+        self.connect("leave_notify_event", self.leave_notify)
 
         self.add_events(gdk.BUTTON_PRESS_MASK |
                         gdk.BUTTON_RELEASE_MASK |
+                        gdk.ENTER_NOTIFY |
+                        gdk.LEAVE_NOTIFY |
                         gdk.POINTER_MOTION_MASK)
+
+
+    def notIsInAnimation(function):
+        """
+        """
+        def checkAnimationStatus(*args):
+            if args[0].__isInAnimation == True:
+                return True
+            return function(*args)
+
+        return checkAnimationStatus
 
 
@@ -78 +100 @@
 
 
+    @notIsInAnimation
+    def enter_notify(self, widget, event):
+        """
+        """
+
+
+    @notIsInAnimation
+    def leave_notify(self, widget, event):
+        """
+        """
+        for id in range(self.__graph.getNumberOfNodes()):
+            node = self.__graph.getNodeByID(id)
+            node.setDrawInfo('over', False)
+
+        self.queue_draw()
+        
+
+    @notIsInAnimation
     def button_press(self, widget, event):
         """
@@ -90 +130 @@
         event.window.set_cursor(gdk.Cursor(gtk.gdk.X_CURSOR))
 
+        if event.button == 1:
+            result = self.__getNodeByCoordinate(self.get_pointer())
+
+            if ( result != None ):
+
+                node, point = result
+                self.anim(node.getID())
+
         if event.button == 3:
 
@@ -100 +148 @@
                 x, y = point
 
-                nodeView = NodeView(node, (int(xw + x), int(yw + y)), self)
-                nodeView.show_all()
+                if node.getID() not in self.exposedNodes:
+
+                    nodeView = NodeView(node, (int(xw + x), int(yw + y)), self)
+                    nodeView.show_all()
+                    self.exposedNodes.add(node.getID())
         
         return True
 
 
+    @notIsInAnimation
     def button_release(self, widget, event):
         """
@@ -121 +173 @@
 
 
+    @notIsInAnimation
     def motion_notify(self, widget, event):
         """
@@ -165 +218 @@
         self.context.clip()
 
-        self.draw()
-
-        return False
-
-
-    def draw(self):
+        self.__draw()
+
+        return True
+
+
+    def __draw(self):
         """
         Drawing method
@@ -191 +244 @@
 
         # Drawing nodes and your connections
-
-        self.__calculateNodePositions()
 
         connectionsList = set()
@@ -307 +358 @@
 
                     theta = ((b - a) / 2) + a
-                    child.setPolarCoordinate(radius, math.radians(theta))
+                    child.setPolarCoordinate(radius, theta)
 
                     locNodes.append(j)
@@ -321 +372 @@
 
 
+    def anim(self, node_id):
+        """
+        """
+        self.__isInAnimation = True # Lock main draw functions and events
+
+        initialCoordinates = range(self.__graph.getNumberOfNodes())
+        finalCoordinates = range(self.__graph.getNumberOfNodes())
+        interpolatedCoordinates = range(self.__graph.getNumberOfNodes())
+
+        for id in range(self.__graph.getNumberOfNodes()):
+
+            node = self.__graph.getNodeByID(id)
+            initialCoordinates[id] = node.getPolarCoordinate()
+
+        old_main_node_id = self.__graph.getMainNodeID()
+
+        self.__graph.setMainNodeByID(node_id)
+        self.__calculateNodePositions()
+
+        for id in range(self.__graph.getNumberOfNodes()):
+
+            node = self.__graph.getNodeByID(id)
+            finalCoordinates[id] = node.getPolarCoordinate()
+
+            ri, ti = initialCoordinates[id]
+            rf, tf = finalCoordinates[id]
+
+            interpolator = Linear2DInterpolator()
+            interpolator.setInitialPoint(ri, ti)
+            interpolator.setFinalPoint(rf, tf)
+            points = interpolator.getInterpolatedPoints(self.__animationRate)
+            interpolatedCoordinates[id] = points
+
+        self.__isInAnimation = False # Unlock main draw functions and events
+
+        for i in range(self.__animationRate):
+
+            for id in range(self.__graph.getNumberOfNodes()):
+
+                r, t = interpolatedCoordinates[id][i]
+                node = self.__graph.getNodeByID(id)
+                node.setPolarCoordinate(r, t)
+
+            self.queue_draw()
+
+
+
     def setGraph(self, graph):
         """
@@ -328 +426 @@
         """
         self.__graph = graph
+        self.__calculateNodePositions()
 
 
@@ -344 +443 @@
         self.move(position[0], position[1])
         self.__button_press_position = self.get_pointer()
-        self.resize(200, 120)
-        self.modify_bg(gtk.STATE_NORMAL, gdk.color_parse("#ffffe0"))
+        self.resize(240, 120)
 
         self.__node = node
@@ -370 +468 @@
         """
         """
-        body = gtk.VBox()
-        body.set_spacing(5)
-        body.set_border_width(5)
-        head = gtk.HBox()
-        head.set_spacing(5)
-        head.set_border_width(5)
-
-        bold_font = pango.FontDescription('monospace bold 8')
+        self.__content = gtk.VBox()
+        self.__content.set_spacing(2)
+        self.__content.set_border_width(3)
+        self.__body = gtk.VBox()
+        self.__head = gtk.HBox()
+        self.__head.set_spacing(2)
+
+        bold_font = pango.FontDescription('bold')
         normal_font = pango.FontDescription('monospace 8')
 
-        color = gtk.EventBox()
-        color.set_size_request(15, 15)
+        color_event = gtk.EventBox()
+        color = gtk.Image()
+        color.set_from_file('image/border.png')
+        color_event.add(color)
+        color_event.set_size_request(15, 15)
         r, g, b = drawing.cairoToGdkColor(self.__node.getDrawInfo('color'))
-        color.modify_bg(gtk.STATE_NORMAL, gdk.Color(r, g, b))
-
+        color_event.modify_bg(gtk.STATE_NORMAL, gdk.Color(r, g, b))
+
+        title_event = gtk.EventBox()
         title = gtk.Label()
         title.set_markup(self.__node.getInformation('ip'))
@@ -410 +512 @@
         collapse_event.add_events(gdk.BUTTON_PRESS_MASK)
 
-        head.pack_start(color, False, False, 0)
-        head.pack_start(title, False, False, 0)
-        head.pack_end(close_event, False, False, 0)
-        head.pack_end(expand_event, False, False, 0)
-        head.pack_end(collapse_event, False, False, 0)
-        body.pack_start(head, False, False, 0)
-
-        self.add(body)
+        text_scroll = gtk.ScrolledWindow()
+        text_scroll.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC)
+        text = gtk.TextView()
+        text_scroll.add(text)
+
+        self.__head.pack_start(color_event, False, False, 0)
+        self.__head.pack_start(title, False, False, 0)
+        self.__head.pack_end(close_event, False, False, 0)
+        self.__head.pack_end(expand_event, False, False, 0)
+        self.__head.pack_end(collapse_event, False, False, 0)
+        self.__body.pack_start(text_scroll, True, True, 0)
+
+        self.__content.pack_start(self.__head, False, False, 0)
+        self.__content.pack_start(self.__body, True, True, 0)
+
+        self.add(self.__content)
 
 
@@ -425 +535 @@
         self.__node.setDrawInfo('over', False)
         self.destroy()
+        self.__parent.exposedNodes.remove(self.__node.getID())
         self.__parent.queue_draw()
 
+        return True
+
 
     def expand_window(self, widget, event):
         """
         """
+        self.present()
+        self.__body.show()
+
         if self.__COMPACTED == 1:
-            self.resize(400, 240)
+            self.resize(480, 240)
             self.__COMPACTED = 0
         else:
-            self.resize(200, 120)
+            self.resize(240, 120)
             self.__COMPACTED = 1
 
+        return True
+
 
     def collapse_window(self, widget, event):
         """
         """
+        self.present()
+
         if self.__COLLAPSED == 0:
-            self.resize(200, 30)
+            self.resize(240, 20)
+            self.__body.hide()
             self.__COLLAPSED = 1
         else:
             if self.__COMPACTED == 0:
-                self.resize(400, 240)
+                self.resize(480, 240)
             else:
-                self.resize(200, 120)
+                self.resize(240, 120)
+            self.__body.show()
             self.__COLLAPSED = 0
 
+        return True
+
 
     def button_press(self, widget, event):
         """
         """
+        self.present()
         self.__pressed = True
         self.__button_press_position = self.get_pointer()
@@ -488 +613 @@
         self.__node.setDrawInfo('over', True)
 
-        if event.is_hint == True:
-
-            x, y, button_state = event.window.get_pointer()
-
-            if button_state & gtk.gdk.BUTTON1_MASK and self.__pressed:
-
-                xw, yw = event.window.get_root_origin()
-                xd, yd = self.__button_press_position
-                self.move(x + xw - xd, y + yw - yd)
+        x, y, button_state = event.window.get_pointer()
+
+        if button_state & gtk.gdk.BUTTON1_MASK and self.__pressed:
+
+            xw, yw = event.window.get_root_origin()
+            xd, yd = self.__button_press_position
+            self.move(x + xw - xd, y + yw - yd)
 
         return True
@@ -636 +759 @@
 
     radialnet.setGraph(graph)
-    radialnet.set_size_request(400, 400)
+    radialnet.set_size_request(640, 480)
 
     window.add(radialnet)