Author: sleon
Date: 2006-01-09 11:31:49 +0000 (Mon, 09 Jan 2006)
New Revision: 7823
Modified:
trunk/apps/freeviz/db.py
trunk/apps/freeviz/gen.py
Log:
removed indication for the nodes with less then 32 connections
Modified: trunk/apps/freeviz/db.py
===================================================================
--- trunk/apps/freeviz/db.py 2006-01-09 03:14:48 UTC (rev 7822)
+++ trunk/apps/freeviz/db.py 2006-01-09 11:31:49 UTC (rev 7823)
@@ -21,7 +21,7 @@
backoffmax_node2 = StringCol(length=50, default='5000')
backoffcur_node1 = StringCol(length=50, default='0')
backoffcur_node2 = StringCol(length=50, default='0')
- nodes = RelatedJoin('Node')
+# nodes = RelatedJoin('Node')
index = DatabaseIndex('node1','node2', unique=True)
class Node(SQLObject):
@@ -42,7 +42,7 @@
address = StringCol(length=32,notNull=True,default='0.0.0.0:0')
active=StringCol(length=1,notNull=True,default='N')
- edges = RelatedJoin('NodePair')
+# edges = RelatedJoin('NodePair')
index = DatabaseIndex('identity',unique=True)
@@ -83,8 +83,8 @@
for edge in edges:
node1=edge.node1
node2=edge.node2
- node1.removeNodePair(edge)
- node2.removeNodePair(edge)
+ #node1.removeNodePair(edge)
+ #node2.removeNodePair(edge)
edge.delete(edge.id)
def exists(nodeinfo,trans):
@@ -135,8 +135,8 @@
bla = NodePair( node1=node1, node2=node2,connection=trans )
- Node.get(node1, connection=trans).addNodePair(bla)
- Node.get(node2, connection=trans).addNodePair(bla)
+ #Node.get(node1, connection=trans).addNodePair(bla)
+ #Node.get(node2, connection=trans).addNodePair(bla)
if backoff1:
bla.backoffmax_node1 = backoff1['backoffmax']
bla.backoffcur_node1 = backoff1['backoffcur']
Modified: trunk/apps/freeviz/gen.py
===================================================================
--- trunk/apps/freeviz/gen.py 2006-01-09 03:14:48 UTC (rev 7822)
+++ trunk/apps/freeviz/gen.py 2006-01-09 11:31:49 UTC (rev 7823)
@@ -24,12 +24,13 @@
#COLORS
nodeOK='#9dfbb9'
nodeOUTDATED='#c5ffff'
- nodeLCONNS='#f9ffcb'
+# nodeLCONNS='#f9ffcb'
+# nodeLCONNS=nodeOK
edgeOK='#238500'
edgeBLOCKED='#ee4a1e'
defaultSize='3px'
- minEdges=3
+# minEdges=3
#saves previous state of nodes
oldnstate={}
@@ -114,8 +115,8 @@
nversion = self.regver.match(node.version).group(1)
if node.lastGoodVersion < lastgoodver:
nodecolor=self.nodeOUTDATED
- elif db.number_edges(node) < self.minEdges:
- nodecolor=self.nodeLCONNS
+ # elif db.number_edges(node) < self.minEdges:
+ # nodecolor=self.nodeLCONNS
if node.requests != '0' or node.inserts != '0' or
node.transferring_requests != '0':
transinfosize="10px"
