Changeset 11092 for ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py

Timestamp:

04/04/12 17:07:03 (14 months ago)

Author:

edent

Message:

add ports and ip when loading node

Files:

• ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py (modified) (4 diffs)

ossiedev/branches/jsnyder/trunk/tools/cornetApps/HtmlPages/views.py

@@ -14 +14 @@
 """
 Returns the floor_list array which stores the status of the node as ip of the node.
+@return the floor_list array that has the number of the node.
+"""
+def setFloorNodes():
+        floor_list=getNodeStatus()
+        for floor in floor_list:
+                for index in range(len(floor)):
+                        floor[index] = floor[index]*(index+1)
+        return floor_list
+
+"""
+Returns the floor_list array which stores the status of the node as ip of the node.
 @return the floor_list array that has the ip address of the node.
 """
-def setFloorNodes():
+def setFloorNodeIP():
         floorBuffer = 10 #used to calculate the ip address of the node
+        floor_list=getNodeStatus()
+        for floor in floor_list:
+                for index in range(len(floor)):
+                        floor[index] = floor[index]*(index+1+floorBuffer)
+                floorBuffer += 12
+        return floor_list
+
+"""
+Get status of nodes
+"""
+def getNodeStatus():
         floor1_usrp_status=[0,0,0,1,0,0,0,0,0,1,0,0]
         floor2_usrp_status=[1,1,0,1,0,1,0,1,0,0,1,0]
@@ -23 +45 @@
         floor4_usrp_status=[1,0,1,1,0,0,1,0,0,1,0,0]
         floor_list=[floor1_usrp_status, floor2_usrp_status, floor3_usrp_status, floor4_usrp_status]
-        for floor in floor_list:
-                for index in range(len(floor)):
-                        floor[index] = floor[index]*(index+1+floorBuffer)
-                floorBuffer += 12
         return floor_list
         
@@ -46 +64 @@
         node_position_3 = ((175,705),(175,653),(175,598),(206,558),(175,518),(209,452),(236,404),(158,377),(209,333),(210,285),(209,250),(207,206))
         node_position_4 = ((184,712),(184,666),(184,613),(219,557),(184,517),(222,437),(248,405),(168,372),(221,335),(220,275),(214,226),(219,190))
-        floor_list = setFloorNodes()
+        floor_list = setFloorNodeIP()
         return render_to_response("HtmlPages/map.html", locals(), context_instance=RequestContext(request))
 
@@ -62 +80 @@
 """
 def node_menu(request):
-        nodes=[Node(id=3-1, ip=33),
-                Node(id=3-2, ip=34),
-                Node(id=3-3, ip=35), 
-                Node(id=3-4, ip=36), 
-                Node(id=3-5, ip=37), 
-                Node(id=3-6, ip=38)]
+        nodes=[Node(id=3-1, ip=33),]
         return render_to_response("HtmlPages/node_menu.html", locals(), context_instance=RequestContext(request))
-
-#@login_required
-def loadNode(request, node_num):
-        return render_to_response("HtmlPages/nodes.html", locals(), context_instance=RequestContext(request))
 
 def properties_page(request):