Update visualiser to pull in only connected clients from the master a…

…nd fix some gdk related bugs
lalithsuresh · Aug 7, 2012 · df24803 · df24803
1 parent 28db02b
commit df24803
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/odin-master b/odin-master
diff --git a/visualiser/vis.py b/visualiser/vis.py
@@ -9,7 +9,7 @@
 
 MASTER_IP = "172.17.255.103"
 MASTER_REST_PORT = "8080"
-CLIENT_RESOURCE = "/odin/clients/json"
+CLIENT_RESOURCE = "/odin/clients/connected/json"
 AGENT_RESOURCE = "/odin/agents/json"
 SPACING = 10
 CANVAS_WIDTH = 1000
@@ -268,9 +268,9 @@ def update_canvas (canvas):
     agent_map = fetch_agent_data_map ()
     client_map = fetch_client_data_map ()
 
-    for each in agent_map.keys():
-        if (each in agent_item_map):
-            item = agent_item_map[each]
+    #for each in agent_map.keys():
+    #    if (each in agent_item_map):
+    #        item = agent_item_map[each]
 
     for each in client_map.keys():
         color = "green"
@@ -291,14 +291,14 @@ def update_canvas (canvas):
                                                                                 agent.get_data("coords")[1],
                                                                                 item.get_data("my_coords")[0], 
                                                                                 item.get_data("my_coords")[1])
-                agent.raise_(None)
+                #agent.raise_(None)
                 item.get_data("path_object").request_update()
 
             item.request_update()
         else:
             x = point_map["/" + client_map[each]["agent"]][0]
             y = point_map["/" + client_map[each]["agent"]][1]
-            item = create_focus_elipse (canvas, x, y, 15, 15, color, "client-" + each)
+            item = create_focus_image (canvas, x, y, "client.svg", "client-" + each)
 
             agent = agent_item_map["/" + client_map[each]["agent"]]
 
@@ -309,8 +309,8 @@ def update_canvas (canvas):
                 item.set_data ("my_coords", (x, y))
                 path.props.visibility = goocanvas.ITEM_INVISIBLE
 
-            agent.raise_(None)
-            item.raise_(None)
+            #item.raise_(None)
+            #agent.raise_(None)
 
             client_item_map[each] = item
             point_map["/" + client_map[each]["agent"]][1] += 60
+1 −1		src/main/java/net/floodlightcontroller/odinmaster/AllClientsResource.java
+29 −0		src/main/java/net/floodlightcontroller/odinmaster/ConnectedClientsResource.java
+2 −1		src/main/java/net/floodlightcontroller/odinmaster/OdinMasterWebRoutable.java