Ticket #206: RadialNet.py.patch

umitGUI/radialnet/RadialNet.py

@@ -1137 +1137 @@
                 while group.get_draw_info('group_node') is not None:
                     group = group.get_draw_info('group_node')
 
-                ring = group.get_draw_info('ring')
-                node.set_coordinate_radius(self.__calc_radius(ring))
+                radius = self.__calc_radius(group.get_draw_info('ring'))
+                flip = group.get_draw_info('flip')
 
             else:
-                ring = node.get_draw_info('ring')
-                node.set_coordinate_radius(self.__calc_radius(ring))
+
+                radius = self.__calc_radius(node.get_draw_info('ring'))
+                flip = node.get_draw_info('flip')
+
+            if flip:
+                radius += flip
+
+            node.set_coordinate_radius(radius)
 
 
     @graph_is_not_empty
@@ -1295 +1301 @@
                     node_total = max - min
                     children_need = node.get_draw_info('children_need')
 
+                    flip = 1
+
                     for child in children:
 
                         child_need = child.get_draw_info('space_need')
                         child_total = node_total * child_need / children_need
 
+                        print node_total, children_need
+
+                        if node_total < children_need:
+
+                            r = child.get_draw_info('radius')
+                            child.set_draw_info({'flip':(r * flip)})
+
+                            flip *= -1
+
+                        else:
+                            child.set_draw_info({'flip':0})
+
                         theta = child_total / 2 + min + self.__rotate
 
                         child.set_coordinate_theta(theta)
@@ -1391 +1411 @@
         # set nodes' coordinate radius
         for node in self.__graph.get_nodes():
 
-            ring = node.get_draw_info('ring')
-            node.set_coordinate_radius(self.__calc_radius(ring))
+            radius = self.__calc_radius(node.get_draw_info('ring'))
+            flip = node.get_draw_info('flip')
+
+            if flip:
+                radius += flip
+
+            node.set_coordinate_radius(radius)
 
         # set nodes' coordinate theta
         self.__calc_layout(reference)
@@ -1565 +1590 @@
             self.__graph = graph
 
             self.__calc_node_positions()
+
+            # [TODO] Perform computation and set best values for:
+            # - base ring gap;
+            # - rotation;
+            # - use or not fisheye?
+
             self.queue_draw()
 
         else:
@@ -1842 +1873 @@
     def angle_from_object(distance, size):
         """
         """
-        return math.degrees(math.atan2(size / 2.0, distance))
+        return math.degrees(math.atan2(size, distance))
         
     # End of Geometry
     
@@ -2010 +2041 @@
                 sum_angle += child.get_draw_info('space_need')
         
         distance = self.get_coordinate_radius()
-        size = self.get_draw_info('radius') * 2
+        size = self.get_draw_info('radius') * 2.0
         own_angle = RadialNet.angle_from_object(distance, size)
 
         self.set_draw_info({'children_need':sum_angle})